Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

test fix for script thinking it's still running

  • Loading branch information...
commit 2149c3a579b8333dec4c994cd9f1877d24b17bce 1 parent 6f1d6d9
@pkscout authored
Showing with 15 additions and 12 deletions.
  1. +4 −4 addon.xml
  2. +11 −8 default.py
View
8 addon.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.artistslideshow" name="Artist Slideshow" version="1.5.1" provider-name="ronie|pkscuot">
- <website>http://wiki.xbmc.org/index.php?title=Add-on:Artist_Slideshow</website>
- <forum>http://forum.xbmc.org/showthread.php?t=124880</forum>
- <source>https://github.com/pkscout/script.artistslideshow</source>
- <email>kyle dot johnson at alumni dot duke dot edu</email>
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.elementtree" version="1.2.7"/>
@@ -12,6 +8,10 @@
<provides>executable</provides>
</extension>
<extension point="xbmc.addon.metadata">
+ <website>http://wiki.xbmc.org/index.php?title=Add-on:Artist_Slideshow</website>
+ <forum>http://forum.xbmc.org/showthread.php?t=124880</forum>
+ <source>https://github.com/pkscout/script.artistslideshow</source>
+ <email>kyle dot johnson at alumni dot duke dot edu</email>
<summary lang="be">Download images and additional info of the currently playing artist</summary>
<summary lang="bg">Сваля изображения и допълнителна инф. за изпълнителя на текущата песен</summary>
<summary lang="da">Hent billeder af og ekstra info om kunstneren, der spiller i øjeblikket</summary>
View
19 default.py
@@ -126,7 +126,7 @@ def __init__( self ):
if( xbmc.Player().isPlayingAudio() == False and xbmc.getInfoLabel( self.EXTERNALCALL ) == '' ):
log('no music playing')
if( self.DAEMON == "False" ):
- self.WINDOW.clearProperty("ArtistSlideshowRunning")
+ self._set_property("ArtistSlideshowRunning")
else:
log('first song started')
time.sleep(0.2) # it may take some time for xbmc to read tag info after playback started
@@ -145,12 +145,15 @@ def __init__( self ):
if(not (self.LocalImagesFound and self.PRIORITY == '1')):
log('same artist playing, continue download')
self._use_correct_artwork()
- else:
- time.sleep(1) # doublecheck if playback really stopped
- if( xbmc.Player().isPlayingAudio() == False and xbmc.getInfoLabel( self.EXTERNALCALL ) == '' ):
- if ( self.DAEMON == "False" ):
- self._clean_dir( self.MergeDir )
- self._set_property("ArtistSlideshowRunning")
+ elif ( self.DAEMON == "False" ):
+ self._clean_dir( self.MergeDir )
+ self._set_property("ArtistSlideshowRunning")
+ #else:
+ # time.sleep(1) # doublecheck if playback really stopped
+ # if( xbmc.Player().isPlayingAudio() == False and xbmc.getInfoLabel( self.EXTERNALCALL ) == '' ):
+ # if ( self.DAEMON == "False" ):
+ # self._clean_dir( self.MergeDir )
+ # self._set_property("ArtistSlideshowRunning")
else:
self._clear_properties()
break
@@ -771,7 +774,7 @@ def _set_property( self, property_name, value=""):
self.WINDOW.setProperty(property_name, value)
except:
pass
- #log(" *************** Exception: Couldn't set propery " + property_name + " value " + value)
+ log(" *************** Exception: Couldn't set propery " + property_name + " value " + value)
if ( __name__ == "__main__" ):
Please sign in to comment.
Something went wrong with that request. Please try again.