The branch, frodo has been updated
via 00da66411f271116a8668fb8c7ba14ad74d1c524 (commit)
via c395da98e49deeb1b87651334086cf4b92cd57ba (commit)
from e5b9c51db7e7c22a4ee5d6f7b6e706d3f1d76ff7 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=00da66411f271116a8668fb8c7ba14ad74d1c524
commit 00da66411f271116a8668fb8c7ba14ad74d1c524
Author: Martijn Kaijser <[email protected]>
Date: Fri Feb 21 08:22:18 2014 +0100
[script.service.twitter] 1.0.1
diff --git a/script.service.twitter/addon.xml b/script.service.twitter/addon.xml
index f84410f..0a744bd 100644
--- a/script.service.twitter/addon.xml
+++ b/script.service.twitter/addon.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="script.service.twitter"
- version="1.0.0"
+ version="1.0.1"
name="Twitter Feeds"
provider-name="Romans I XVI"
>
<requires>
<import addon="xbmc.python" version="2.1.0"/>
+ <import addon="script.module.elementtree" version="1.2.8"/>
</requires>
<extension point="xbmc.service"
library="default.py" start="startup">
diff --git a/script.service.twitter/changelog.txt
b/script.service.twitter/changelog.txt
index 679a756..878899e 100644
--- a/script.service.twitter/changelog.txt
+++ b/script.service.twitter/changelog.txt
@@ -13,3 +13,5 @@ Version 0.5.0
Version 1.0.0
-Fixed minor bugs.
-Added a dialog that displays on first run.
+Version 1.0.1
+-script.module.elementtree now imported properly
diff --git a/script.service.twitter/default.py
b/script.service.twitter/default.py
index 076d333..e384cc3 100644
--- a/script.service.twitter/default.py
+++ b/script.service.twitter/default.py
@@ -1,9 +1,6 @@
import urllib,urllib2,re,xbmc,xbmcaddon,xbmcgui,os,sys
import word_resolver
-try:
- from elementtree.SimpleXMLWriter import XMLWriter
-except:
- from dummyelementtree.SimpleXMLWriter import XMLWriter
+from elementtree.SimpleXMLWriter import XMLWriter
settings = xbmcaddon.Addon( id = 'script.service.twitter' )
translation = settings.getLocalizedString
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=c395da98e49deeb1b87651334086cf4b92cd57ba
commit c395da98e49deeb1b87651334086cf4b92cd57ba
Author: Martijn Kaijser <[email protected]>
Date: Fri Feb 21 08:20:49 2014 +0100
[script.artistslideshow] 1.6.2
diff --git a/script.artistslideshow/addon.xml b/script.artistslideshow/addon.xml
index 76d56df..849f07d 100644
--- a/script.artistslideshow/addon.xml
+++ b/script.artistslideshow/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.artistslideshow" name="Artist Slideshow" version="1.6.1"
provider-name="ronie|pkscuot">
+<addon id="script.artistslideshow" name="Artist Slideshow" version="1.6.2"
provider-name="ronie|pkscuot">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="xbmc.addon" version="12.0.0"/>
diff --git a/script.artistslideshow/changelog.txt
b/script.artistslideshow/changelog.txt
index 2bf5343..beba484 100644
--- a/script.artistslideshow/changelog.txt
+++ b/script.artistslideshow/changelog.txt
@@ -1,3 +1,8 @@
+v.1.6.2
+- fixed crash from undefined global error in url.py
+- fix for bug that causes crash on socket.timeout in url.py
+- corrected string numbers to fit in specified developer range
+
v.1.6.1
- fixed crash when installing on clean install of XBMC
diff --git a/script.artistslideshow/default.py
b/script.artistslideshow/default.py
index e56d770..eb8e881 100755
--- a/script.artistslideshow/default.py
+++ b/script.artistslideshow/default.py
@@ -17,7 +17,6 @@
# * theaudiodb: http://www.theaudiodb.com
# * htbackdrops: http://www.htbackdrops.org
-
import xbmc, xbmcaddon, xbmcgui, xbmcvfs
import itertools, os, random, re, sys, time, urllib
import xml.etree.ElementTree as _xmltree
diff --git a/script.artistslideshow/resources/common/url.py
b/script.artistslideshow/resources/common/url.py
index 9644c15..186b621 100755
--- a/script.artistslideshow/resources/common/url.py
+++ b/script.artistslideshow/resources/common/url.py
@@ -1,6 +1,7 @@
-#v.0.1.2
+#v.0.1.5
-import requests2
+import requests2 as _requests
+import socket
class URL():
@@ -31,26 +32,29 @@ class URL():
urldata = ''
try:
if urltype == "get":
- urldata = requests.get( url, params=params,
timeout=self.timeout )
+ urldata = _requests.get( url, params=params,
timeout=self.timeout )
elif urltype == "post":
- urldata = requests.post( url, params=params, data=data,
headers=self.headers, timeout=self.timeout )
+ urldata = _requests.post( url, params=params, data=data,
headers=self.headers, timeout=self.timeout )
elif urltype == "delete":
- urldata = requests.delete( url, params=params, data=data,
headers=self.headers, timeout=self.timeout )
+ urldata = _requests.delete( url, params=params, data=data,
headers=self.headers, timeout=self.timeout )
loglines.append( "the url is: " + urldata.url )
loglines.append( 'the params are: ')
loglines.append( params )
loglines.append( 'the data are: ')
loglines.append( data )
- except requests.exceptions.ConnectionError, e:
+ except _requests.exceptions.ConnectionError, e:
loglines.append( 'site unreachable at ' + url )
loglines.append( e )
- except requests.exceptions.Timeout, e:
+ except _requests.exceptions.Timeout, e:
loglines.append( 'timeout error while downloading from ' + url )
loglines.append( e )
- except requests.exceptions.HTTPError, e:
+ except socket.timeout, e:
+ loglines.append( 'timeout error while downloading from ' + url )
+ loglines.append( e )
+ except _requests.exceptions.HTTPError, e:
loglines.append( 'HTTP Error while downloading from ' + url )
loglines.append( e )
- except requests.exceptions.RequestException, e:
+ except _requests.exceptions.RequestException, e:
loglines.append( 'unknown error while downloading from ' + url )
loglines.append( e )
if urldata:
diff --git a/script.artistslideshow/resources/language/English/strings.po
b/script.artistslideshow/resources/language/English/strings.po
index 19e4688..10fc84d 100644
--- a/script.artistslideshow/resources/language/English/strings.po
+++ b/script.artistslideshow/resources/language/English/strings.po
@@ -18,189 +18,189 @@ msgstr ""
#Languages
-msgctxt "#30201"
+msgctxt "#32901"
msgid "Albanian"
msgstr ""
-msgctxt "#30202"
+msgctxt "#32902"
msgid "Arabic"
msgstr ""
-msgctxt "#30203"
+msgctxt "#32903"
msgid "Belarusian"
msgstr ""
-msgctxt "#30204"
+msgctxt "#32904"
msgid "Bosnian (Latin)"
msgstr ""
-msgctxt "#30205"
+msgctxt "#32905"
msgid "Bulgarian"
msgstr ""
-msgctxt "#30206"
+msgctxt "#32906"
msgid "Catalan"
msgstr ""
-msgctxt "#30207"
+msgctxt "#32907"
msgid "Chinese"
msgstr ""
-msgctxt "#30208"
+msgctxt "#32908"
msgid "Croatian"
msgstr ""
-msgctxt "#30209"
+msgctxt "#32909"
msgid "Czech"
msgstr ""
-msgctxt "#30210"
+msgctxt "#32910"
msgid "Danish"
msgstr ""
-msgctxt "#30211"
+msgctxt "#32911"
msgid "Dutch"
msgstr ""
-msgctxt "#30212"
+msgctxt "#32912"
msgid "English"
msgstr ""
-msgctxt "#30213"
+msgctxt "#32913"
msgid "Estonian"
msgstr ""
-msgctxt "#30214"
+msgctxt "#32914"
msgid "Finnish"
msgstr ""
-msgctxt "#30215"
+msgctxt "#32915"
msgid "French"
msgstr ""
-msgctxt "#30216"
+msgctxt "#32916"
msgid "German"
msgstr ""
-msgctxt "#30217"
+msgctxt "#32917"
msgid "Greek"
msgstr ""
-msgctxt "#30218"
+msgctxt "#32918"
msgid "Hebrew"
msgstr ""
-msgctxt "#30219"
+msgctxt "#32919"
msgid "Hindi"
msgstr ""
-msgctxt "#30220"
+msgctxt "#32920"
msgid "Hungarian"
msgstr ""
-msgctxt "#30221"
+msgctxt "#32921"
msgid "Icelandic"
msgstr ""
-msgctxt "#30222"
+msgctxt "#32922"
msgid "Indonesian"
msgstr ""
-#empty string with id 30223
+#empty string with id 32923
-msgctxt "#30224"
+msgctxt "#32924"
msgid "Italian"
msgstr ""
-msgctxt "#30225"
+msgctxt "#32925"
msgid "Japanese"
msgstr ""
-msgctxt "#30226"
+msgctxt "#32926"
msgid "Korean"
msgstr ""
-msgctxt "#30227"
+msgctxt "#32927"
msgid "Latvian"
msgstr ""
-msgctxt "#30228"
+msgctxt "#32928"
msgid "Lithuanian"
msgstr ""
-msgctxt "#30229"
+msgctxt "#32929"
msgid "Macedonian"
msgstr ""
-msgctxt "#30230"
+msgctxt "#32930"
msgid "Norwegian"
msgstr ""
-#empty string with id 30231
+#empty string with id 32931
-msgctxt "#30232"
+msgctxt "#32932"
msgid "Polish"
msgstr ""
-msgctxt "#30233"
+msgctxt "#32933"
msgid "Portuguese"
msgstr ""
-msgctxt "#30234"
+msgctxt "#32934"
msgid "Portuguese (Brazil)"
msgstr ""
-msgctxt "#30235"
+msgctxt "#32935"
msgid "Romanian"
msgstr ""
-msgctxt "#30236"
+msgctxt "#32936"
msgid "Russian"
msgstr ""
-msgctxt "#30237"
+msgctxt "#32937"
msgid "SerbianLatin"
msgstr ""
-msgctxt "#30238"
+msgctxt "#32938"
msgid "Slovak"
msgstr ""
-msgctxt "#30239"
+msgctxt "#32939"
msgid "Slovenian"
msgstr ""
-msgctxt "#30240"
+msgctxt "#32940"
msgid "Spanish"
msgstr ""
-#empty string with id 30241
+#empty string with id 32941
-msgctxt "#30242"
+msgctxt "#32942"
msgid "Swedish"
msgstr ""
-msgctxt "#30243"
+msgctxt "#32943"
msgid "Thai"
msgstr ""
-msgctxt "#30244"
+msgctxt "#32944"
msgid "Turkish"
msgstr ""
-msgctxt "#30245"
+msgctxt "#32945"
msgid "Ukrainian"
msgstr ""
-msgctxt "#30246"
+msgctxt "#32946"
msgid "Vietnamese"
msgstr ""
-msgctxt "#30247"
+msgctxt "#32947"
msgid "Farsi"
msgstr ""
-#empty strings from id 30248 to 30299
+#empty strings from id 32948 to 32999
#Dialog Text
msgctxt "#30300"
@@ -211,7 +211,7 @@ msgctxt "#30301"
msgid "Downloading artist images"
msgstr ""
-msgctxt "#30302"
+msgctxt "#30329"
msgid "Nothing Downloaded"
msgstr ""
@@ -300,7 +300,17 @@ msgctxt "#32106"
msgid "Use override slideshow"
msgstr ""
-#empty strings from id 32107 to 32199
+msgctxt "#32110"
+msgid "Use remote images first"
+msgstr ""
+
+msgctxt "#32111"
+msgid "Use local images first"
+msgstr ""
+
+msgctxt "#32112"
+msgid "Use both local and remote images"
+msgstr ""
msgctxt "#32200"
msgid "Advanced"
@@ -336,18 +346,4 @@ msgstr ""
msgctxt "#32208"
msgid "Custom images"
-msgstr ""
-
-#empty strings from id 32209 to 32900
-
-msgctxt "#32901"
-msgid "Use remote images first"
-msgstr ""
-
-msgctxt "#32902"
-msgid "Use local images first"
-msgstr ""
-
-msgctxt "#32903"
-msgid "Use both local and remote images"
-msgstr ""
+msgstr ""
\ No newline at end of file
diff --git a/script.artistslideshow/resources/settings.xml
b/script.artistslideshow/resources/settings.xml
index 7d8cf20..c5c642e 100644
--- a/script.artistslideshow/resources/settings.xml
+++ b/script.artistslideshow/resources/settings.xml
@@ -5,11 +5,11 @@
<setting id="theaudiodb" type="bool" label="32009" default="false" />
<setting id="htbackdrops" type="bool" label="32002" 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="30201|30202|30203|30204|30205|30206|30207|30208|30209|30210|30211|30212|30213|30247|30214|30215|30216|30217|30218|30219|30220|30221|30222|30224|30225|30226|30227|30228|30229|30230|30232|30233|30234|30235|30236|30237|30238|30239|30240|30242|30243|30244|30245|30246"
/>
+ <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"
/>
</category>
<category label="32100">
<setting id="local_artist_path" type="folder" label="32101" default=""
/>
- <setting id="priority" type="enum" label="32102"
lvalues="32901|32902|32903" default="0" />
+ <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="slideshow" type="bool" label="32106" default="false" />
-----------------------------------------------------------------------
Summary of changes:
script.artistslideshow/addon.xml | 2 +-
script.artistslideshow/changelog.txt | 5 +
script.artistslideshow/default.py | 1 -
script.artistslideshow/resources/common/url.py | 22 +-
.../resources/language/Afrikaans/strings.po | 133 --------
.../resources/language/Belarusian/strings.po | 313 ------------------
.../resources/language/Catalan/strings.po | 333 --------------------
.../resources/language/Chinese (Simple)/strings.po | 333 --------------------
.../language/Chinese (Traditional)/strings.po | 213 -------------
.../resources/language/Croatian/strings.po | 333 --------------------
.../resources/language/Danish/strings.po | 333 --------------------
.../resources/language/Dutch/strings.po | 333 --------------------
.../resources/language/English/strings.po | 126 ++++----
.../resources/language/Estonian/strings.po | 213 -------------
.../resources/language/Galician/strings.po | 333 --------------------
.../resources/language/German/strings.po | 333 --------------------
.../resources/language/Greek/strings.po | 333 --------------------
.../resources/language/Hebrew/strings.po | 333 --------------------
.../resources/language/Hungarian/strings.po | 333 --------------------
.../resources/language/Indonesian/strings.po | 49 ---
.../resources/language/Italian/strings.po | 333 --------------------
.../resources/language/Polish/strings.po | 333 --------------------
.../language/Portuguese (Brazil)/strings.po | 333 --------------------
.../resources/language/Portuguese/strings.po | 333 --------------------
.../resources/language/Russian/strings.po | 333 --------------------
.../resources/language/Slovak/strings.po | 305 ------------------
.../resources/language/Spanish/strings.po | 333 --------------------
.../resources/language/Swedish/strings.po | 333 --------------------
script.artistslideshow/resources/settings.xml | 4 +-
script.service.twitter/addon.xml | 3 +-
script.service.twitter/changelog.txt | 2 +
script.service.twitter/default.py | 5 +-
script.service.twitter/dummyelementtree.py | Bin 42140 -> 0 bytes
33 files changed, 87 insertions(+), 6970 deletions(-)
delete mode 100644
script.artistslideshow/resources/language/Afrikaans/strings.po
delete mode 100644
script.artistslideshow/resources/language/Belarusian/strings.po
delete mode 100644 script.artistslideshow/resources/language/Catalan/strings.po
delete mode 100644 script.artistslideshow/resources/language/Chinese
(Simple)/strings.po
delete mode 100644 script.artistslideshow/resources/language/Chinese
(Traditional)/strings.po
delete mode 100644
script.artistslideshow/resources/language/Croatian/strings.po
delete mode 100644 script.artistslideshow/resources/language/Danish/strings.po
delete mode 100644 script.artistslideshow/resources/language/Dutch/strings.po
delete mode 100644
script.artistslideshow/resources/language/Estonian/strings.po
delete mode 100644
script.artistslideshow/resources/language/Galician/strings.po
delete mode 100644 script.artistslideshow/resources/language/German/strings.po
delete mode 100644 script.artistslideshow/resources/language/Greek/strings.po
delete mode 100644 script.artistslideshow/resources/language/Hebrew/strings.po
delete mode 100644
script.artistslideshow/resources/language/Hungarian/strings.po
delete mode 100644
script.artistslideshow/resources/language/Indonesian/strings.po
delete mode 100644 script.artistslideshow/resources/language/Italian/strings.po
delete mode 100644 script.artistslideshow/resources/language/Polish/strings.po
delete mode 100644 script.artistslideshow/resources/language/Portuguese
(Brazil)/strings.po
delete mode 100644
script.artistslideshow/resources/language/Portuguese/strings.po
delete mode 100644 script.artistslideshow/resources/language/Russian/strings.po
delete mode 100644 script.artistslideshow/resources/language/Slovak/strings.po
delete mode 100644 script.artistslideshow/resources/language/Spanish/strings.po
delete mode 100644 script.artistslideshow/resources/language/Swedish/strings.po
delete mode 100644 script.service.twitter/dummyelementtree.py
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
