The branch, frodo has been updated
via 513ba5e167000b90212ac9aec72cdd048e6b1ae5 (commit)
from 96f9c7d43f743dff91d869c2a16a1571c449db21 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=513ba5e167000b90212ac9aec72cdd048e6b1ae5
commit 513ba5e167000b90212ac9aec72cdd048e6b1ae5
Author: ronie <[email protected]>
Date: Wed Mar 20 23:31:07 2013 +0100
[script.tvtunes] -v3.0.6
diff --git a/script.tvtunes/addon.xml b/script.tvtunes/addon.xml
index 00762e4..852117d 100644
--- a/script.tvtunes/addon.xml
+++ b/script.tvtunes/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.tvtunes" name="TvTunes" version="3.0.5"
provider-name="Ppic|Frost|ronie">
+<addon id="script.tvtunes" name="TvTunes" version="3.0.6"
provider-name="Ppic|Frost|ronie">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
diff --git a/script.tvtunes/changelog.txt b/script.tvtunes/changelog.txt
index d00951f..442096d 100644
--- a/script.tvtunes/changelog.txt
+++ b/script.tvtunes/changelog.txt
@@ -1,3 +1,6 @@
+v3.0.6
+- fix scraper crash due to missing exact_match setting check
+
v3.0.5
- if exact match is disabled don't auto download if there's only one result
diff --git a/script.tvtunes/resources/tvtunes_scraper.py
b/script.tvtunes/resources/tvtunes_scraper.py
index aaf5ddf..3f55af5 100644
--- a/script.tvtunes/resources/tvtunes_scraper.py
+++ b/script.tvtunes/resources/tvtunes_scraper.py
@@ -73,6 +73,7 @@ class TvTunes:
self.download_url = "http://www.televisiontunes.com/download.php?f=%s";
self.theme_file = "theme.mp3"
self.enable_custom_path = __addon__.getSetting("custom_path_enable")
+ self.exact_match = __addon__.getSetting('exact_match')
if self.enable_custom_path == "true":
self.custom_path =
__addon__.getSetting("custom_path").decode("utf-8")
self.TVlist = self.listing()
@@ -110,7 +111,7 @@ class TvTunes:
break
theme_list = self.search_theme_list( show[0])
#log( theme_list )
- if (len(theme_list) == 1) and (exact_match == 'true'):
+ if (len(theme_list) == 1) and (self.exact_match == 'true'):
theme_url = self.download_url %
theme_list[0]["url"].replace("http://www.televisiontunes.com/";,
"").replace(".html" , "")
else:
theme_url = self.get_user_choice( theme_list , show[0] )
@@ -185,7 +186,6 @@ class TvTunes:
next = True
url = self.search_url % urllib.quote_plus(showname)
urlpage = ""
- exact_match = __addon__.getSetting('exact_match')
while next == True:
### on recup le result de la recherche
data = get_html_source( url + urlpage )
@@ -201,7 +201,7 @@ class TvTunes:
theme["url"] = i[0] or ""
theme["name"] = i[1] or ""
# in case of an exact match (when enabled) only return this
theme
- if exact_match == 'true' and theme["name"] == showname:
+ if self.exact_match == 'true' and theme["name"] == showname:
theme_list = []
theme_list.append(theme)
return theme_list
-----------------------------------------------------------------------
Summary of changes:
script.tvtunes/addon.xml | 2 +-
script.tvtunes/changelog.txt | 3 +++
script.tvtunes/resources/tvtunes_scraper.py | 6 +++---
3 files changed, 7 insertions(+), 4 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
