Video Screensaver v.1.0.2

Lunatixz · Oct 7, 2018 · ef1563f · ef1563f
1 parent 8ab846e
commit ef1563f
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-*.pyo
+*.pyo
+*.pyc
diff --git a/addons.xml b/addons.xml
@@ -1657,7 +1657,7 @@
     </extension>
 </addon>
 
-<addon id="screensaver.videosaver" name="Video ScreenSaver" version="1.0.1" provider-name="Lunatixz">
+<addon id="screensaver.videosaver" name="Video ScreenSaver" version="1.0.2" provider-name="Lunatixz">
     <requires>
         <import addon="xbmc.python" version="2.25.0"/>
     </requires>
@@ -1666,12 +1666,15 @@
     <extension point="xbmc.addon.metadata">
         <summary lang="en_GB">Create a screensaver from any Kodi video source.</summary>
         <description lang="en_GB">Dynamic screensaver using Local content, SmartPlaylists, Plugins and UPNP Servers.</description>
+		<summary lang="es_ES">Crea un protector de pantalla de cualquier fuente de vídeo en Kodi.</summary>
+        <description lang="es_ES">Protector de pantalla dinámico que utiliza contenido local, listas de reproducción inteligentes, complementos y servidores UPNP.</description>
         <license>GNU GENERAL PUBLIC LICENSE. Version 3, June 2007</license>
         <platform>all</platform>
         <forum>https://forum.kodi.tv/showthread.php?tid=319730</forum>
         <source>https://github.com/Lunatixz/Kodi_Addons/tree/master/screensaver.videosaver</source>
         <disclaimer lang="en_GB" >Streaming sources not recommend for metered Internet.</disclaimer>
-        <news>v.1.0.1[CR]-Fixed MultiVideo[CR]Added RepeatOFF</news>
+		<disclaimer lang="es_ES" >Se recomienda no usar recursos en Streaming para conexiones a Internet de uso medido.</disclaimer>
+        <news>v.1.0.2[CR]- Misc. Improvements[CR]- Added Mute Audio[CR]- Spanish Translation (Thanks roliverosc).[CR]v.1.0.1[CR]- Fixed MultiVideo[CR]- Added RepeatOFF</news>
         <assets>
             <icon>resources/images/icon.png</icon>
             <fanart>resources/images/fanart.jpg</fanart>

diff --git a/addons.xml.md5 b/addons.xml.md5
@@ -1 +1 @@
-22948ce7ea5f351e18f451d3177378e8
+5d5401e4ebf67bc76cd481208df0c3e1
diff --git a/screensaver.videosaver/addon.xml b/screensaver.videosaver/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="screensaver.videosaver" name="Video ScreenSaver" version="1.0.1" provider-name="Lunatixz">
+<addon id="screensaver.videosaver" name="Video ScreenSaver" version="1.0.2" provider-name="Lunatixz">
     <requires>
         <import addon="xbmc.python" version="2.25.0"/>
     </requires>
@@ -15,8 +15,8 @@
         <forum>https://forum.kodi.tv/showthread.php?tid=319730</forum>
         <source>https://github.com/Lunatixz/Kodi_Addons/tree/master/screensaver.videosaver</source>
         <disclaimer lang="en_GB" >Streaming sources not recommend for metered Internet.</disclaimer>
-		<disclaimer lang="es_ES" >Se recomienda no usar recursos en Streaming para conexiones a Internet de uso medido.</disclaimer>		
-        <news>v.1.0.1[CR]-Fixed MultiVideo[CR}-Added RepeatOFF</news>
+		<disclaimer lang="es_ES" >Se recomienda no usar recursos en Streaming para conexiones a Internet de uso medido.</disclaimer>	
+        <news>v.1.0.2[CR]- Misc. Improvements[CR]- Added Mute Audio[CR]- Spanish Translation (Thanks roliverosc).[CR]v.1.0.1[CR]- Fixed MultiVideo[CR]- Added RepeatOFF</news>
         <assets>
             <icon>resources/images/icon.png</icon>
             <fanart>resources/images/fanart.jpg</fanart>

diff --git a/screensaver.videosaver/default.py b/screensaver.videosaver/default.py
@@ -1,4 +1,4 @@
-#   Copyright (C) 2017 Lunatixz
+#   Copyright (C) 2018 Lunatixz
 #
 #
 # This file is part of Video ScreenSaver.
@@ -16,43 +16,83 @@
 # You should have received a copy of the GNU General Public License
 # along with Video ScreenSaver.  If not, see <http://www.gnu.org/licenses/>.
 
-import urllib, json, os
+import urllib, json, os, traceback
 import xbmc, xbmcaddon, xbmcvfs, xbmcgui
 
 # Plugin Info
 ADDON_ID       = 'screensaver.videosaver'
 REAL_SETTINGS  = xbmcaddon.Addon(id=ADDON_ID)
 ADDON_NAME     = REAL_SETTINGS.getAddonInfo('name')
+ADDON_VERSION  = REAL_SETTINGS.getAddonInfo('version')
 ADDON_PATH     = (REAL_SETTINGS.getAddonInfo('path').decode('utf-8'))
 SETTINGS_LOC   = REAL_SETTINGS.getAddonInfo('profile').decode('utf-8')
 XSP_CACHE_LOC  = os.path.join(SETTINGS_LOC, 'cache','')
 MEDIA_EXTS     = (xbmc.getSupportedMedia('video')).split('|')
 ACTION_STOP    = 13
+MUTE           = REAL_SETTINGS.getSetting('Enable_Mute') == 'true'
+DEBUG          = REAL_SETTINGS.getSetting('Enable_Debugging') == 'true'
+LANGUAGE       = REAL_SETTINGS.getLocalizedString
 
+def log(msg, level=xbmc.LOGDEBUG):
+    if DEBUG == False and level != xbmc.LOGERROR: return
+    if level == xbmc.LOGERROR: msg += ' ,' + traceback.format_exc()
+    xbmc.log(ADDON_ID + '-' + ADDON_VERSION + '-' + (msg.encode("utf-8")), level)
+
+def isMute():
+    state = False
+    json_query = '{"jsonrpc":"2.0","method":"Application.GetProperties","params":{"properties":["muted"]},"id":1}'
+    json_response = json.loads(xbmc.executeJSONRPC(json_query))
+    if json_response and 'result' in json_response: state = json_response['result']['muted']
+    log('isMute, state = ' + str(state))
+    return state
+
+def setMute(state):
+    log('setMute, state = ' + str(state))
+    if isMute() == state: return
+    json_query = '{"jsonrpc":"2.0","method":"Application.SetMute","params":{"mute":%s},"id":1}'%str(state).lower()
+    json_response = json.loads(xbmc.executeJSONRPC(json_query))
+
+def ProgressDialogBG(percent=0, control=None, string1='', header=ADDON_NAME):
+    if percent == 0 and not control:
+        control = xbmcgui.DialogProgressBG()
+        control.create(header, string1)
+    elif percent == 100 and control: return control.close()
+    elif control: control.update(percent, string1)
+    return control
+
 class BackgroundWindow(xbmcgui.WindowXMLDialog):
     def __init__(self, *args, **kwargs):
         xbmcgui.WindowXMLDialog.__init__(self, *args, **kwargs)
         self.myPlayer = Player()
+        if MUTE: setMute(True)
 
 
     def onAction(self, act):
+        log('onAction')
         if REAL_SETTINGS.getSetting("LockAction") == 'true' and act.getId() != ACTION_STOP: return
-        xbmc.executebuiltin("PlayerControl(RepeatOff)")
-        xbmcgui.Window(10000).clearProperty('script.trakt.paused')
-        self.myPlayer.stop()        
+        if MUTE: setMute(False)
+        self.myPlayer.stop()
         self.close()
 
-        
+
 class Player(xbmc.Player):
     def __init__(self):
         xbmc.Player.__init__(self, xbmc.Player()) 
         if REAL_SETTINGS.getSetting("TraktDisable") == 'true': xbmcgui.Window(10000).setProperty('script.trakt.paused','true')
 
 
+    def onPlayBackStopped(self):
+        log('onPlayBackStopped')
+        xbmc.executebuiltin("PlayerControl(RepeatOff)")
+        xbmcgui.Window(10000).clearProperty('script.trakt.paused')
+        self.stop()  
+
+
 class Start():
     def __init__(self):
         self.fileCount     = 0
         self.dirCount      = 0
+        self.busy          = None
         self.myPlayer      = Player()
         self.singleVideo   = int(REAL_SETTINGS.getSetting("VideoSource")) == 0
         self.smartPlaylist = REAL_SETTINGS.getSetting("VideoFile")[-3:] == 'xsp' 
@@ -62,6 +102,7 @@ def __init__(self):
 
 
     def sendJSON(self, command):
+        log('sendJSON, command = %s'%(command))
         return xbmc.executeJSONRPC(command)
 
 
@@ -72,19 +113,24 @@ def loadJson(self, string):
 
 
     def getFileDetails(self, path):
+        log('getFileDetails')
         json_query    = ('{"jsonrpc":"2.0","method":"Files.GetFileDetails","params":{"file":"%s","media":"video","properties":["file"]},"id":1}' % (self.escapeDirJSON(path)))
         json_response = self.sendJSON(json_query)
         return self.loadJson(json_response)
 
 
     def getDirectory(self, path, media='video', ignore='false', method='random', order='ascending', end=0, start=0, filter={}):
+        log('getDirectory, path = %s'%(path))
         json_query    = ('{"jsonrpc":"2.0","method":"Files.GetDirectory","params":{"directory":"%s","media":"%s","sort":{"ignorearticle":%s,"method":"%s","order":"%s"},"limits":{"end":%s,"start":%s}},"id":1}' % (self.escapeDirJSON(path), media, ignore, method, order, end, start))
         json_response = self.sendJSON(json_query)
         return self.loadJson(json_response)
 
 
     def buildDirectory(self, path, limit):
+        log('buildDirectory, path = %s'%(path))
         itemLST = []
+        dirLST  = []
+        if self.busy is None: self.busy = ProgressDialogBG(0, string1=LANGUAGE(32013))
         json_response = self.getDirectory(path, end=limit)
         if 'result' in json_response and json_response['result'] != None and 'files' in json_response['result']:
             response = json_response['result']['files']
@@ -95,13 +141,20 @@ def buildDirectory(self, path, limit):
                 if fileType == 'file':
                     self.fileCount += 1
                     itemLST.append(file)
-                elif fileType == 'directory' and (self.fileCount < limit and self.dirCount < limit):
+                    ProgressDialogBG(i*100//limit, self.busy, string1=item['label'])
+                elif fileType == 'directory': 
                     self.dirCount += 1
-                    itemLST.extend(self.buildDirectory(file, limit))        
+                    dirLST.append(file)
+            if self.fileCount < limit:
+                for dir in dirLST:
+                    if self.fileCount >= limit: break
+                    itemLST.extend(self.buildDirectory(file, limit))  
+        ProgressDialogBG(100, self.busy, string1=LANGUAGE(32013))    
         return itemLST
 
 
     def buildItems(self, responce):
+        log('buildItems')
         if 'result' in responce and 'filedetails' in responce['result']: key = 'filedetails'
         elif 'result' in responce and 'files' in responce['result']: key = 'files'
         for item in responce['result'][key]:
@@ -116,17 +169,19 @@ def escapeDirJSON(self, dir_name):
 
 
     def getSmartPlaylist(self, path):
+        log('getSmartPlaylist')
         if not xbmcvfs.exists(XSP_CACHE_LOC): xbmcvfs.mkdirs(XSP_CACHE_LOC)
         if xbmcvfs.copy(path, os.path.join(XSP_CACHE_LOC,os.path.split(path)[1])):
             if xbmcvfs.exists(os.path.join(XSP_CACHE_LOC,os.path.split(path)[1])): return os.path.join(XSP_CACHE_LOC,os.path.split(path)[1])
         return path
 
 
     def buildPlaylist(self):
+        log('buildPlaylist')
         xbmc.executebuiltin("PlayerControl(RepeatAll)")
-        playList = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
-        playList.clear()
-        xbmc.sleep(100)
+        self.playList = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
+        self.playList.clear()
+        xbmc.sleep(500)
         if not self.singleVideo:
             videoLimit   = int(REAL_SETTINGS.getSetting("VideoLimit"))
             videoPath    = REAL_SETTINGS.getSetting("VideoFolder")
@@ -141,11 +196,10 @@ def buildPlaylist(self):
                 if not videoPath.startswith(('plugin','upnp')): playListItem = list(self.buildItems(self.getFileDetails(videoPath)))
                 else: playListItem = [videoPath]
 
-        for idx, playItem in enumerate(playListItem): playList.add(playItem, index=idx)
-        if not self.videoRandom: playList.unshuffle()
-        else: playList.shuffle()
-        if REAL_SETTINGS.getSetting("TraktDisable") == 'true': xbmcgui.Window(10000).setProperty('script.trakt.paused','true')
-        self.myPlayer.play(playList)
+        for idx, playItem in enumerate(playListItem): self.playList.add(playItem, index=idx)
+        if not self.videoRandom: self.playList.unshuffle()
+        else: self.playList.shuffle()
+        self.myPlayer.play(self.playList)
         self.background.doModal()
 
 if __name__ == '__main__': Start()
diff --git a/screensaver.videosaver/resources/language/resource.language.en_gb/strings.po b/screensaver.videosaver/resources/language/resource.language.en_gb/strings.po
@@ -54,4 +54,16 @@ msgstr ""
 
 msgctxt "#32010"
 msgid "Multiple Videos"
+msgstr ""
+
+msgctxt "#32011"
+msgid "Mute ScreenSaver"
+msgstr ""
+
+msgctxt "#32012"
+msgid "Enable Debugging [Log errors]"
+msgstr ""
+
+msgctxt "#32013"
+msgid "Building Playlist"
 msgstr ""
diff --git a/screensaver.videosaver/resources/language/resource.language.es_es/strings.po b/screensaver.videosaver/resources/language/resource.language.es_es/strings.po
@@ -55,3 +55,15 @@ msgstr "Un solo vídeo"
 msgctxt "#32010"
 msgid "Multiple Videos"
 msgstr "Multiples vídeos"
+
+msgctxt "#30011"
+msgid "Mute ScreenSaver"
+msgstr "Mute ScreenSaver"
+
+msgctxt "#32012"
+msgid "Enable Debugging [Log errors]"
+msgstr ""
+
+msgctxt "#32013"
+msgid "Building Playlist"
+msgstr "Building Playlist"
diff --git a/screensaver.videosaver/resources/settings.xml b/screensaver.videosaver/resources/settings.xml
@@ -7,4 +7,7 @@
     <setting id="VideoRandom"  type="bool"      label="32006" default="false"                          subsetting="true" visible="eq(-4,1)"/>
     <setting id="TraktDisable" type="bool"      label="32007" default="true"/>
     <setting id="LockAction"   type="bool"      label="32008" default="false"/>
-</settings>
+    <setting id="Enable_Mute"  type="bool"      label="32011" default="false"/>
+    <setting id="Enable_Debugging" type="bool"  label="30000" default="false" />
+</settings>
+
diff --git a/zips/screensaver.videosaver/screensaver.videosaver-1.0.2.zip b/zips/screensaver.videosaver/screensaver.videosaver-1.0.2.zip