Ticket #2734: backendip2.patch

mythvideo/scripts/MythTV.py

@@ -69 +69 @@
                 for config_file in config_files:
                         try:
                                 config = shlex.shlex(open(config_file))
+                                config.wordchars += "."
                         except:
                                 continue
         

mythvideo/scripts/find_meta.py

@@ -109 +109 @@
         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):
@@ -555 +528 @@
                 if candidates is None or len(candidates) == 0:
                         # TODO: Try with the dirname
                         pass
-
                 if candidates is not None and len(candidates) > 0:
 
                         index = 0
@@ -909 +881 @@
                         print "You must have the MythTV module to make direct DB importing to work"
                         sys.exit(1)
                 poster_dir = mythdb.getSetting("VideoArtworkDir", socket.gethostname())
+                if not mythdb:
+                        print "Could not get VideoArtworkDir setting for the current host."
+                        sys.exit(1)
 
-
         if prune:
                 mythvideo.pruneMetadata()