The branch, frodo has been updated
via 1680f56c4a5be0abc16d1d81d7aedf8056c9dc00 (commit)
from c0f455eb720d0cdfa019c3e4c96815b0d010031f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=1680f56c4a5be0abc16d1d81d7aedf8056c9dc00
commit 1680f56c4a5be0abc16d1d81d7aedf8056c9dc00
Author: Martijn Kaijser <[email protected]>
Date: Fri Sep 20 21:20:25 2013 +0200
[script.artwork.downloader] 12.0.20
diff --git a/script.artwork.downloader/addon.xml
b/script.artwork.downloader/addon.xml
index b13773d..31d546d 100644
--- a/script.artwork.downloader/addon.xml
+++ b/script.artwork.downloader/addon.xml
@@ -2,14 +2,13 @@
<addon
id="script.artwork.downloader"
name="Artwork Downloader"
- version="12.0.19"
+ version="12.0.20"
provider-name="Martijn"
>
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="xbmc.json" version="6.0.0"/>
<import addon="xbmc.addon" version="12.0.0"/>
- <import addon="script.module.elementtree" version="1.2.7"/>
<import addon="script.module.simplejson" version="2.0.10"
optional="true"/>
<import addon="script.common.plugin.cache" version="1.3.0"/>
</requires>
diff --git a/script.artwork.downloader/changelog.txt
b/script.artwork.downloader/changelog.txt
index 42b7fef..3fb419e 100644
--- a/script.artwork.downloader/changelog.txt
+++ b/script.artwork.downloader/changelog.txt
@@ -1,3 +1,6 @@
+[B]12.0.20[/B]
+- Fix local scraping
+
[B]12.0.19[/B]
- Gracefully fail if a non library item is send to the script
- Fix not downloading extrafanart any more
diff --git a/script.artwork.downloader/lib/provider/local.py
b/script.artwork.downloader/lib/provider/local.py
index b234371..277d1b1 100644
--- a/script.artwork.downloader/lib/provider/local.py
+++ b/script.artwork.downloader/lib/provider/local.py
@@ -103,7 +103,7 @@ class local():
filename = "season-all-banner.jpg"
else:
filename = (item['filename'] % int(season))
- if filename in file_list:
+ if filename in file_list[1]:
url = os.path.join(media_item['artworkdir'][0],
filename).encode('utf-8')
j += 1
generalinfo = '%s: %s | ' %(
__localize__(32141), 'n/a')
@@ -130,7 +130,7 @@ class local():
filename = "season-all-landscape.jpg"
else:
filename = (item['filename'] % int(season))
- if filename in file_list:
+ if filename in file_list[1]:
url = os.path.join(media_item['artworkdir'][0],
filename).encode('utf-8')
j += 1
generalinfo = '%s: %s | ' %(
__localize__(32141), 'n/a')
@@ -153,7 +153,7 @@ class local():
else:
filename = item['filename']
- if filename in file_list:
+ if filename in file_list[1]:
url = os.path.join(media_item['artworkdir'][0],
filename).encode('utf-8')
j += 1
generalinfo = '%s: %s | ' %( __localize__(32141),
'n/a')
diff --git a/script.artwork.downloader/lib/provider/tvdb.py
b/script.artwork.downloader/lib/provider/tvdb.py
index ad7c3c1..528b419 100644
--- a/script.artwork.downloader/lib/provider/tvdb.py
+++ b/script.artwork.downloader/lib/provider/tvdb.py
@@ -21,7 +21,7 @@
import sys
#import libraries
-from elementtree import ElementTree as ET
+import xml.etree.ElementTree as ET
from operator import itemgetter
from lib.language import *
from lib.script_exceptions import NoFanartError
-----------------------------------------------------------------------
Summary of changes:
script.artwork.downloader/addon.xml | 3 +--
script.artwork.downloader/changelog.txt | 3 +++
script.artwork.downloader/lib/provider/local.py | 6 +++---
script.artwork.downloader/lib/provider/tvdb.py | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
