Changeset 1012

Timestamp:

07/04/08 01:02:26 (5 months ago)

Author:

Pernod

Message:

Improved media search to only scan what is requested. ie. If only a TV category is scanned then TV details will be parsed too, but not movies. A RSS update will now only update RSS feeds and nothing else.
Also added some more media scan status messages since users noted that a scan can sit at 100% complete for awhile when it's actually parsing TV/movie details and removing orphaned data from the database.

Fixes #146

Files:

• trunk/swisscenter/base/media.php (modified) (1 diff)
• trunk/swisscenter/base/rss.php (modified) (1 diff)
• trunk/swisscenter/config/config_media.php (modified) (2 diffs)
• trunk/swisscenter/do_refresh.php (modified) (4 diffs)
• trunk/swisscenter/lang/en/en.xml (modified) (3 diffs)
• trunk/swisscenter/media_search.php (modified) (6 diffs)
• trunk/swisscenter/rss_feeds.php (modified) (1 diff)

trunk/swisscenter/base/media.php

@@ -161 +161 @@
-  @db_sqlcommand('DELETE FROM tv     USING tv, tv_del         WHERE tv.file_id = tv_del.file_id');
-  @db_sqlcommand('DELETE FROM photos USING photos, photos_del WHERE photos.file_id = photos_del.file_id');  
+}
+
+/**
+ * Remove all MEDIA_SCAN settings from SYSTEM_PREFS.
+ *
+ */
+
+function clear_media_scan_prefs()
+{
+  db_sqlcommand("delete from system_prefs where name like 'media_scan_%'"); 
-}
-

trunk/swisscenter/base/rss.php

@@ -93 +93 @@
-     }
-   }
+   send_to_log(4,'Finished updating RSS subscriptions');
- }
- 

trunk/swisscenter/config/config_media.php

@@ -76 +76 @@
-  function media_search()
-  {
-gory, media tyo
+egory, media typ
-    // as this is the only way of passing the info to the background process in Simese.
+    clear_media_scan_prefs();
-    set_sys_pref('MEDIA_SCAN_TYPE',$_REQUEST["scan_type"]);
-    set_sys_pref('MEDIA_SCAN_MEDIA_TYPE',$_REQUEST["type"]);
-    set_sys_pref('MEDIA_SCAN_CATEGORY',$_REQUEST["cat"]);
-
+MEDIA_SCAN_
-    set_sys_pref('MEDIA_SCAN_ITUNES',$_REQUEST["itunes"]);
-    set_sys_pref('MEDIA_SCAN_RSS',$_REQUEST["rss_id"]);
@@ -114 +115 @@
-                                              where ml.cat_id = c.cat_id order by c.cat_name", $_REQUEST['cat'],true,false,str('ALL_CATEGORIES'));
-    echo '<tr><td></td><td>&nbsp;</td></tr>';
-
+MEDIA_SCAN_
-    form_label(str('REFRESH_METADATA_PROMPT'));
-    form_radio_static('itunes',str('REFRESH_ITUNES'),$option_vals,get_sys_pref('MEDIA_SCAN_ITUNES','NO'),false,true);

trunk/swisscenter/do_refresh.php

@@ -49 +49 @@
-  function do_refresh_all()
-  {
+    set_sys_pref('MEDIA_SCAN_TYPE','MEDIA');
-    set_sys_pref('MEDIA_SCAN_STATUS',str('MEDIA_SCAN_STATUS_PENDING'));
-    media_refresh_now();
@@ -62 +63 @@
-  function do_refresh_cat( $spec )
-  {
-    set_sys_pref('MEDIA_SCAN_MEDIA_TYPE','');
-    set_sys_pref('MEDIA_SCAN_CATEGORY',$spec);
-    do_refresh_all();
@@ -76 +76 @@
-  {
-    set_sys_pref('MEDIA_SCAN_MEDIA_TYPE',$spec);
-    set_sys_pref('MEDIA_SCAN_CATEGORY','');
-    do_refresh_all();
-  }
@@ -145 +144 @@
-    show_progress();
-  elseif ( $type == 'all' )
+  {
+    clear_media_scan_prefs();
-    do_refresh_all();
+  }
-  elseif ( $type == 'media_type' && empty($spec) )
-    choose_type();
-  elseif ( $type == 'media_type' )
+  {
+    clear_media_scan_prefs();
-    do_refresh_type($spec);
+  }
-  elseif ( $type == 'category' && empty($spec) )
-    choose_category();
-  elseif ( $type == 'category' )
+  {
+    clear_media_scan_prefs();
-    do_refresh_cat($spec);
+  }
-  else
-    choose_main_opt();  

trunk/swisscenter/lang/en/en.xml

@@ -1824 +1824 @@
-      </string>
-      <string>
+        <id>MEDIA_SCAN_STATUS_CLEANUP</id>
+        <text>Cleaning database</text>
+        <version>1.20.1</version>
+      </string>
+      <string>
-        <id>MEDIA_SCAN_STATUS_COMPLETE</id>
-        <text>Complete</text>
@@ -1829 +1834 @@
-      </string>
-      <string>
+        <id>MEDIA_SCAN_STATUS_ITUNES</id>
+        <text>Parsing iTunes library</text>
+        <version>1.20.1</version>
+      </string>
+      <string>
+        <id>MEDIA_SCAN_STATUS_MOVIE</id>
+        <text>Parsing movie details</text>
+        <version>1.20.1</version>
+      </string>
+      <string>
-        <id>MEDIA_SCAN_STATUS_PENDING</id>
-        <text>Pending</text>
@@ -1837 +1852 @@
-        <text>Running</text>
-        <version>1.19</version>
+      </string>
+      <string>
+        <id>MEDIA_SCAN_STATUS_TV</id>
+        <text>Parsing TV details</text>
+        <version>1.20.1</version>
-      </string>
-      <string>

trunk/swisscenter/media_search.php

@@ -46 +46 @@
-      if ($media_type == MEDIA_TYPE_MUSIC)
-        musicip_server_add_dir($location["NAME"]);    
-
+  
-
-  }
@@ -62 +62 @@
-  $cat_id     = get_sys_pref('MEDIA_SCAN_CATEGORY');
-  $itunes     = get_sys_pref('MEDIA_SCAN_ITUNES','YES');
-
+MEDIA_SCAN_
-  $itunes_library = get_sys_pref('ITUNES_LIBRARY');
-  $itunes_date    = get_sys_pref('ITUNES_LIBRARY_DATE');
+  $media_types    = db_col_to_list("select distinct(media_type) from media_locations where 1=1".
+                                  (empty($cat_id) ? '' : " and cat_id = $cat_id").
+                              (empty($media_type) ? '' : " and media_type = $media_type"));
-
-
-
-
-
-
-
+
-  set_sys_pref('MEDIA_SCAN_STATUS',str('MEDIA_SCAN_STATUS_RUNNING'));
-  
@@ -87 +85 @@
-    
-    // Update video details from the Internet if enabled
-
+
+
+
-      extra_get_all_movie_details();
+    }
-    
-
+
+
+
-      extra_get_all_tv_details();
+    }
- 
-    // Scan the iTunes library for playlists
@@ -100 +104 @@
-      if ( is_null($itunes_date) || ($itunes_date < $file_date) )
-      {
+        set_sys_pref('MEDIA_SCAN_STATUS',str('MEDIA_SCAN_STATUS_ITUNES'));
-        parse_itunes_file($itunes_library);
-        set_sys_pref('ITUNES_LIBRARY_DATE', $file_date);
@@ -106 +111 @@
-        send_to_log(4,'Skipping the iTunes Music Library, not changed since last update');
-    }
+    
+    // Remove media from library no longer in media locations
+    set_sys_pref('MEDIA_SCAN_STATUS',str('MEDIA_SCAN_STATUS_CLEANUP'));
+    remove_orphaned_records();
+    remove_orphaned_movie_info();
+    remove_orphaned_tv_info();
+    scdb_remove_orphans();
+    eliminate_duplicates();
-  }
-    
@@ -123 +136 @@
-  }
-  
-  remove_orphaned_records();
-  remove_orphaned_movie_info();
-  remove_orphaned_tv_info();
-  scdb_remove_orphans();
-  eliminate_duplicates();
-  media_indicator('OFF');
-

trunk/swisscenter/rss_feeds.php

@@ -64 +64 @@
-    // Store the parameters to the media search (rss subscription id) in the system_prefs table
-    // as this is the only way of passing the info to the background process in Simese.
+    clear_media_scan_prefs();
-    set_sys_pref('MEDIA_SCAN_TYPE','RSS');
-    set_sys_pref('MEDIA_SCAN_RSS',$_REQUEST["update_id"]);