The branch, eden has been updated
via c171ecc1e735abb4f4b4c0f0026481a3e7d2fd01 (commit)
from 80412c01c39b3073bd213f53dc020c56e4660ec6 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=c171ecc1e735abb4f4b4c0f0026481a3e7d2fd01
commit c171ecc1e735abb4f4b4c0f0026481a3e7d2fd01
Author: Martijn Kaijser <[email protected]>
Date: Sun Aug 26 16:33:57 2012 +0200
[scrip.artwork.downloader] -v1.0.15
diff --git a/script.artwork.downloader/addon.xml
b/script.artwork.downloader/addon.xml
index ab7c19c..6dc6087 100644
--- a/script.artwork.downloader/addon.xml
+++ b/script.artwork.downloader/addon.xml
@@ -2,7 +2,7 @@
<addon
id="script.artwork.downloader"
name="Artwork Downloader"
- version="1.0.14"
+ version="1.0.15"
provider-name="paddycarey, putneyj, Martijn"
>
<requires>
diff --git a/script.artwork.downloader/changelog.txt
b/script.artwork.downloader/changelog.txt
index 5dd5190..83c57b5 100644
--- a/script.artwork.downloader/changelog.txt
+++ b/script.artwork.downloader/changelog.txt
@@ -1,3 +1,7 @@
+[B]1.0.15[/B]
+- Disable autorun
+- Disable fanart deletion and reduce max number of image
+
[B]1.0.14[/B]
- Fixed: Possible empty library list when there was no season data
diff --git a/script.artwork.downloader/default.py
b/script.artwork.downloader/default.py
index e3e79d6..1a363bd 100644
--- a/script.artwork.downloader/default.py
+++ b/script.artwork.downloader/default.py
@@ -544,9 +544,11 @@ class Main:
limited = self.filters.do_filter(art_type,
self.mediatype, item['artwork_details'], limit_counter, pref_language, disctype)
else:
limited = self.filters.do_filter(art_type,
self.mediatype, item['artwork_details'], limit_counter, pref_language)
+
# Delete extrafanart when below settings and
parsing the reason message
if limited[0] and not i == 1 and art_type in
['extrafanart', 'extrathumbs']:
-
self.fileops._delete_file_in_dirs(item['filename'], item['targetdirs'],
limited[1],self.media_name)
+
#self.fileops._delete_file_in_dirs(item['filename'], item['targetdirs'],
limited[1],self.media_name)
+ pass
# Just ignore image when it's below settings
elif limited[0]:
imageignore = True
diff --git a/script.artwork.downloader/resources/lib/media_setup.py
b/script.artwork.downloader/resources/lib/media_setup.py
index 86e085f..d11d51b 100644
--- a/script.artwork.downloader/resources/lib/media_setup.py
+++ b/script.artwork.downloader/resources/lib/media_setup.py
@@ -19,7 +19,7 @@ except:
import storageserverdummy as StorageServer
cacheMedia = StorageServer.StorageServer("ArtworkDownloader",1)
-#cacheMedia.timeout = 600 # In seconds
+cacheMedia.timeout = 600 # In seconds
# Retrieve JSON data from cache function
def _media_listing(media_type):
diff --git a/script.artwork.downloader/resources/lib/settings.py
b/script.artwork.downloader/resources/lib/settings.py
index 134a67a..5756ced 100644
--- a/script.artwork.downloader/resources/lib/settings.py
+++ b/script.artwork.downloader/resources/lib/settings.py
@@ -68,11 +68,13 @@ class settings:
self.files_overwrite = __addon__.getSetting("files_overwrite")
== 'true'
self.xbmc_caching_enabled =
__addon__.getSetting("xbmc_caching_enabled") == 'true'
self.debug_enabled = __addon__.getSetting("debug_enabled")
== 'true'
-
+ self.service_startup = False
+ self.service_enable = False
+
### Initial limit vars
def _get_limit(self):
self.limit_artwork =
__addon__.getSetting("limit_artwork") == 'true'
- self.limit_extrafanart_max =
int(__addon__.getSetting("limit_extrafanart_max").rstrip('0').rstrip('.'))
+ self.limit_extrafanart_max =
int(__addon__.getSetting("limit_extrafanart_maximum").rstrip('0').rstrip('.'))
self.limit_extrafanart_rating =
int(__addon__.getSetting("limit_extrafanart_rating").rstrip('0').rstrip('.'))
self.limit_size_moviefanart =
int(__addon__.getSetting("limit_size_moviefanart"))
self.limit_size_tvshowfanart =
int(__addon__.getSetting("limit_size_tvshowfanart"))
diff --git a/script.artwork.downloader/resources/lib/utils.py
b/script.artwork.downloader/resources/lib/utils.py
index 786dad6..83763cc 100644
--- a/script.artwork.downloader/resources/lib/utils.py
+++ b/script.artwork.downloader/resources/lib/utils.py
@@ -29,7 +29,7 @@ try:
except:
import storageserverdummy as StorageServer
-cache = StorageServer.StorageServer("ArtworkDownloader",168)
+cache = StorageServer.StorageServer("ArtworkDownloader",240)
### Adjust default timeout to stop script hanging
socket.setdefaulttimeout(20)
diff --git a/script.artwork.downloader/resources/settings.xml
b/script.artwork.downloader/resources/settings.xml
index b84c846..215892a 100644
--- a/script.artwork.downloader/resources/settings.xml
+++ b/script.artwork.downloader/resources/settings.xml
@@ -7,6 +7,7 @@
<setting label="32033" type="bool" id="background"
default="false"/>
<setting label="32034" type="bool" id="notify"
subsetting="true" default="false" enable="eq(-1,true)" visible="eq(-1,true)"/>
<setting type="sep" />
+ <!--
<setting label="32023" type="bool" id="service_startup"
default="false"/>
<setting label="32019" type="labelenum" id="service_startupdelay"
subsetting="true" values="00|10|20|30" default="--" visible="eq(-1,true)"/>
<setting type="sep" />
@@ -14,6 +15,7 @@
<setting label="32002" type="labelenum" id="service_runtime"
subsetting="true"
values="00|01|02|03|04|05|06|07|08|09|10|11|12|13|14|15|16|17|18|19|20|21|22|23"
default="00" enable="eq(-1,true)" visible="eq(-1,true)"/>
<setting label="32029" type="text" subsetting="true"
enable="false"/>
<setting type="sep" />
+ -->
<setting label="32039" type="action"
action="RunScript($CWD/resources/lib/viewer.py, downloadreport)" />
<setting type="sep" />
</category>
@@ -24,7 +26,7 @@
<setting label="32052" type="lsep" />
<setting type="sep" />
<setting label="32051" type="bool" id="limit_artwork"
default="true"/>
- <setting label="32053" type="slider" id="limit_extrafanart_max"
subsetting="true" enable="eq(-1,true)" visible="eq(-1,true)" default="20"
range="5,5,100" option="int" />
+ <setting label="32053" type="slider" id="limit_extrafanart_maximum"
subsetting="true" enable="eq(-1,true)" visible="eq(-1,true)" default="5"
range="5,5,20" option="int" />
<setting label="32054" type="slider" id="limit_extrafanart_rating"
subsetting="true" enable="eq(-2,true)" visible="eq(-2,true)" default="5"
range="0,10" option="int" />
<setting label="32055" type="labelenum" id="limit_preferred_language"
subsetting="true" enable="eq(-3,true)" visible="eq(-3,true)"
default="English"
values="Chinese|Dutch|English|Finnish|French|German|Hungarian|Italian|Japanese|Polish|Portuguese|Russian|Spanish|Swedish"
/>
<setting label="32056" type="bool" id="limit_notext"
subsetting="true" enable="eq(-4,true)" visible="eq(-4,true)" default="true" />
-----------------------------------------------------------------------
Summary of changes:
script.artwork.downloader/addon.xml | 2 +-
script.artwork.downloader/changelog.txt | 4 +
script.artwork.downloader/default.py | 4 +-
.../resources/docs/pre-eden.xml | 63 ----------------
.../resources/docs/runscript.txt | 76 --------------------
.../resources/lib/media_setup.py | 2 +-
.../resources/lib/settings.py | 6 +-
script.artwork.downloader/resources/lib/utils.py | 2 +-
script.artwork.downloader/resources/settings.xml | 4 +-
9 files changed, 17 insertions(+), 146 deletions(-)
delete mode 100644 script.artwork.downloader/resources/docs/pre-eden.xml
delete mode 100644 script.artwork.downloader/resources/docs/runscript.txt
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
