Ticket #8406: python.pginfo.patch

MythStatic.py

@@ -8 +8 @@
 MVSCHEMA_VERSION = 1033
 NVSCHEMA_VERSION = 1004
 PROTO_VERSION = 56
-PROGRAM_FIELDS = 47
 BACKEND_SEP = '[]:[]'

MythData.py

@@ -531 +531 @@
     _field_order = [ 'title',        'subtitle',     'description',
                      'category',     'chanid',       'channum',
                      'callsign',     'channame',     'filename',
-                     'fs_high',      'fs_low',       'starttime',
-                     'endtime',      'duplicate',    'shareable',
+                     'filesize',     'starttime',    'endtime',      
                      'findid',       'hostname',     'sourceid',
                      'cardid',       'inputid',      'recpriority',
                      'recstatus',    'recordid',     'rectype',
                      'dupin',        'dupmethod',    'recstartts',
-                     'recendts',     'repeat',       'programflags',
-                     'recgroup',     'commfree',     'outputfilters',
-                     'seriesid',     'programid',    'lastmodified',
-                     'stars',        'airdate',      'hasairdate',
+                     'recendts',     'programflags', 'recgroup',     
+                     'outputfilters','seriesid',     'programid',
+                     'lastmodified', 'stars',        'airdate',
                      'playgroup',    'recpriority2', 'parentid',
                      'storagegroup', 'audio_props',  'video_props',
                      'subtitle_type','year']
     _field_type = [  3,      3,      3,
                      3,      0,      3,
                      3,      3,      3,
-                     0,      0,      4,
-                     4,      0,      0,
+                     0,      4,      4,                
                      0,      3,      0,
                      0,      0,      0,
                      0,      0,      3,
                      0,      0,      4,
-                     4,      0,      3,
-                     3,      0,      3,
+                     4,      3,      3,
                      3,      3,      3,
-                     1,      3,      0,
+                     3,      1,      3,
                      3,      0,      3,
                      3,      0,      0,
                      0,      0]
@@ -582 +578 @@
             for key in ('title','subTitle','seriesId','programId','airdate',
                     'category','hostname','chanNum','callSign','playGroup',
                     'recGroup','rectype','programFlags','chanId','recStatus',
-                    'commFree','stars'):
+                    'commFree','stars','filesize'):
                 if key in xmldat:
                     dat[key.lower()] = xmldat[key]
             for key in ('startTime','endTime','lastModified',
@@ -590 +586 @@
                 if key in xmldat:
                     dat[key.lower()] = str(int(mktime(strptime(
                                         xmldat[key], '%Y-%m-%dT%H:%M:%S'))))
-            if 'fileSize' in xmldat:
-                dat['fs_high'],dat['fs_low'] = \
-                                    self.splitInt(int(xmldat['fileSize']))
 
             raw = []
             defs = (0,0,0,'',0)
@@ -605 +598 @@
         else:
             raise InputError("Either 'raw' or 'etree' must be provided")
         self._db = DBCache(db)
-        self.filesize = self.joinInt(self.fs_high,self.fs_low)
 
     def toString(self):
         """

MythFunc.py

@@ -189 +189 @@
         self.freeTuner()
 
     def _getPrograms(self, query, recstatus=None, header=0):
+        pgfieldcount = len(Program._field_order)
         programs = []
         res = self.backendCommand(query).split(BACKEND_SEP)
         for i in range(header):
@@ -196 +197 @@
 
         num_progs = int(res.pop(0))
         for i in range(num_progs):
-            offs = i * PROGRAM_FIELDS
-            programs.append(Program(res[offs:offs+PROGRAM_FIELDS], db=self.db))
+            offs = i * pgfieldcount
+            programs.append(Program(res[offs:offs+pgfieldcount], db=self.db))
 
         if recstatus:
             for i in reversed(range(num_progs)):