Changeset 1860

Timestamp:

02/11/08 19:21:47 (2 months ago)

Author:

duncan

svm:headrev:

cc3e1ea1-1e01-0410-8d68-8b121e83a9d5:11142

Message:

[ 2214605 ] imdb searches fails
Fix applied

Location:

freevo

Files:

• ChangeLog (modified) (1 diff)
• src/util/fxdimdb.py (modified) (3 diffs)
• src/video/plugins/imdb.py (modified) (2 diffs)

freevo/ChangeLog

@@ -29 +29 @@
  * Fixed headlines plug-in to ignore items without a title, etc. (B#2183225)
  * Fixed imdb helper to correctly handle dates when available (B#2075291)
+ * Fixed imdb search when a season is specified but no episode (B#2214605)
  * Fixed joy plug-in to remove any pending events when enabled (B#1916407)
  * Fixed mplayer crash when auto cropping is enabled (B#2089592)

freevo/src/util/fxdimdb.py

@@ -141 +141 @@
 
         # find <season>X<episode>
+        season = ''
+        episode = ''
         m = re.compile('([0-9]+)[xX]([0-9]+)')
         res = m.search(name)
@@ -256 +258 @@
         self.id = id
 
-        if season and episode:
+        if season is None or episode is None:
+            episodeid = None
+        else:
             # This is a TV series, lets use a special search
-            url = 'http://us.imdb.com/title/tt%s/episodes' % id
+            url = 'http://www.imdb.com/title/tt%s/episodes' % id
             req = urllib2.Request(url, txdata, txheaders)
 
             try:
                 idpage = urllib2.urlopen(req)
-            except urllib2.HTTPError, error:
-                raise FxdImdb_Net_Error("IMDB unreachable" + error)
+            except urllib2.HTTPError, why:
+                raise FxdImdb_Net_Error('IMDB unreachable' + str(why))
 
             episodeid = self.find_episode(idpage, id, season, episode)
@@ -270 +274 @@
 
         # do the standard search
-        url = 'http://us.imdb.com/title/tt%s' % episodeid
+        url = 'http://www.imdb.com/title/tt%s' % id
         req = urllib2.Request(url, txdata, txheaders)
 
         try:
             idpage = urllib2.urlopen(req)
-        except urllib2.HTTPError, error:
-            raise FxdImdb_Net_Error("IMDB unreachable" + error)
+        except urllib2.HTTPError, why:
+            raise FxdImdb_Net_Error('IMDB unreachable' + str(why))
 
         self.parse_data(idpage, id, episodeid, season, episode)

freevo/src/video/plugins/imdb.py

@@ -146 +146 @@
                 except UnicodeError, e:
                     print e
-              # if filename had a season/episode letsŽ grab it
-            self.season = fxd.season
-            self.episode = fxd.episode
-
-        except Exception, e:
-            print 'imdb_search:', e
+            # if filename had a season/episode lets' grab it
+            self.season = hasattr(fxd, 'season') and fxd.season or ''
+            self.episode = hasattr(fxd, 'episode') and fxd.episode or ''
+
+        except urllib2.HTTPError, why:
+            _debug_('%s', (why,), DWARNING)
             box.destroy()
-            box = PopupBox(text=_('Unknown error while connecting to IMDB'))
+            box = PopupBox(text=_('Connecting to IMDB failed:') + str(why))
             box.show()
             time.sleep(2)
@@ -160 +160 @@
 
         # for d in duplicates:
-        #     items = [ menu.MenuItem('Add to "%s"' % d.name,
-        #                             self.imdb_add_to_fxd, (d, 'add')),
-        #               menu.MenuItem('Variant to "%s"' % d.name,
-        #                             self.imdb_add_to_fxd, (d, 'variant')) ] + items
+        #     items = [
+        #         menu.MenuItem('Add to "%s"' % d.name, self.imdb_add_to_fxd, (d, 'add')),
+        #         menu.MenuItem('Variant to "%s"' % d.name, self.imdb_add_to_fxd, (d, 'variant'))
+        #     ] + items
 
         box.destroy()