The branch, gotham has been updated
via 08702b30e028ae45790aec2c04715e28508fadf7 (commit)
via a28addfb3214cffe36a7392e7427287c16a4bd31 (commit)
via 4853630951600fae504a9e54eee397716a153944 (commit)
from 4a1fed405a3089307ea6b75a15932a2fff5d47b4 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=08702b30e028ae45790aec2c04715e28508fadf7
commit 08702b30e028ae45790aec2c04715e28508fadf7
Author: Martijn Kaijser <[email protected]>
Date: Sun Aug 31 14:17:58 2014 +0200
[service.subtitles.opensubtitles] 5.0.9
diff --git a/service.subtitles.opensubtitles/addon.xml
b/service.subtitles.opensubtitles/addon.xml
index c0dc4fd..92556fb 100755
--- a/service.subtitles.opensubtitles/addon.xml
+++ b/service.subtitles.opensubtitles/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.subtitles.opensubtitles"
name="OpenSubtitles.org"
- version="5.0.8"
+ version="5.0.9"
provider-name="amet">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/service.subtitles.opensubtitles/changelog.txt
b/service.subtitles.opensubtitles/changelog.txt
index d37c8df..05a5636 100644
--- a/service.subtitles.opensubtitles/changelog.txt
+++ b/service.subtitles.opensubtitles/changelog.txt
@@ -1,3 +1,8 @@
+5.0.9
+- fix hash large rars, Beam
+- Support for preferred language sorting and fetch using IMDBID, Glenn Jennehed
+- fix: hack to work around issue where Brazilian is not found as language in
XBMC
+
5.0.8
- fix: extension is needed for downloaded files
diff --git a/service.subtitles.opensubtitles/resources/lib/OSUtilities.py
b/service.subtitles.opensubtitles/resources/lib/OSUtilities.py
index d9a0856..6104773 100644
--- a/service.subtitles.opensubtitles/resources/lib/OSUtilities.py
+++ b/service.subtitles.opensubtitles/resources/lib/OSUtilities.py
@@ -47,15 +47,31 @@ class OSDBServer:
'moviehash' :hash,
'moviebytesize':str(size)
})
+ if not item['tvshow']:
+ searchlist.append({'sublanguageid'
:",".join(item['3let_language']),
+ 'imdbid'
:str(xbmc.Player().getVideoInfoTag().getIMDBNumber().replace('tt',''))
+ })
except:
pass
- searchlist.append({'sublanguageid':",".join(item['3let_language']),
- 'query' :OS_search_string
- })
- search = self.server.SearchSubtitles( self.osdb_token, searchlist )
- if search["data"]:
- return search["data"]
+ if item['mansearch']:
+ searchlist = [{'sublanguageid':",".join(item['3let_language']),
+ 'query' :OS_search_string
+ }]
+ search = self.server.SearchSubtitles( self.osdb_token, searchlist )
+ if search["data"]:
+ return search["data"]
+ else:
+ search = self.server.SearchSubtitles( self.osdb_token, searchlist )
+ if search["data"]:
+ return search["data"]
+ else:
+ searchlist = [{'sublanguageid':",".join(item['3let_language']),
+ 'query' :OS_search_string
+ }]
+ search = self.server.SearchSubtitles( self.osdb_token, searchlist )
+ if search["data"]:
+ return search["data"]
def download(self, ID, dest):
@@ -124,7 +140,7 @@ def OpensubtitlesHashRar(firsrarfile):
s_partiizebodystart=seek+size
s_partiizebody,s_unpacksize=struct.unpack( '<II', a[7:7+2*4])
if (flag & 0x0100):
- s_unpacksize=(unpack( '<I', a[36:36+4])[0] <<32 )+s_unpacksize
+ s_unpacksize=(struct.unpack( '<I', a[36:36+4])[0] <<32
)+s_unpacksize
log( __name__ , 'Hash untested for files biger that 2gb. May
work or may generate bad hash.')
lastrarfile=getlastsplit(firsrarfile,(s_unpacksize-1)/s_partiizebody)
hash=addfilehash(firsrarfile,s_unpacksize,s_partiizebodystart)
diff --git a/service.subtitles.opensubtitles/service.py
b/service.subtitles.opensubtitles/service.py
index 2fff40d..dedb215 100755
--- a/service.subtitles.opensubtitles/service.py
+++ b/service.subtitles.opensubtitles/service.py
@@ -40,8 +40,14 @@ def Search( item ):
return
if search_data != None:
- search_data.sort(key=lambda x: [not x['MatchedBy'] ==
'moviehash',x['LanguageName']])
+ search_data.sort(key=lambda x: [not x['MatchedBy'] == 'moviehash',
+ not os.path.splitext(x['SubFileName'])[0]
==
os.path.splitext(os.path.basename(urllib.unquote(xbmc.Player().getPlayingFile().decode('utf-8'))))[0],
+ not
normalizeString(xbmc.getInfoLabel("VideoPlayer.OriginalTitle")).lower() in
x['SubFileName'].replace('.',' ').lower(),
+ not x['LanguageName'] == PreferredSub])
for item_data in search_data:
+ ## hack to work around issue where Brazilian is not found as language in
XBMC
+ if item_data["LanguageName"] == "Brazilian":
+ item_data["LanguageName"] = "Portuguese (Brazil)"
listitem = xbmcgui.ListItem(label = item_data["LanguageName"],
label2 = item_data["SubFileName"],
iconImage =
str(int(round(float(item_data["SubRating"])/2))),
@@ -128,6 +134,7 @@ if params['action'] == 'search' or params['action'] ==
'manualsearch':
item['title'] =
normalizeString(xbmc.getInfoLabel("VideoPlayer.OriginalTitle"))# try to get
original title
item['file_original_path'] =
urllib.unquote(xbmc.Player().getPlayingFile().decode('utf-8'))# Full path of a
playing file
item['3let_language'] = [] #['scc','eng']
+ PreferredSub = params.get('preferredlanguage')
if 'searchstring' in params:
item['mansearch'] = True
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=a28addfb3214cffe36a7392e7427287c16a4bd31
commit a28addfb3214cffe36a7392e7427287c16a4bd31
Author: Martijn Kaijser <[email protected]>
Date: Sun Aug 31 14:17:09 2014 +0200
[script.speedfaninfo] 0.6.1
diff --git a/script.speedfaninfo/CHANGELOG.txt
b/script.speedfaninfo/CHANGELOG.txt
index e88ab3c..4c2eaf9 100644
--- a/script.speedfaninfo/CHANGELOG.txt
+++ b/script.speedfaninfo/CHANGELOG.txt
@@ -1,3 +1,6 @@
+v.0.6.1
+- if rpm reported as zero 0, then SFID only shows percentage
+
v.0.6.0
- fix for crash when using smb path
diff --git a/script.speedfaninfo/addon.xml b/script.speedfaninfo/addon.xml
index b64b987..fc4b27e 100644
--- a/script.speedfaninfo/addon.xml
+++ b/script.speedfaninfo/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.speedfaninfo" name="SpeedFan Information Display"
version="0.6.0" provider-name="pkscout">
+<addon id="script.speedfaninfo" name="SpeedFan Information Display"
version="0.6.1" provider-name="pkscout">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
<import addon="xbmc.addon" version="12.0.0"/>
diff --git a/script.speedfaninfo/default.py b/script.speedfaninfo/default.py
index 4da557a..647fcde 100644
--- a/script.speedfaninfo/default.py
+++ b/script.speedfaninfo/default.py
@@ -191,7 +191,10 @@ class Main( xbmcgui.WindowXMLDialog ):
percent_match = True
percent_value = percents[j][1]
if percent_match:
- en_speeds.append( (speeds[i][0], speeds [i][1] + ' (' +
percent_value + ')') )
+ if speeds[i][1] == '0rpm':
+ en_speeds.append( (speeds[i][0], percent_value) )
+ else:
+ en_speeds.append( (speeds[i][0], speeds [i][1] + ' ('
+ percent_value + ')') )
else:
en_speeds.append( (speeds[i][0], speeds [i][1]) )
self._populate_list( __language__(30101), en_speeds,
firstline_shown )
diff --git a/script.speedfaninfo/resources/common/url.py
b/script.speedfaninfo/resources/common/url.py
index f8166c5..204782c 100644
--- a/script.speedfaninfo/resources/common/url.py
+++ b/script.speedfaninfo/resources/common/url.py
@@ -1,10 +1,7 @@
-#v.0.1.8
+#v.0.1.9
import socket
-try:
- import requests2 as _requests
-except:
- import requests as _requests
+import requests as _requests
class URL():
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=4853630951600fae504a9e54eee397716a153944
commit 4853630951600fae504a9e54eee397716a153944
Author: Martijn Kaijser <[email protected]>
Date: Sun Aug 31 14:16:04 2014 +0200
[script.artistslideshow] 1.6.9
diff --git a/script.artistslideshow/addon.xml b/script.artistslideshow/addon.xml
index 8572677..09bbe94 100755
--- a/script.artistslideshow/addon.xml
+++ b/script.artistslideshow/addon.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.artistslideshow" name="Artist Slideshow" version="1.6.8"
provider-name="ronie|pkscout">
+<addon id="script.artistslideshow" name="Artist Slideshow" version="1.6.9"
provider-name="ronie|pkscout">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
<import addon="xbmc.addon" version="12.0.0"/>
- <import addon="script.module.requests2" version="2.2.1"/>
+ <import addon="script.module.requests" version="2.3.0"/>
<import addon="script.module.simplejson" version="3.3.0"/>
</requires>
<extension point="xbmc.python.script" library="default.py">
diff --git a/script.artistslideshow/changelog.txt
b/script.artistslideshow/changelog.txt
index 1c77067..a39dd21 100755
--- a/script.artistslideshow/changelog.txt
+++ b/script.artistslideshow/changelog.txt
@@ -1,3 +1,8 @@
+v.1.6.9
+- added option to download artist thumbnails from htbackdrops and fanart.tv
+- update to current requests module (requests2 depreciated)
+- updated to v3 of fanart.tv API (including option to use client API key)
+
v.1.6.8
- fix for crash when using smb path
- cleaned up startup process to better deal with script being started twice
diff --git a/script.artistslideshow/default.py
b/script.artistslideshow/default.py
index 9a2153b..0685942 100755
--- a/script.artistslideshow/default.py
+++ b/script.artistslideshow/default.py
@@ -398,13 +398,20 @@ class Main:
if success:
if site == 'fanarttv':
try:
- json_data = dict(map(lambda (key, value):
('artistImages', value), json_data.items()))
- except AttributeError:
- return data
+ images = json_data['artistbackground']
except Exception, e:
- lw.log( ['unexpected error fixing fanart.tv JSON
data', e] )
- return data
- success, loglines = writeFile( dicttoxml( json_data
).encode('utf-8'), filename )
+ lw.log( ['error getting artist backgrounds from
fanart.tv', e] )
+ images = []
+ if self.FANARTTVALLIMAGES == 'true':
+ try:
+ thumbs = json_data['artistthumb']
+ except Exception, e:
+ lw.log( ['error getting artist thumbs from
fanart.tv', e] )
+ thumbs = []
+ images = images + thumbs
+ else:
+ images = json_data
+ success, loglines = writeFile( dicttoxml( images
).encode('utf-8'), filename )
lw.log( loglines )
json_data = ''
else:
@@ -526,7 +533,8 @@ class Main:
def _get_images( self, site ):
if site == 'fanarttv':
if self.MBID:
- self.url = self.fanarttvURL + self.MBID + self.fanarttvOPTIONS
+ self.url = self.fanarttvURL + self.MBID
+ self.params = self.fanarttvPARAMS
lw.log( ['asking for images from: %s' %self.url] )
else:
return []
@@ -809,8 +817,11 @@ class Main:
def _get_settings( self ):
self.FANARTTV = __addon__.getSetting( "fanarttv" )
+ self.FANARTTVALLIMAGES = __addon__.getSetting( "fanarttv_all" )
+ self.FANARTTVCLIENTAPIKEY = __addon__.getSetting(
"fanarttv_clientapikey" )
self.THEAUDIODB = __addon__.getSetting( "theaudiodb" )
self.HTBACKDROPS = __addon__.getSetting( "htbackdrops" )
+ self.HTBACKDROPSALLIMAGES = __addon__.getSetting( "htbackdrops_all" )
self.ARTISTINFO = __addon__.getSetting( "artistinfo" )
self.LANGUAGE = __addon__.getSetting( "language" )
for language in LANGUAGES:
@@ -887,13 +898,19 @@ class Main:
self.params = {}
self.LastfmURL = 'http://ws.audioscrobbler.com/2.0/'
self.LastfmPARAMS = {'autocorrect':'1', 'api_key':LastfmApiKey}
- self.fanarttvURL = 'http://api.fanart.tv/webservice/artist/%s/' %
fanarttvApiKey
- self.fanarttvOPTIONS = '/json/artistbackground/'
+ self.fanarttvURL = 'https://webservice.fanart.tv/v3/music/'
+ self.fanarttvPARAMS = {'api_key': fanarttvApiKey}
+ if self.FANARTTVCLIENTAPIKEY:
+ self.fanarttvPARAMS.update( {'client_key':
self.FANARTTVCLIENTAPIKEY} )
theaudiodbURL = 'http://www.theaudiodb.com/api/v1/json/%s/' %
theaudiodbApiKey
self.theaudiodbARTISTURL = theaudiodbURL + 'artist-mb.php'
self.theaudiodbALBUMURL = theaudiodbURL + 'album.php'
self.HtbackdropsQueryURL = 'http://htbackdrops.org/api/%s/searchXML' %
HtbackdropsApiKey
- self.HtbackdropsPARAMS = {'default_operator':'and', 'fields':'title',
'aid':'1'}
+ self.HtbackdropsPARAMS = {'default_operator':'and', 'fields':'title'}
+ if self.HTBACKDROPSALLIMAGES == 'true':
+ self.HtbackdropsPARAMS.update( {'cid':'5'} )
+ else:
+ self.HtbackdropsPARAMS.update( {'aid':'1'} )
self.HtbackdropsDownloadURL = 'http://htbackdrops.org/api/' +
HtbackdropsApiKey + '/download/'
diff --git a/script.artistslideshow/resources/common/url.py
b/script.artistslideshow/resources/common/url.py
index f8166c5..204782c 100755
--- a/script.artistslideshow/resources/common/url.py
+++ b/script.artistslideshow/resources/common/url.py
@@ -1,10 +1,7 @@
-#v.0.1.8
+#v.0.1.9
import socket
-try:
- import requests2 as _requests
-except:
- import requests as _requests
+import requests as _requests
class URL():
diff --git a/script.artistslideshow/resources/language/English/strings.po
b/script.artistslideshow/resources/language/English/strings.po
index 2f5e363..9a4c2b8 100755
--- a/script.artistslideshow/resources/language/English/strings.po
+++ b/script.artistslideshow/resources/language/English/strings.po
@@ -54,7 +54,7 @@ msgid "Download images from last.fm"
msgstr ""
msgctxt "#32002"
-msgid "Download images from htbackdrops.com"
+msgid "Download images from htbackdrops.org"
msgstr ""
msgctxt "#32003"
@@ -74,7 +74,7 @@ msgid " Preferred language for artist information"
msgstr ""
msgctxt "#32007"
-msgid " Download only 16:9 images"
+msgid " Download all images regardless of resolution"
msgstr ""
msgctxt "#32008"
@@ -85,7 +85,11 @@ msgctxt "#32009"
msgid "Download images from theaudiodb.com"
msgstr ""
-#empty strings from id 32010 to 32099
+msgctxt "#32010"
+msgid " Client API key"
+msgstr ""
+
+#empty strings from id 32011 to 32099
msgctxt "#32100"
msgid "Slideshow"
diff --git a/script.artistslideshow/resources/settings.xml
b/script.artistslideshow/resources/settings.xml
index 5ae8178..720fdd3 100755
--- a/script.artistslideshow/resources/settings.xml
+++ b/script.artistslideshow/resources/settings.xml
@@ -2,23 +2,26 @@
<settings>
<category label="32000">
<setting id="fanarttv" type="bool" label="32008" default="true" />
+ <setting id="fanarttv_clientapikey" type="text" label="32010"
visible="eq(-1,true)" default="" />
+ <setting id="fanarttv_all" type="bool" label="32007"
visible="eq(-2,true)" default="false" />
<setting id="theaudiodb" type="bool" label="32009" default="false" />
<setting id="htbackdrops" type="bool" label="32002" default="false" />
+ <setting id="htbackdrops_all" type="bool" label="32007"
visible="eq(-1,true)" default="false" />
<setting id="artistinfo" type="bool" label="32005" default="false" />
- <setting id="language" type="enum" label="32006" enable="eq(-1,true)"
default="11"
lvalues="32901|32902|32903|32904|32905|32906|32907|32908|32909|32910|32911|32912|32913|32947|32914|32915|32916|32917|32918|32919|32920|32921|32922|32924|32925|32926|32927|32928|32929|32930|32932|32933|32934|32935|32936|32937|32938|32939|32940|32942|32943|32944|32945|32946"
/>
+ <setting id="language" type="enum" label="32006" visible="eq(-1,true)"
default="11"
lvalues="32901|32902|32903|32904|32905|32906|32907|32908|32909|32910|32911|32912|32913|32947|32914|32915|32916|32917|32918|32919|32920|32921|32922|32924|32925|32926|32927|32928|32929|32930|32932|32933|32934|32935|32936|32937|32938|32939|32940|32942|32943|32944|32945|32946"
/>
</category>
<category label="32100">
<setting id="local_artist_path" type="folder" label="32101" default=""
/>
<setting id="priority" type="enum" label="32102"
lvalues="32110|32111|32112" default="0" />
<setting id="fallback" type="bool" label="32105" default="false" />
- <setting id="fallback_path" type="folder" label="32103" default=""
enable="eq(-1,true)" />
+ <setting id="fallback_path" type="folder" label="32103" default=""
visible="eq(-1,true)" />
<setting id="slideshow" type="bool" label="32106" default="false" />
- <setting id="slideshow_path" type="folder" label="32104" default=""
enable="eq(-1,true)" />
+ <setting id="slideshow_path" type="folder" label="32104" default=""
visible="eq(-1,true)" />
<setting id="transparent" type="bool" label="32107" default="false" />
</category>
<category label="32200">
<setting id="restrict_cache" type="bool" label="32201" default="false"
/>
- <setting id="max_cache_size" label="32202" type="labelenum"
values="128|256|512|768|1024|2048|3072|4096" enable="eq(-1,true)"
default="1024" />
+ <setting id="max_cache_size" label="32202" type="labelenum"
values="128|256|512|768|1024|2048|3072|4096" visible="eq(-1,true)"
default="1024" />
<setting id="show_progress" type="enum" label="32203"
lvalues="32206|32207|32208" default="0" />
<setting id="progress_path" type="folder" label="32204" default=""
enable="eq(-1,2)"/>
<setting id="fanart_folder" type="text" label="32205"
default="" />
-----------------------------------------------------------------------
Summary of changes:
script.artistslideshow/addon.xml | 4 +-
script.artistslideshow/changelog.txt | 5 +++
script.artistslideshow/default.py | 37 ++++++++++++++-----
script.artistslideshow/resources/common/url.py | 7 +---
.../resources/language/English/strings.po | 10 ++++--
script.artistslideshow/resources/settings.xml | 11 ++++--
script.speedfaninfo/CHANGELOG.txt | 3 ++
script.speedfaninfo/addon.xml | 2 +-
script.speedfaninfo/default.py | 5 ++-
script.speedfaninfo/resources/common/url.py | 7 +---
service.subtitles.opensubtitles/addon.xml | 2 +-
service.subtitles.opensubtitles/changelog.txt | 5 +++
.../resources/lib/OSUtilities.py | 30 ++++++++++++----
service.subtitles.opensubtitles/service.py | 9 ++++-
14 files changed, 97 insertions(+), 40 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
