Merge branch '2019-render' into branch 'render-tidy'.

mythplugins/mytharchive/mytharchivehelper/main.cpp

@@ -524,7 +524,7 @@ int NativeArchive::exportRecording(QDomElement   &itemNode,
     }
 
     // add any rating
-    query.prepare("SELECT system, rating FROM recordedrating "
+    query.prepare("SELECT `system`, rating FROM recordedrating "
             "WHERE chanid = :CHANID AND starttime = :STARTTIME;");
     query.bindValue(":CHANID", chanID);
     query.bindValue(":STARTTIME", startTime);

mythplugins/mythgame/mythgame/dbcheck.cpp

@@ -70,7 +70,7 @@ static bool InitializeDatabase(void)
 
     const QString updates[] = {
 "CREATE TABLE gamemetadata ("
-"  system varchar(128) NOT NULL default '',"
+"  `system` varchar(128) NOT NULL default '',"
 "  romname varchar(128) NOT NULL default '',"
 "  gamename varchar(128) NOT NULL default '',"
 "  genre varchar(128) NOT NULL default '',"
@@ -84,7 +84,7 @@ static bool InitializeDatabase(void)
 "  crc_value varchar(64) NOT NULL default '',"
 "  display tinyint(1) NOT NULL default '1',"
 "  version varchar(64) NOT NULL default '',"
-"  KEY system (system),"
+"  KEY `system` (`system`),"
 "  KEY year (year),"
 "  KEY romname (romname),"
 "  KEY gamename (gamename),"
@@ -295,7 +295,7 @@ bool UpgradeGameDatabaseSchema(void)
 QString("ALTER DATABASE %1 DEFAULT CHARACTER SET latin1;")
         .arg(gContext->GetDatabaseParams().dbName),
 "ALTER TABLE gamemetadata"
-"  MODIFY system varbinary(128) NOT NULL default '',"
+"  MODIFY `system` varbinary(128) NOT NULL default '',"
 "  MODIFY romname varbinary(128) NOT NULL default '',"
 "  MODIFY gamename varbinary(128) NOT NULL default '',"
 "  MODIFY genre varbinary(128) NOT NULL default '',"
@@ -342,7 +342,7 @@ QString("ALTER DATABASE %1 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;")
         .arg(gContext->GetDatabaseParams().dbName),
 "ALTER TABLE gamemetadata"
 "  DEFAULT CHARACTER SET default,"
-"  MODIFY system varchar(128) CHARACTER SET utf8 NOT NULL default '',"
+"  MODIFY `system` varchar(128) CHARACTER SET utf8 NOT NULL default '',"
 "  MODIFY romname varchar(128) CHARACTER SET utf8 NOT NULL default '',"
 "  MODIFY gamename varchar(128) CHARACTER SET utf8 NOT NULL default '',"
 "  MODIFY genre varchar(128) CHARACTER SET utf8 NOT NULL default '',"

mythplugins/mythgame/mythgame/gamehandler.cpp

@@ -243,7 +243,7 @@ static void updateDisplayRom(const QString& romname, int display, const QString&
 {
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare("UPDATE gamemetadata SET display = :DISPLAY "
-                  "WHERE romname = :ROMNAME AND system = :SYSTEM");
+                  "WHERE romname = :ROMNAME AND `system` = :SYSTEM");
 
     query.bindValue(":DISPLAY", display);
     query.bindValue(":ROMNAME", romname);
@@ -273,7 +273,7 @@ static void updateGameName(const QString& romname, const QString& GameName, cons
 {
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare("UPDATE gamemetadata SET GameName = :GAMENAME "
-                  "WHERE romname = :ROMNAME AND system = :SYSTEM ");
+                  "WHERE romname = :ROMNAME AND `system` = :SYSTEM ");
 
     query.bindValue(":GAMENAME", GameName);
     query.bindValue(":ROMNAME", romname);
@@ -300,10 +300,10 @@ static void UpdateGameCounts(QStringList updatelist)
         LOG(VB_GENERAL, LOG_NOTICE,
             LOC + QString("Update gametype %1").arg(GameType));
 
-        query.prepare("SELECT romname,system,spandisks,gamename FROM "
+        query.prepare("SELECT romname,`system`,spandisks,gamename FROM "
               "gamemetadata,gameplayers WHERE "
               "gamemetadata.gametype = :GAMETYPE AND "
-              "playername = system ORDER BY romname");
+              "playername = `system` ORDER BY romname");
 
         query.bindValue(":GAMETYPE",GameType);
 
@@ -448,7 +448,7 @@ void GameHandler::UpdateGameDB(GameHandler *handler)
 #endif
 
             query.prepare("INSERT INTO gamemetadata "
-                          "(system, romname, gamename, genre, year, gametype, "
+                          "(`system`, romname, gamename, genre, year, gametype, "
                           "rompath, country, crc_value, diskcount, display, plot, "
                           "publisher, version, fanart, boxart, screenshot) "
                           "VALUES (:SYSTEM, :ROMNAME, :GAMENAME, :GENRE, :YEAR, "
@@ -499,7 +499,7 @@ void GameHandler::VerifyGameDB(GameHandler *handler)
 
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare("SELECT romname,rompath,gamename FROM gamemetadata "
-                  "WHERE system = :SYSTEM");
+                  "WHERE `system` = :SYSTEM");
 
     query.bindValue(":SYSTEM",handler->SystemName());
 

mythplugins/mythgame/mythgame/rominfo.cpp

@@ -29,7 +29,7 @@ void RomInfo::SaveToDatabase()
             .arg(Romname()));
 
         query.prepare("INSERT INTO gamemetadata "
-                      "(system, romname, gamename, genre, year, gametype, "
+                      "(`system`, romname, gamename, genre, year, gametype, "
                       "rompath, country, crc_value, diskcount, display, plot, "
                       "publisher, version, fanart, boxart, screenshot) "
                       "VALUES (:SYSTEM, :ROMNAME, :GAMENAME, :GENRE, :YEAR, "
@@ -255,10 +255,10 @@ void RomInfo::fillData()
 
     QString systemtype;
     if (m_system != "") {
-        systemtype  += " AND system = :SYSTEM ";
+        systemtype  += " AND `system` = :SYSTEM ";
     }
 
-    QString thequery = "SELECT system,gamename,genre,year,romname,favorite,"
+    QString thequery = "SELECT `system`,gamename,genre,year,romname,favorite,"
                        "rompath,country,crc_value,diskcount,gametype,plot,publisher,"
                        "version,screenshot,fanart,boxart,inetref,intid FROM gamemetadata "
                        "WHERE gamename = :GAMENAME "
@@ -297,7 +297,7 @@ void RomInfo::fillData()
     // systems available to play it.
     if (RomCount() > 1)
     {
-        query.prepare("SELECT DISTINCT system FROM gamemetadata "
+        query.prepare("SELECT DISTINCT `system` FROM gamemetadata "
                       "WHERE romname = :ROMNAME");
         query.bindValue(":ROMNAME", Romname());
         if (!query.exec())
@@ -323,7 +323,7 @@ QList<RomInfo*> RomInfo::GetAllRomInfo()
 
     MSqlQuery query(MSqlQuery::InitCon());
 
-    QString querystr = "SELECT intid,system,romname,gamename,genre,year,publisher,"
+    QString querystr = "SELECT intid,`system`,romname,gamename,genre,year,publisher,"
                        "favorite,rompath,screenshot,fanart,plot,boxart,"
                        "gametype,diskcount,country,crc_value,inetref,display,"
                        "version FROM gamemetadata ORDER BY diskcount DESC";
@@ -371,7 +371,7 @@ RomInfo *RomInfo::GetRomInfoById(int id)
 
     MSqlQuery query(MSqlQuery::InitCon());
 
-    QString querystr = "SELECT intid,system,romname,gamename,genre,year,publisher,"
+    QString querystr = "SELECT intid,`system`,romname,gamename,genre,year,publisher,"
                        "favorite,rompath,screenshot,fanart,plot,boxart,"
                        "gametype,diskcount,country,crc_value,inetref,display,"
                        "version FROM gamemetadata WHERE intid = :INTID";

mythtv/bindings/perl/MythTV.pm

@@ -116,7 +116,7 @@ package MythTV;
 # schema version supported in the main code.  We need to check that the schema
 # version in the database is as expected by the bindings, which are expected
 # to be kept in sync with the main code.
-    our $SCHEMA_VERSION = "1355";
+    our $SCHEMA_VERSION = "1357";
 
 # NUMPROGRAMLINES is defined in mythtv/libs/libmythtv/programinfo.h and is
 # the number of items in a ProgramInfo QStringList group used by

mythtv/bindings/python/MythTV/__init__.py

@@ -15,7 +15,8 @@
                        'Job', 'Channel', 'Guide', 'Video', 'VideoGrabber', \
                        'InternetContent', 'InternetContentArticles', \
                        'InternetSource', 'Song', 'Album', 'Artist', \
-                       'MusicPlaylist', 'MusicDirectory', 'RecordedArtwork']
+                       'MusicPlaylist', 'MusicDirectory', 'RecordedArtwork', \
+                       'RecordedFile']
 
 __all_method__      = ['MythBE', 'BEEventMonitor', 'MythSystemEvent', \
                        'Frontend', 'MythDB', 'MythXML', 'MythMusic', \

mythtv/bindings/python/MythTV/_conn_mysqldb.py

@@ -34,12 +34,12 @@ def __init__(self, connection):
         super(LoggedCursor, self).__init__(connection)
         self.log = None
         self.ping = ref(self._ping121)
-        if MySQLdb.version_info >= ('1','2','2'):
+        if MySQLdb.version_info >= (1, 2, 2):
             self.ping = ref(self._ping122)
         self.ping()
 
-    def _ping121(self): self._get_db().ping(True)
-    def _ping122(self): self._get_db().ping()
+    def _ping121(self): self._get_db().ping()
+    def _ping122(self): self._get_db().ping(True)
 
     def _sanitize(self, query): return query.replace('?', '%s')
 

mythtv/bindings/python/MythTV/altdict.py

@@ -99,7 +99,7 @@ class DictData( OrdDict ):
     _field_type = None
     _trans = [  int,
                 locale.atof,
-                bool,
+                lambda x: bool(int(x)),
                 lambda x: x,
                 lambda x: datetime.fromtimestamp(x if x != '4294967295' else '0', datetime.UTCTZ())\
                                   .astimezone(datetime.localTZ()),

mythtv/bindings/python/MythTV/connections.py

@@ -83,7 +83,7 @@ def __init__(self):
         for i in range(self._poolsize):
             self._pool.append(self._connect())
 
-    def __del__(self):
+    def _cleanup(self):
         for conn in self._pool:
             conn.close()
         for id,conn in self._inuse.items():
@@ -313,7 +313,7 @@ def backendCommand(self, data, deadline=None):
 
                 # convert to unicode
                 try:
-                    res = str(''.join([res]), 'utf8')
+                    res = str(b''.join([res]), 'utf-8')
                 except:
                     res = u''.join([res])
 
@@ -396,7 +396,7 @@ def queueEvents(self):
                     event = self.socket.recvheader(deadline=0.0)
 
                     try:
-                        event = str(''.join([event]), 'utf8')
+                        event = str(b''.join([event]), 'utf-8')
                     except:
                         event = u''.join([event])
 
@@ -458,10 +458,10 @@ class FEConnection( object ):
                     'key':   lambda r: r=='OK',
                     'query': lambda r: r,
                     'play':  lambda r: r=='OK'}
-    _res_help = {'jump':  re.compile('(\w+)[ ]+- ([\w /,]+)'),
+    _res_help = {'jump':  re.compile(r'(\w+)[ ]+- ([\w /,]+)'),
                  'key':   lambda r: r.split('\r\n')[4].split(', '),
-                 'query': re.compile('query ([\w ]*\w+)[ \r\n]+- ([\w /,]+)'),
-                 'play':  re.compile('play ([\w -:]*\w+)[ \r\n]+- ([\w /:,\(\)]+)')}
+                 'query': re.compile(r'query ([\w ]*\w+)[ \r\n]+- ([\w /,]+)'),
+                 'play':  re.compile(r'play ([\w -:]*\w+)[ \r\n]+- ([\w /:,\(\)]+)')}
 
     def __init__(self, host, port, deadline=10.0, test=True):
         self.isConnected = False
@@ -473,7 +473,7 @@ def __init__(self, host, port, deadline=10.0, test=True):
 
     @classmethod
     def fromUPNP(cls, timeout=5):
-        reLOC = re.compile('http://(?P<ip>[0-9\.]+):(?P<port>[0-9]+)/.*')
+        reLOC = re.compile(r'http://(?P<ip>[0-9\.]+):(?P<port>[0-9]+)/.*')
         msearch = MSearch()
         for res in msearch.searchMythFE(timeout):
             ip, port = reLOC.match(res['location']).group(1,2)
@@ -526,7 +526,7 @@ def connect(self, test=True):
     def disconnect(self):
         if not self.isConnected:
             return
-        self.socket.send("exit")
+        self.socket.send(b"exit")
         self.socket.close()
         self.socket = None
         self.isConnected = False
@@ -542,25 +542,25 @@ def send(self, mode, command=None):
         if not self.isConnected:
             self.connect()
         if command is None:
-            self.socket.send("help %s\n" % mode)
+            self.socket.send(("help %s\n" % mode).encode('utf-8'))
             res = self.recv()
             try:
                 return self._res_help[mode].findall(res)
             except:
                 return self._res_help[mode](res)
         else:
-            self.socket.send("%s %s\n" % (mode, command))
+            self.socket.send((u"%s %s\n" % (mode, command)).encode('utf-8'))
             return self._res_handler[mode](self.recv())
 
     def recv(self, deadline=None):
-        prompt = re.compile('([\r\n.]*)\r\n# ')
+        prompt = re.compile(b'([\r\n.]*)\r\n# ')
         try:
             res = self.socket.dlexpect(prompt, deadline=deadline)
         except socket.error:
             raise MythFEError(MythError.FE_CONNECTION, self.host, self.port)
         except KeyboardInterrupt:
             raise
-        return prompt.split(res)[0]
+        return prompt.split(res)[0].decode('utf-8')
 
 class XMLConnection( object ):
     """
@@ -601,7 +601,7 @@ def __init__(self, host, port):
 
     @classmethod
     def fromUPNP(cls, timeout=5.0):
-        reLOC = re.compile('http://(?P<ip>[0-9\.]+):(?P<port>[0-9]+)/.*')
+        reLOC = re.compile(r'http://(?P<ip>[0-9\.]+):(?P<port>[0-9]+)/.*')
         msearch = MSearch()
         for res in msearch.searchMythBE(timeout):
             ip, port = reLOC.match(res['location']).group(1,2)

mythtv/bindings/python/MythTV/database.py

@@ -8,7 +8,7 @@
 from MythTV.altdict import OrdDict, DictData
 from MythTV.logging import MythLog
 from MythTV.msearch import MSearch
-from MythTV.utility import datetime, dt, _donothing, QuickProperty
+from MythTV.utility import datetime, dt, _donothing, QuickProperty, py23_repr
 from MythTV.exceptions import MythError, MythDBError, MythTZError
 from MythTV.connections import DBConnection, LoggedCursor, XMLConnection
 
@@ -220,7 +220,7 @@ def __str__(self):
                  hex(id(self)))
 
     def __repr__(self):
-        return str(self).encode('utf-8')
+        return py23_repr(str(self))
 
     def __getstate__(self):
         data = {'data':DictData.__getstate__(self)}
@@ -346,7 +346,7 @@ def _create(self, data=None, cursor=None):
 
         self._import(data)
         data = self._sanitize(dict(self))
-        for key,val in data.items():
+        for key,val in list(data.items()):
             if val is None:
                 del data[key]
             elif isinstance(val, datetime):
@@ -392,7 +392,7 @@ def _push(self):
         if (self._where is None) or (self._wheredat is None):
             return
         data = self._sanitize(dict(self))
-        for key, value in data.items():
+        for key, value in list(data.items()):
             if value == self._origdata[key]:
             # filter unchanged data
                 del data[key]
@@ -402,7 +402,7 @@ def _push(self):
             # no updates
             return
         format_string = ', '.join(['%s = ?' % d for d in data])
-        sql_values = data.values()
+        sql_values = list(data.values())
         sql_values.extend(self._getwheredat())
         with self._db.cursor(self._log) as cursor:
             cursor.execute("""UPDATE %s SET %s WHERE %s""" \
@@ -463,7 +463,7 @@ def __init__(self, data):
             self._changed = True
             self.__hash__()
         def __str__(self): return str(self.items())
-        def __repr__(self): return str(self).encode('utf-8')
+        def __repr__(self): return py23_repr(str(self))
         def __hash__(self):
             if self._changed:
                 self._hash = hash(sum(map(hash,self.values())))
@@ -1116,7 +1116,7 @@ class _TableFields( OrdDict ):
         """Provides a dictionary-like list of table fieldnames"""
         class _FieldData( OrdDict ):
             def __str__(self): return str(list(self))
-            def __repr__(self): return str(self).encode('utf-8')
+            def __repr__(self): return py23_repr(str(self))
             def __iter__(self): return self.iterkeys()
             def __init__(self, result):
                 data = [(row[0],
@@ -1135,7 +1135,7 @@ def __getitem__(self,key):
                         raise KeyError(str(key))
         _localvars = ['_field_order','_db','_log']
         def __str__(self): return str(list(self))
-        def __repr__(self): return str(self).encode('utf-8')
+        def __repr__(self): return py23_repr(str(self))
         def __iter__(self): return self.iterkeys()
         def __init__(self, db, log):
             OrdDict.__init__(self)
@@ -1160,7 +1160,7 @@ class _Settings( OrdDict ):
         class _HostSettings( OrdDict ):
             _localvars = ['_field_order','_log','_db','_host','_insert','_where']
             def __str__(self): return str(list(self))
-            def __repr__(self): return str(self).encode('utf-8')
+            def __repr__(self): return py23_repr(str(self))
             def __iter__(self): return self.iterkeys()
             def __init__(self, db, log, host):
                 OrdDict.__init__(self)
@@ -1234,7 +1234,7 @@ def getall(self):
 
         _localvars = ['_field_order','_log','_db']
         def __str__(self): return str(list(self))
-        def __repr__(self): return str(self).encode('utf-8')
+        def __repr__(self): return py23_repr(str(self))
         def __iter__(self): return self.iterkeys()
         def __init__(self, db, log):
             OrdDict.__init__(self)
@@ -1440,7 +1440,7 @@ def __str__(self):
                     (self.groupname, self.hostname,
                         self.dirname, hex(id(self)))
 
-    def __repr__(self): return str(self).encode('utf-8')
+    def __repr__(self): return py23_repr(str(self))
 
     def _evalwheredat(self, wheredat=None):
         DBData._evalwheredat(self, wheredat)