Ticket #4055: metadata_fixes_svn_head.diff

mythvideo/scripts/find_meta.py

@@ -325 +326 @@
                 0.0, None, 0, None, None, child, "")
 
         intid = mythvideo.getMetadataId(videopath)
-        if intid is not None:
-                if not overwrite:
+        has_metadata = mythvideo.hasMetadata(videopath)
+        if intid is not None :
+                if not overwrite and has_metadata:
                         print_verbose("Metadata already exist in MythDB, not overwriting it.")
                         return None
+                else:
+                        print_verbose("Entry exists in MythDB with default metadata.  Updating.")
+                        mythvideo.setMetadata({'filename': videopath}, id=intid)
         else:
                 print_verbose("No metadata in MythDB, creating a new one.")
                 # Create a new empty entry at this point so we can use the common UPDATE code
@@ -557 +562 @@
                         pass
 
                 if candidates is not None and len(candidates) > 0:
-
                         index = 0
-                        if len(candidates) > 1:
-
+                        if (len(candidates) == 2) and (candidates[0][0] == candidates[1][0]):
+                                imdb_id = candidates[0][0]
+                        elif len(candidates) > 1:
+                                import pdb; pdb.set_trace()
                                 print "Got multiple candidates for title search '%s'. " % title
                                 if not interactive:
                                         print "Use the '-a' or '-i' switch to choose the correct one."