Ticket #6219: imdb_script3.patch

imdbpy.py

@@ -327 +327 @@
                 shortest_found = None
                 #print "%d plots found" % len(plots)
                 for plot in plots:
-                        text = plot.split("::")[1]
+                        #IMDbPY 3.9 doesn't order the content of plot like earlier version of IMDbPY.
+                        # IMDB 3.6 is : plot_content::author
+                        # IMDB 3.9 is : author::plot_content
+                        #So we assume that should one side longer than the other, it's actually where the description is
+                        splitvalue = plot.split("::")
+                        if len(splitvalue[0]) > len(splitvalue[1]):
+                                text = splitvalue[0]
+                        else:
+                                text = splitvalue[1]
                         if shortest_found == None or len(text) < len(shortest_found):
                                 shortest_found = text
                 metadata.plot = shortest_found
@@ -397 +405 @@
 
         if options.movie_search is not None:
                 results = title_search(options.movie_search.decode("utf8"))
-                for result in results:
-                        print "%s:%s (%d)" % (result[0], result[1], result[2])
+                if results:
+                        for result in results:
+                                print "%s:%s (%d)" % (result[0], result[1], result[2])
         elif options.poster_search is not None:
                 poster_search(options.poster_search)
         elif options.metadata_search is not None:

fetch_poster.py

@@ -189 +189 @@
 
                 if imdb_id is None:
                         return []
-                poster_url = imdbpy.find_poster_url(imdb_id)
+                try:
+                        poster_url = imdbpy.find_poster_url(imdb_id)
+                except:
+                        #IMDb often timesout or return an error 503... try again just in case
+                        poster_url = imdbpy.find_poster_url(imdb_id)
                 if poster_url is not None:
                         filename = poster_url.split("/")[-1]
                         (name, extension) = os.path.splitext(filename)
@@ -254 +258 @@
         if len(arguments) != 1:
                 if options.imdb_id:
                         # TODO: Fetch the title from IMDb.
-                        metadata = imdbpy.metadata_search(options.imdb_id)
+                        try:
+                                metadata = imdbpy.metadata_search(options.imdb_id)
+                        except:
+                                #IMDb often timesout or return an error 503... try again just in case
+                                metadata = imdbpy.metadata_search(options.imdb_id)
                         title = imdbpy.parse_meta(metadata, "Title")
                 else:
                         print "Please give a video title as argument."

find_meta.py

@@ -153 +153 @@
                         lowest_cutpoint = pos
 
         title = title[0:lowest_cutpoint]
+        # Remove trailing year in the form of "name [year]" or "name (year)"if any
+        m = re.compile(r"(.*)([\(\[]([0-9]+)[\]\)])$")
+        found = m.match(title.strip())
+        if found:
+                title = found.group(1)
         return title.strip()
 
 def parse_meta(variable, oldvalue, emptyvalue="", meta=""):
@@ -528 +533 @@
 
                 print_verbose("Title search '%s'" % title)
 
-                candidates = imdbpy.title_search(title)
+                try:
+                        candidates = imdbpy.title_search(title)
+                except:
+                        #IMDb often timesout or return an error 503... try again just in case
+                        candidates = imdbpy.title_search(title)
+                        
                 if candidates is None or len(candidates) == 0:
                         # TODO: Try with the dirname
                         pass
@@ -560 +570 @@
 
         print_verbose("Querying IMDb for meta data for ID %s..." % imdb_id)
         try:
-                meta = imdbpy.fetch_metadata(imdb_id)
+                try:
+                        meta = imdbpy.fetch_metadata(imdb_id)
+                except:
+                        #IMDb often timesout or return an error 503... try again just in case
+                        meta = imdbpy.fetch_metadata(imdb_id)
                 if meta is not None:
                         if meta.series_episode:
                                 title, season, episode = imdbpy.detect_series_title(title)
@@ -708 +722 @@
                 metadata = load_metadata_file(metadata_target)
 
         if imdb_id is not None:
-                meta = imdbpy.fetch_metadata(imdb_id)
+                try:
+                        meta = imdbpy.fetch_metadata(imdb_id)
+                except:
+                        #IMDb often timesout or return an error 503... try again just in case
+                        meta = imdbpy.fetch_metadata(imdb_id)
                 if meta.series_episode:
                         fileName = os.path.basename(pathName)
                         t, season, episode = imdbpy.detect_series_title(fileName)
@@ -734 +752 @@
                 return
 
         if imdb_id is not None:
-                metadata = imdbpy.metadata_search(imdb_id)
+                try:
+                        metadata = imdbpy.metadata_search(imdb_id)
+                except:
+                        #IMDb often timesout or return an error 503... try again just in case
+                        metadata = imdbpy.metadata_search(imdb_id)
                 if metadata is not None:
                         metadata += "IMDb:%s" % imdb_id + "\n"
                         save_metadata(dirName, dirName + "/video.metadata", metadata)