Ticket #3593: find_meta.py.diff

mythvideo/mythvideo/scripts/find_meta.py

@@ -108 +108 @@
                 print string
         return
 
-db = None
-def init_db():
-        global db
-        try:
-                config = shlex.shlex(open(os.path.expanduser('~/.mythtv/mysql.txt')))
-        except:
-                print "Error opening ~/.mythtv/mysql.txt"
-                return False
-
-
-        token = config.get_token()
-        db_host = db_user = db_password = None
-        while  token != config.eof and (db_host == None or db_user == None or db_password == None):
-                if token == "DBHostName":
-                        if config.get_token() == "=":
-                                db_host = config.get_token()
-                elif token == "DBUserName":
-                        if config.get_token() == "=":
-                                db_user = config.get_token()
-                elif token == "DBPassword":
-                        if config.get_token() == "=":
-                                db_password = config.get_token()
-
-                token = config.get_token()
-        db = MySQLdb.connect(user=db_user, host=db_host, passwd=db_password,
-                        db="mythconverg")
-        print_verbose("Database connection successful.")
-        return True
-
 def find_imdb_id_from_text_file(textFile):
 
         if os.access(textFile, os.R_OK):
@@ -834 +805 @@
 def main():
         global verbose, overwrite, interactive, recursive, dbimport
         global import_from_files, metafiles, poster_dir, poster_search
-        global aka_language
+        global aka_language, videoExtensions
 
         usage = "usage: %prog [options] videopath1 [videopath2 videopath3...]"
 
@@ -910 +881 @@
                         sys.exit(1)
                 poster_dir = mythdb.getSetting("VideoArtworkDir", socket.gethostname())
 
+        if mythdb:
+                # We have acces to the database so we will override the
+                # extensions with the  values from the database
+                videoExtensions = []
+                c = mythdb.cursor()
+                c.execute("""
+                        SELECT extension
+                        FROM videotypes
+                        WHERE f_ignore = 0""")
+                row = c.fetchone()
+                while row is not None:
+                        videoExtensions.append(row[0])
+                        row = c.fetchone()
+                c.close()
 
         if prune:
                 mythvideo.pruneMetadata()