Some fixes for videoinfodialog

Add handlers for some new window
Add verbose logging option

Author: ruuk

.gitignore

@@ -4,3 +4,4 @@
 *.pyc
 *.pyo
 *~
+lib/backends

lib/util.py

@@ -31,6 +31,16 @@ def LOG(message):
     message = '{0}: {1}'.format(ADDON_ID,message)
     xbmc.log(msg=message.encode("utf-8"), level=xbmc.LOGNOTICE)
 
+def DEBUG_LOG(message):
+    if not DEBUG:
+        return
+    LOG('DEBUG: {0}'.format(message))
+
+def VERBOSE_LOG(message):
+    if not DEBUG or not VERBOSE:
+        return
+    DEBUG_LOG(message)
+
 def sleep(ms):
     xbmc.sleep(ms)
 
@@ -333,10 +343,16 @@ def getCommand():
     return commandData.split(':',1)[-1]
 #End deprecated
 ################################################################
+DEBUG = False
+VERBOSE = False
 
 def init():
     pd = profileDirectory()
     if not os.path.exists(pd): os.makedirs(pd)
 
-DEBUG = getSetting('debug_logging',True)
-init()
+def reload():
+    global DEBUG, VERBOSE
+    DEBUG = getSetting('debug_logging',True)
+    VERBOSE = getSetting('verbose_logging',False)
+
+init()

lib/windows/__init__.py

@@ -62,7 +62,11 @@
                 10019: SettingsReader, #appearancesettings
                 10021: SettingsReader, #livetvsettings
                 10025: VideoLibraryWindowReader, #videolibrary
+                10030: SettingsReader, #SettingsCategory.xml
+                10031: SettingsReader, #SettingsCategory.xml
+                10032: SettingsReader, #SettingsCategory.xml
                 10034: SettingsReader, #profilesettings
+                10035: SettingsReader, #SettingsCategory.xml
                 14000: SettingsReader, #pvrclientspecificsettings
                 10100: YesNoDialogReader, #yesnodialog
                 10101: ProgressDialogReader,
@@ -95,6 +99,7 @@
                 10622: PVRGuideWindowReader, #radioguide
                 10623: PVRTimersWindowReader, #radiotimers
                 10624: PVRSearchWindowReader, #radiosearch
+                11102: TextViewerReader,
                 12000: SelectDialogReader,
                 12002: YesNoDialogReader,
                 12003: VideoInfoDialogReader, #videoinfodialog

lib/windows/textviewer.py

@@ -16,7 +16,7 @@ def last(self,new):
         self._last_md5sum = md5sum
 
     def getViewerTexts(self):
-        text = xbmc.getInfoLabel('Control.GetLabel(5)').decode('utf-8')
+        text = xbmc.getInfoLabel('Control.GetLabel(5)').decode('utf-8') or xbmc.getInfoLabel('Control.GetLabel(2000)').decode('utf-8')
         if text:
             return self.processLines(text.splitlines())
         else:

lib/windows/videoinfodialog.py

@@ -38,6 +38,8 @@ def getControlText(self,controlID):
                 if text == xbmc.getLocalizedString(k).strip(': '):
                     text = '{0}: {1}'.format(text,self.listMap[k])
                     break
+        elif controlID == 50:
+            text = '{0}: {1}'.format(xbmc.getInfoLabel('Container(50).ListItem.Label'), xbmc.getInfoLabel('Container(50).ListItem.Label2'))
         elif controlID == 61:
             text = '{0}: {1}'.format(xbmc.getLocalizedString(207),xbmc.getInfoLabel('ListItem.Plot'))
         else:

resources/language/English/strings.po

@@ -205,6 +205,9 @@ msgctxt "#32048"
 msgid "Poll Interval (ms)"
 msgstr ""
 
+msgctxt "#32049"
+msgid "Verbose"
+msgstr ""
 
 msgctxt "#32100"
 msgid "Database scan started."

resources/settings.xml

@@ -112,6 +112,7 @@
     <setting label="32044" type="bool" id="use_tmpfs" default="true" />
     <setting label="32045" type="bool" id="disable_broken_backends" default="true" />
     <setting label="32046" type="bool" id="debug_logging" default="false" />
+    <setting label="32049" type="bool" id="verbose_logging" default="false" subsetting="true" enable="eq(-1,true)"/>
     <setting label="32047" type="bool" id="override_poll_interval" default="false" />
     <setting label="32048" type="slider" id="poll_interval" subsetting="true" option="int" default="100" range="50,1000" enable="eq(-1,true)" />
   </category>

service.py

@@ -114,7 +114,7 @@ def processCommand(self,command,data=None):
 
     def reloadSettings(self):
         self.readerOn = not util.getSetting('reader_off',False)
-        util.DEBUG = util.getSetting('debug_logging',True)
+        util.reload()
         self.speakListCount = util.getSetting('speak_list_count',True)
         self.autoItemExtra = False
         if util.getSetting('auto_item_extra',False):
@@ -283,7 +283,7 @@ def end(self):
             import threading
             util.LOG('Remaining Threads:')
             for t in threading.enumerate():
-                util.LOG('  {0}'.format(t.name))
+                util.DEBUG_LOG('  {0}'.format(t.name))
 
     def shutdown(self):
         self.stop = True
@@ -364,12 +364,14 @@ def sayItemExtra(self,interrupt=True):
     def sayText(self,text,interrupt=False):
         assert isinstance(text,unicode), "Not Unicode"
         if self.tts.dead: return self.fallbackTTS(self.tts.deadReason)
+        util.VERBOSE_LOG(repr(text))
         self.tts.say(self.cleanText(text),interrupt)
 
     def sayTexts(self,texts,interrupt=True):
         if not texts: return
         assert all(isinstance(t,unicode) for t in texts), "Not Unicode"
         if self.tts.dead: return self.fallbackTTS(self.tts.deadReason)
+        util.VERBOSE_LOG(repr(texts))
         self.tts.sayList(self.cleanText(texts),interrupt=interrupt)
 
     def insertPause(self,ms=500):
@@ -408,7 +410,7 @@ def checkWindow(self,newN):
         self.winID = winID
         self.updateWindowReader()
         if util.DEBUG:
-            util.LOG('Window ID: {0} Handler: {1} File: {2}'.format(winID,self.windowReader.ID,xbmc.getInfoLabel('Window.Property(xmlfile)')))
+            util.DEBUG_LOG('Window ID: {0} Handler: {1} File: {2}'.format(winID,self.windowReader.ID,xbmc.getInfoLabel('Window.Property(xmlfile)')))
 
         name = self.windowReader.getName()
         if name:
@@ -435,7 +437,7 @@ def checkControl(self,newW):
         controlID = self.window().getFocusId()
         if controlID == self.controlID: return newW
         if util.DEBUG:
-            util.LOG('Control: %s' % controlID)
+            util.DEBUG_LOG('Control: %s' % controlID)
         self.controlID = controlID
         if not controlID: return newW
         return True