The branch, frodo has been updated
via 8f687dd0f4d71689a494e73444d8aeb125080e85 (commit)
via b2292e54c58760f9836960ae9fcda177e958e346 (commit)
from 9589a708e82d002bb6f6c4e814f7fa0843ad149e (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=8f687dd0f4d71689a494e73444d8aeb125080e85
commit 8f687dd0f4d71689a494e73444d8aeb125080e85
Author: Martijn Kaijser <[email protected]>
Date: Sun Mar 31 17:32:05 2013 +0200
[script.artwork.downloader] 12.0.15
diff --git a/script.artwork.downloader/addon.xml
b/script.artwork.downloader/addon.xml
index ed54edf..0cf7166 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="12.0.14"
+ version="12.0.15"
provider-name="Martijn"
>
<requires>
@@ -23,7 +23,7 @@
<summary lang="de">Lade Artworks für Filme, Serien und Musikvideos
deiner Bibliothek herunter</summary>
<summary lang="el">ÎαÏεβάζει ÎικÏÎ½ÎµÏ Î³Î¹Î± ÏιÏ
ΤηλεοÏÏικÎÏ Î£ÎµÎ¹ÏÎÏ, ÏÎ¹Ï Î¤Î±Î¹Î½Î¯ÎµÏ ÎºÎ±Î¹ Ïα ÎοÏ
Ïικά ÎίνÏεο ÏÎ·Ï ÏÏ
Î»Î»Î¿Î³Î®Ï ÏαÏ</summary>
<summary lang="en">Downloads Artwork for TV shows, Movies and Musicvideos
in your library</summary>
- <summary lang="es">Descargue Artwork de Series, PelÃÂculas y Videoclips
a su biblioteca</summary>
+ <summary lang="es">Descargue Artwork de Series, PelÃÂculas y Videoclips
a su biblioteca</summary>
<summary lang="fr">Téléchargez les Artworks pour les séries TV, les
films et les clip vidéo de votre médiathèque</summary>
<summary lang="he">×××¨× ×¢××פ×ת ×ת××× ××ת
×××××××,סר×××,×סר×× ××ס××§× ×ספר×× ×©××</summary>
<summary lang="hu">Művészképek letöltése TV műsorok, filmek és
videóklipek számára</summary>
diff --git a/script.artwork.downloader/changelog.txt
b/script.artwork.downloader/changelog.txt
index af6e73d..840fd74 100644
--- a/script.artwork.downloader/changelog.txt
+++ b/script.artwork.downloader/changelog.txt
@@ -1,3 +1,8 @@
+[B]12.0.15[/B]
+- Fixed custom mode
+- Added option to show image selection directly if type is specified
+- Added option to hide the ok dialog and notification if the user doesn't
choose any image
+
[B]12.0.14[/B]
- Fixed missing brackets
diff --git a/script.artwork.downloader/default.py
b/script.artwork.downloader/default.py
index 1709c15..d6cf7b7 100644
--- a/script.artwork.downloader/default.py
+++ b/script.artwork.downloader/default.py
@@ -145,6 +145,7 @@ class Main:
self.failed_items = []
self.download_list = []
self.download_art_succes = False
+ self.cancelled = False
### load settings and initialise needed directories
def initialise(self):
@@ -254,7 +255,7 @@ class Main:
if not xbmc.abortRequested:
# Show dialog/notification
if self.settings.background:
- dialog_msg('okdialog', line0 = summary_notify, line1 =
provider_msg1 + ' ' + provider_msg2, background = self.settings.background)
+ dialog_msg('okdialog', line0 = summary_notify, line1 =
provider_msg1 + ' ' + provider_msg2, background = self.settings.background,
cancelled = self.cancelled)
else:
# When chosen no in the 'yes/no' dialog execute the viewer.py
and parse 'downloadreport'
if dialog_msg('yesno', line1 = summary, line2 = provider_msg1,
line3 = provider_msg2, background = self.settings.background, nolabel =
__localize__(32027), yeslabel = __localize__(32028)):
@@ -720,23 +721,52 @@ class Main:
def _gui_mode(self):
# Close the 'checking for artwork' dialog before opening the GUI list
dialog_msg('close', background = self.settings.background)
- # Create empty list and set bool to false that there is a list
- self.GUI_type_list = []
- imagelist = False
- # Fill GUI art type list
- for item in self.settings.available_arttypes:
- if item['solo_enabled'] == 'true' and self.mediatype ==
item['media_type'] and self._hasimages(item['art_type']):
- gui = item['gui_string']
- self.GUI_type_list.append (gui)
- # Not sure what this does again
- if len(self.GUI_type_list) == 1:
- self.GUI_type_list[0] = 'True'
- # Fills imagelist with image that fit the selected imagetype
- if (len(self.GUI_type_list) == 1) or self._choice_type():
- imagelist = self._gui_imagelist(self.gui_selected_type)
- # Some debug log output
- for item in imagelist:
- log('- Image put to GUI: %s' %item)
+
+ self.download_arttypes = []
+ # Look for argument matching artwork types
+ for item in sys.argv:
+ for type in self.settings.available_arttypes:
+ if item == type['art_type'] and self.mediatype ==
type['media_type']:
+ log('- Custom %s mode arttype: %s'
%(type['media_type'],type['art_type']))
+ self.download_arttypes.append(item)
+
+ # If only one specified and not extrafanart/extrathumbs
+ if (len(self.download_arttypes) == 1) and not self.dbid == '' and not
'extrathumbs' in self.download_arttypes and not 'extrafanart' in
self.download_arttypes:
+ imagelist = False
+ self.gui_selected_type = ''
+ for gui_arttype in self.download_arttypes:
+ self.gui_selected_type = gui_arttype
+ break
+ # Add parse the image restraints
+ if self.gui_selected_type != '':
+ for item in self.settings.available_arttypes:
+ if self.gui_selected_type == item['art_type'] and
self.mediatype == item['media_type']:
+ self.gui_selected_filename = item['filename']
+ self.gui_selected_msg = item['gui_string']
+ # Get image list for that specific imagetype
+ imagelist = self._gui_imagelist(self.gui_selected_type)
+ # Some debug log output
+ for item in imagelist:
+ log('- Image put to GUI: %s' %item)
+ break
+ else:
+ # Create empty list and set bool to false that there is a list
+ self.GUI_type_list = []
+ imagelist = False
+ # Fill GUI art type list
+ for item in self.settings.available_arttypes:
+ if item['solo_enabled'] == 'true' and self.mediatype ==
item['media_type'] and self._hasimages(item['art_type']):
+ gui = item['gui_string']
+ self.GUI_type_list.append (gui)
+ # Not sure what this does again
+ if len(self.GUI_type_list) == 1:
+ self.GUI_type_list[0] = 'True'
+ # Fills imagelist with image that fit the selected imagetype
+ if (len(self.GUI_type_list) == 1) or self._choice_type():
+ imagelist = self._gui_imagelist(self.gui_selected_type)
+ # Some debug log output
+ for item in imagelist:
+ log('- Image put to GUI: %s' %item)
# Download the selected image
# If there's a list, send the imagelist to the selection dialog
@@ -759,7 +789,7 @@ class Main:
# Selection was cancelled
else:
log('- Cancelled')
- dialog_msg('okdialog', line1 = __localize__(32017) , line2 =
__localize__(32018))
+ self.cancelled = True
# This creates the art type selection dialog. The string id is the
selection constraint for what type has been chosen.
def _choice_type(self):
@@ -793,7 +823,7 @@ class Main:
self.download_arttypes.append(item)
# If only one specified and not extrafanart/extrathumbs
- if (len(self.download_arttypes) == 1) and not self.medianame == '' and
not 'extrathumbs' in self.download_arttypes and not 'extrafanart' in
self.download_arttypes:
+ if (len(self.download_arttypes) == 1) and not self.dbid == '' and not
'extrathumbs' in self.download_arttypes and not 'extrafanart' in
self.download_arttypes:
# Get image list for that specific imagetype
for gui_arttype in self.download_arttypes:
imagelist = self._gui_imagelist(gui_arttype)
@@ -817,7 +847,7 @@ class Main:
log('- Download succesfull')
else:
log('- Cancelled')
- dialog_msg('okdialog', line1 = __localize__(32017) , line2
= __localize__(32018))
+ self.cancelled = True
else:
self._download_process()
log('- More than 1 image available')
@@ -854,8 +884,6 @@ class Main:
class MainGui(xbmcgui.WindowXMLDialog):
def __init__(self, *args, **kwargs):
xbmcgui.WindowXMLDialog.__init__(self)
- xbmc.executebuiltin('Skin.Reset(AnimeWindowXMLDialogClose)')
- xbmc.executebuiltin('Skin.SetBool(AnimeWindowXMLDialogClose)')
self.listing = kwargs.get('listing')
self.selected_id = ''
diff --git a/script.artwork.downloader/resources/language/Albanian/strings.po
b/script.artwork.downloader/resources/language/Albanian/strings.po
index abfed77..75ba4da 100644
--- a/script.artwork.downloader/resources/language/Albanian/strings.po
+++ b/script.artwork.downloader/resources/language/Albanian/strings.po
@@ -16,6 +16,70 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+msgctxt "#32006"
+msgid "Error"
+msgstr "Gabim"
+
+msgctxt "#32009"
+msgid "Downloading"
+msgstr "Duke shkarkuar"
+
+msgctxt "#32012"
+msgid "Finished"
+msgstr "Përfundoi"
+
+msgctxt "#32025"
+msgid "Yes"
+msgstr "Po"
+
+msgctxt "#32026"
+msgid "No"
+msgstr "Jo"
+
msgctxt "#32027"
msgid "Close"
msgstr "Mbyll"
+
+msgctxt "#32031"
+msgid "General"
+msgstr "I përgjithsëm"
+
+msgctxt "#32071"
+msgid "Movies"
+msgstr "Filma"
+
+msgctxt "#32101"
+msgid "Advanced"
+msgstr "Të shtuar"
+
+msgctxt "#32121"
+msgid "Fanart"
+msgstr "Fanart"
+
+msgctxt "#32141"
+msgid "Language"
+msgstr "Gjuha"
+
+msgctxt "#32142"
+msgid "Rating"
+msgstr "Vlerësimi"
+
+msgctxt "#32143"
+msgid "Votes"
+msgstr "Votimet"
+
+msgctxt "#32144"
+msgid "Season"
+msgstr "Sezon"
+
+msgctxt "#32145"
+msgid "Size"
+msgstr "Madhësija"
+
+msgctxt "#32146"
+msgid "Disc"
+msgstr "Disk"
+
+msgctxt "#32181"
+msgid "Info"
+msgstr "info"
diff --git a/script.artwork.downloader/resources/language/Amharic/strings.po
b/script.artwork.downloader/resources/language/Amharic/strings.po
index 136bc59..fe756a0 100644
--- a/script.artwork.downloader/resources/language/Amharic/strings.po
+++ b/script.artwork.downloader/resources/language/Amharic/strings.po
@@ -32,6 +32,10 @@ msgctxt "#32026"
msgid "No"
msgstr "á á"
+msgctxt "#32027"
+msgid "Close"
+msgstr "áááá«"
+
msgctxt "#32031"
msgid "General"
msgstr "á£á ááá"
diff --git a/script.artwork.downloader/resources/language/Belarusian/strings.po
b/script.artwork.downloader/resources/language/Belarusian/strings.po
index 9391ea5..df155bf 100644
--- a/script.artwork.downloader/resources/language/Belarusian/strings.po
+++ b/script.artwork.downloader/resources/language/Belarusian/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Minimum fanart size: TV Shows"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Minimum fanart size: Musicvideos"
diff --git a/script.artwork.downloader/resources/language/Bulgarian/strings.po
b/script.artwork.downloader/resources/language/Bulgarian/strings.po
index ec00bd8..177d234 100644
--- a/script.artwork.downloader/resources/language/Bulgarian/strings.po
+++ b/script.artwork.downloader/resources/language/Bulgarian/strings.po
@@ -56,6 +56,10 @@ msgctxt "#32121"
msgid "Fanart"
msgstr "Fanart"
+msgctxt "#32128"
+msgid "Poster"
+msgstr "ÐлакаÑ"
+
msgctxt "#32133"
msgid "Artwork"
msgstr "ÐзобÑажениÑ"
diff --git a/script.artwork.downloader/resources/language/Catalan/strings.po
b/script.artwork.downloader/resources/language/Catalan/strings.po
index 3fca7c0..7be3e48 100644
--- a/script.artwork.downloader/resources/language/Catalan/strings.po
+++ b/script.artwork.downloader/resources/language/Catalan/strings.po
@@ -24,6 +24,10 @@ msgctxt "#32009"
msgid "Downloading"
msgstr "S'està baixant"
+msgctxt "#32012"
+msgid "Finished"
+msgstr "Finalitzat"
+
msgctxt "#32025"
msgid "Yes"
msgstr "SÃ"
@@ -48,6 +52,10 @@ msgctxt "#32081"
msgid "TV Shows"
msgstr "Sèries de TV"
+msgctxt "#32101"
+msgid "Advanced"
+msgstr "Avançat"
+
msgctxt "#32121"
msgid "Fanart"
msgstr "Fanart"
@@ -56,6 +64,10 @@ msgctxt "#32126"
msgid "Logo"
msgstr "Logotip"
+msgctxt "#32128"
+msgid "Poster"
+msgstr "Cartell"
+
msgctxt "#32133"
msgid "Artwork"
msgstr "Art"
diff --git a/script.artwork.downloader/resources/language/Chinese
(Simple)/strings.po b/script.artwork.downloader/resources/language/Chinese
(Simple)/strings.po
index 0a92c76..5eca8ed 100644
--- a/script.artwork.downloader/resources/language/Chinese (Simple)/strings.po
+++ b/script.artwork.downloader/resources/language/Chinese (Simple)/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "æå°å人ç»å°ºå¯¸ï¼å§é"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "æå°å人ç»å°ºå¯¸ï¼é³ä¹çµè§"
diff --git a/script.artwork.downloader/resources/language/Croatian/strings.po
b/script.artwork.downloader/resources/language/Croatian/strings.po
index 930561a..561f4ff 100644
--- a/script.artwork.downloader/resources/language/Croatian/strings.po
+++ b/script.artwork.downloader/resources/language/Croatian/strings.po
@@ -36,10 +36,22 @@ msgctxt "#32027"
msgid "Close"
msgstr "Zatvori"
+msgctxt "#32028"
+msgid "Report"
+msgstr "IzvjeÅ¡Äe"
+
+msgctxt "#32029"
+msgid "[I](After changes are made you must restart XBMC) [/I]"
+msgstr "[I](Nakon što su promjene napravljene morate ponovno pokrenuti XBMC)
[/I]"
+
msgctxt "#32031"
msgid "General"
msgstr "OpÄenito"
+msgctxt "#32040"
+msgid "-"
+msgstr "-"
+
msgctxt "#32071"
msgid "Movies"
msgstr "Filmovi"
@@ -48,6 +60,10 @@ msgctxt "#32081"
msgid "TV Shows"
msgstr "TV Emisija"
+msgctxt "#32083"
+msgid "-"
+msgstr "-"
+
msgctxt "#32101"
msgid "Advanced"
msgstr "Napredno"
@@ -60,6 +76,14 @@ msgctxt "#32122"
msgid "Extrafanart"
msgstr "Dodatni FanArt"
+msgctxt "#32123"
+msgid "Banner"
+msgstr "Transparenti"
+
+msgctxt "#32126"
+msgid "Logo"
+msgstr "Logo"
+
msgctxt "#32128"
msgid "Poster"
msgstr "Plakat"
@@ -91,3 +115,23 @@ msgstr "Disk"
msgctxt "#32181"
msgid "Info"
msgstr "Info"
+
+msgctxt "#32183"
+msgid "[I]www.xbmc.org [/I]"
+msgstr "[I]www.xbmc.org [/I]"
+
+msgctxt "#32184"
+msgid "[I]fanart.tv [/I]"
+msgstr "[I]fanart.tv [/I]"
+
+msgctxt "#32185"
+msgid "[I]www.thetvdb.com [/I]"
+msgstr "[I]www.thetvdb.com [/I]"
+
+msgctxt "#32186"
+msgid "[I]www.themoviedb.org [/I]"
+msgstr "[I]www.themoviedb.org [/I]"
+
+msgctxt "#32188"
+msgid "[I]paddycarey, Martijn Kaijser, putneyj [/I]"
+msgstr "[I]paddycarey, Martijn Kaijser, putneyj [/I]"
diff --git a/script.artwork.downloader/resources/language/Danish/strings.po
b/script.artwork.downloader/resources/language/Danish/strings.po
index 7e0c3a8..ecbed09 100644
--- a/script.artwork.downloader/resources/language/Danish/strings.po
+++ b/script.artwork.downloader/resources/language/Danish/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Mindste størrelse på fankunst: TV-serier"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Mindste størrelse på fankunst: Musikvideoer"
diff --git a/script.artwork.downloader/resources/language/Dutch/strings.po
b/script.artwork.downloader/resources/language/Dutch/strings.po
index a95a89d..713aec7 100644
--- a/script.artwork.downloader/resources/language/Dutch/strings.po
+++ b/script.artwork.downloader/resources/language/Dutch/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Minimum fanart grootte: TV Series"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Minimum fanart grootte: Muziekvideos"
diff --git a/script.artwork.downloader/resources/language/English/strings.po
b/script.artwork.downloader/resources/language/English/strings.po
index b676fec..7a951f1 100644
--- a/script.artwork.downloader/resources/language/English/strings.po
+++ b/script.artwork.downloader/resources/language/English/strings.po
@@ -215,6 +215,8 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr ""
+#empty strings from id 32059 to 32061
+
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr ""
diff --git a/script.artwork.downloader/resources/language/French/strings.po
b/script.artwork.downloader/resources/language/French/strings.po
index e9b1f9b..0d0b644 100644
--- a/script.artwork.downloader/resources/language/French/strings.po
+++ b/script.artwork.downloader/resources/language/French/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Taille minimale des fanarts : Séries TV"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Taille minimale des fanarts : Vidéos musicales"
diff --git a/script.artwork.downloader/resources/language/Galician/strings.po
b/script.artwork.downloader/resources/language/Galician/strings.po
index f00b50a..171fb61 100644
--- a/script.artwork.downloader/resources/language/Galician/strings.po
+++ b/script.artwork.downloader/resources/language/Galician/strings.po
@@ -24,6 +24,10 @@ msgctxt "#32009"
msgid "Downloading"
msgstr "Descargando"
+msgctxt "#32012"
+msgid "Finished"
+msgstr "Rematado"
+
msgctxt "#32025"
msgid "Yes"
msgstr "Si"
@@ -40,10 +44,22 @@ msgctxt "#32031"
msgid "General"
msgstr "Xeral"
+msgctxt "#32040"
+msgid "-"
+msgstr "-"
+
msgctxt "#32071"
msgid "Movies"
msgstr "PelÃculas"
+msgctxt "#32081"
+msgid "TV Shows"
+msgstr "Series de TV"
+
+msgctxt "#32083"
+msgid "-"
+msgstr "-"
+
msgctxt "#32101"
msgid "Advanced"
msgstr "Avanzado"
@@ -52,6 +68,22 @@ msgctxt "#32121"
msgid "Fanart"
msgstr "Cartel"
+msgctxt "#32123"
+msgid "Banner"
+msgstr "Cartaz"
+
+msgctxt "#32124"
+msgid "Season Banners"
+msgstr "Cartazes das Tempadas"
+
+msgctxt "#32126"
+msgid "Logo"
+msgstr "Logo"
+
+msgctxt "#32128"
+msgid "Poster"
+msgstr "Póster"
+
msgctxt "#32133"
msgid "Artwork"
msgstr "Ilustración"
diff --git a/script.artwork.downloader/resources/language/German/strings.po
b/script.artwork.downloader/resources/language/German/strings.po
index 49a5ab8..ae9690d 100644
--- a/script.artwork.downloader/resources/language/German/strings.po
+++ b/script.artwork.downloader/resources/language/German/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Minimale Fanart-GröÃe: TV Serien"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Minimale Fanart-GröÃe: Musikvideos"
diff --git a/script.artwork.downloader/resources/language/Greek/strings.po
b/script.artwork.downloader/resources/language/Greek/strings.po
index 3abb83b..cbea411 100644
--- a/script.artwork.downloader/resources/language/Greek/strings.po
+++ b/script.artwork.downloader/resources/language/Greek/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "ÎλάÏιÏÏο μÎÎ³ÎµÎ¸Î¿Ï fanart: Τηλ. ΣειÏÎÏ"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "ÎλάÏιÏÏο μÎÎ³ÎµÎ¸Î¿Ï fanart: ÎοÏ
Ïικά ÎίνÏεο"
diff --git a/script.artwork.downloader/resources/language/Hebrew/strings.po
b/script.artwork.downloader/resources/language/Hebrew/strings.po
index 38ba074..5b64131 100644
--- a/script.artwork.downloader/resources/language/Hebrew/strings.po
+++ b/script.artwork.downloader/resources/language/Hebrew/strings.po
@@ -176,18 +176,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "×××× ××× ×××× ×©× ×¢××פ×:ת××× ××ת ×××××××"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "×××× ××× ×××× ×©× ×¢××פ×:ס×ר×× ××ס××§×"
diff --git a/script.artwork.downloader/resources/language/Hungarian/strings.po
b/script.artwork.downloader/resources/language/Hungarian/strings.po
index b7e2be7..db49599 100644
--- a/script.artwork.downloader/resources/language/Hungarian/strings.po
+++ b/script.artwork.downloader/resources/language/Hungarian/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Minimális rajongói kép méret: TV-műsorok"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Minimális rajongói kép méret: Klipek"
diff --git a/script.artwork.downloader/resources/language/Indonesian/strings.po
b/script.artwork.downloader/resources/language/Indonesian/strings.po
index 1218d22..11bddcd 100644
--- a/script.artwork.downloader/resources/language/Indonesian/strings.po
+++ b/script.artwork.downloader/resources/language/Indonesian/strings.po
@@ -47,3 +47,7 @@ msgstr "Pemilihan"
msgctxt "#32146"
msgid "Disc"
msgstr "Disk:"
+
+msgctxt "#32181"
+msgid "Info"
+msgstr "Info"
diff --git a/script.artwork.downloader/resources/language/Italian/strings.po
b/script.artwork.downloader/resources/language/Italian/strings.po
index ad7dfec..7c071d7 100644
--- a/script.artwork.downloader/resources/language/Italian/strings.po
+++ b/script.artwork.downloader/resources/language/Italian/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Dimensione minima fanart: Serie TV"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Dimensione minima fanart: Video musicali"
diff --git a/script.artwork.downloader/resources/language/Korean/strings.po
b/script.artwork.downloader/resources/language/Korean/strings.po
index 64ed741..4665012 100644
--- a/script.artwork.downloader/resources/language/Korean/strings.po
+++ b/script.artwork.downloader/resources/language/Korean/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "í¬ìí¸ ìµì í¬ê¸°: TV ì¼"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "í¬ìí¸ ìµì í¬ê¸°: 뮤ì§ë¹ëì¤"
diff --git a/script.artwork.downloader/resources/language/Norwegian/strings.po
b/script.artwork.downloader/resources/language/Norwegian/strings.po
index 9aad0c7..c9336dc 100644
--- a/script.artwork.downloader/resources/language/Norwegian/strings.po
+++ b/script.artwork.downloader/resources/language/Norwegian/strings.po
@@ -84,6 +84,10 @@ msgctxt "#32126"
msgid "Logo"
msgstr "Logo"
+msgctxt "#32128"
+msgid "Poster"
+msgstr "Plakater"
+
msgctxt "#32133"
msgid "Artwork"
msgstr "Artwork"
diff --git a/script.artwork.downloader/resources/language/Persian
(Iran)/strings.po b/script.artwork.downloader/resources/language/Persian
(Iran)/strings.po
index 5843b6f..bbbbfdf 100644
--- a/script.artwork.downloader/resources/language/Persian (Iran)/strings.po
+++ b/script.artwork.downloader/resources/language/Persian (Iran)/strings.po
@@ -16,6 +16,22 @@ msgstr ""
"Language: fa_IR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+msgctxt "#32006"
+msgid "Error"
+msgstr "خطا"
+
+msgctxt "#32009"
+msgid "Downloading"
+msgstr "در ØØ§Ù Ø¯Ø±ÛØ§Ùت"
+
+msgctxt "#32031"
+msgid "General"
+msgstr "عÙ
ÙÙ
Û"
+
+msgctxt "#32071"
+msgid "Movies"
+msgstr "ÙÛÙÙ
ÙØ§"
+
msgctxt "#32121"
msgid "Fanart"
msgstr "Ù٠آرت"
@@ -31,3 +47,7 @@ msgstr "ÙÙÚ¯Ù"
msgctxt "#32128"
msgid "Poster"
msgstr "Ù¾ÙØ³ØªØ±"
+
+msgctxt "#32142"
+msgid "Rating"
+msgstr "Ø±ØªØ¨Ù Ø¨ÙØ¯Û"
diff --git a/script.artwork.downloader/resources/language/Polish/strings.po
b/script.artwork.downloader/resources/language/Polish/strings.po
index b2f7de3..b5aa5fc 100644
--- a/script.artwork.downloader/resources/language/Polish/strings.po
+++ b/script.artwork.downloader/resources/language/Polish/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Minimalny rozmiar FanArtów: Seriale TV"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Minimalny rozmiar FanArtów: Teledyski"
diff --git a/script.artwork.downloader/resources/language/Portuguese
(Brazil)/strings.po b/script.artwork.downloader/resources/language/Portuguese
(Brazil)/strings.po
index a5ee6c7..42827f2 100644
--- a/script.artwork.downloader/resources/language/Portuguese
(Brazil)/strings.po
+++ b/script.artwork.downloader/resources/language/Portuguese
(Brazil)/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Tamanho MÃnimo Fanart: Seriados"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Tamanho MÃnimo Fanart: Concertos"
diff --git a/script.artwork.downloader/resources/language/Portuguese/strings.po
b/script.artwork.downloader/resources/language/Portuguese/strings.po
index e55f70b..662c34e 100644
--- a/script.artwork.downloader/resources/language/Portuguese/strings.po
+++ b/script.artwork.downloader/resources/language/Portuguese/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Tamanho mÃnimo de fanart: Séries TV"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Tamanho mÃnimo de fanart: VÃdeoclipes"
diff --git a/script.artwork.downloader/resources/language/Slovak/strings.po
b/script.artwork.downloader/resources/language/Slovak/strings.po
index ed74ba3..6c1994b 100644
--- a/script.artwork.downloader/resources/language/Slovak/strings.po
+++ b/script.artwork.downloader/resources/language/Slovak/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Minimálna veľkosť FanArt: TV seriály"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Minimálna veľkosť FanArt: Hudobné videá"
diff --git a/script.artwork.downloader/resources/language/Spanish/strings.po
b/script.artwork.downloader/resources/language/Spanish/strings.po
index 600b4e0..40b76ee 100644
--- a/script.artwork.downloader/resources/language/Spanish/strings.po
+++ b/script.artwork.downloader/resources/language/Spanish/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Tamaño mÃnimo fanart: Series"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Tamaño mÃnimo fanart: Videoclips"
@@ -262,7 +250,7 @@ msgstr "[B]Más opciones de ajustes avanzados[/B]"
msgctxt "#32103"
msgid "Use local files"
-msgstr "-"
+msgstr "Usar archivos locales"
msgctxt "#32106"
msgid "Use XBMC pre-caching [I](caches images to thumbnails folder while
downloading) [/I]"
@@ -346,7 +334,7 @@ msgstr "Resolución"
msgctxt "#32146"
msgid "Disc"
-msgstr "Disc"
+msgstr "Disco"
msgctxt "#32147"
msgid "below limit setting"
diff --git a/script.artwork.downloader/resources/language/Swedish/strings.po
b/script.artwork.downloader/resources/language/Swedish/strings.po
index 0d899b2..1044670 100644
--- a/script.artwork.downloader/resources/language/Swedish/strings.po
+++ b/script.artwork.downloader/resources/language/Swedish/strings.po
@@ -208,18 +208,6 @@ msgctxt "#32058"
msgid "Minimum fanart size: TV Shows"
msgstr "Minsta bildstorlek: TV serier"
-msgctxt "#32059"
-msgid "1080"
-msgstr "1080"
-
-msgctxt "#32060"
-msgid "720"
-msgstr "720"
-
-msgctxt "#32061"
-msgid "480"
-msgstr "480"
-
msgctxt "#32062"
msgid "Minimum fanart size: Musicvideos"
msgstr "Minsta bildstorlek: musikvideor"
diff --git a/script.artwork.downloader/resources/language/Turkish/strings.po
b/script.artwork.downloader/resources/language/Turkish/strings.po
index f4c1584..1628a88 100644
--- a/script.artwork.downloader/resources/language/Turkish/strings.po
+++ b/script.artwork.downloader/resources/language/Turkish/strings.po
@@ -24,6 +24,10 @@ msgctxt "#32009"
msgid "Downloading"
msgstr "KarÅıdan yükleniyor"
+msgctxt "#32012"
+msgid "Finished"
+msgstr "Tamamlandı"
+
msgctxt "#32025"
msgid "Yes"
msgstr "Evet"
diff --git a/script.artwork.downloader/resources/language/Ukrainian/strings.po
b/script.artwork.downloader/resources/language/Ukrainian/strings.po
index 879f1ab..9bb3fe4 100644
--- a/script.artwork.downloader/resources/language/Ukrainian/strings.po
+++ b/script.artwork.downloader/resources/language/Ukrainian/strings.po
@@ -24,6 +24,10 @@ msgctxt "#32009"
msgid "Downloading"
msgstr "ÐаванÑаженнÑâ¦"
+msgctxt "#32012"
+msgid "Finished"
+msgstr "ÐавеÑÑено"
+
msgctxt "#32025"
msgid "Yes"
msgstr "Так"
@@ -44,10 +48,18 @@ msgctxt "#32071"
msgid "Movies"
msgstr "ФÑлÑми"
+msgctxt "#32101"
+msgid "Advanced"
+msgstr "ÐÑлÑÑе"
+
msgctxt "#32121"
msgid "Fanart"
msgstr "ФанаÑÑ"
+msgctxt "#32133"
+msgid "Artwork"
+msgstr "Ðбкладинка"
+
msgctxt "#32141"
msgid "Language"
msgstr "Ðова"
diff --git a/script.artwork.downloader/resources/language/Vietnamese/strings.po
b/script.artwork.downloader/resources/language/Vietnamese/strings.po
index 9f20609..75e0157 100644
--- a/script.artwork.downloader/resources/language/Vietnamese/strings.po
+++ b/script.artwork.downloader/resources/language/Vietnamese/strings.po
@@ -16,6 +16,74 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+msgctxt "#32006"
+msgid "Error"
+msgstr "Lá»i"
+
+msgctxt "#32009"
+msgid "Downloading"
+msgstr "Äang tải vá»"
+
+msgctxt "#32012"
+msgid "Finished"
+msgstr "Äã xong"
+
+msgctxt "#32025"
+msgid "Yes"
+msgstr "Có"
+
+msgctxt "#32026"
+msgid "No"
+msgstr "Không"
+
+msgctxt "#32027"
+msgid "Close"
+msgstr "Äóng"
+
+msgctxt "#32031"
+msgid "General"
+msgstr "Tá»ng Quan"
+
+msgctxt "#32071"
+msgid "Movies"
+msgstr "Phim"
+
+msgctxt "#32101"
+msgid "Advanced"
+msgstr "Nâng cao"
+
+msgctxt "#32121"
+msgid "Fanart"
+msgstr "Fanart"
+
+msgctxt "#32128"
+msgid "Poster"
+msgstr "Poster"
+
+msgctxt "#32133"
+msgid "Artwork"
+msgstr "Ảnh bìa"
+
+msgctxt "#32141"
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+msgctxt "#32142"
+msgid "Rating"
+msgstr "Chấm Äiá»m"
+
+msgctxt "#32143"
+msgid "Votes"
+msgstr "Lượt bình chá»n"
+
+msgctxt "#32145"
+msgid "Size"
+msgstr "Dung lượng"
+
+msgctxt "#32146"
+msgid "Disc"
+msgstr "ÄÄ©a"
+
msgctxt "#32181"
msgid "Info"
msgstr "Thông Tin"
diff --git a/script.artwork.downloader/resources/lib/utils.py
b/script.artwork.downloader/resources/lib/utils.py
index 3be6a25..18bffdb 100644
--- a/script.artwork.downloader/resources/lib/utils.py
+++ b/script.artwork.downloader/resources/lib/utils.py
@@ -80,7 +80,8 @@ def dialog_msg(action,
line3 = '',
background = False,
nolabel = __localize__(32026),
- yeslabel = __localize__(32025)):
+ yeslabel = __localize__(32025),
+ cancelled = False):
# Fix possible unicode errors
line0 = line0.encode( 'utf-8', 'ignore' )
line1 = line1.encode( 'utf-8', 'ignore' )
@@ -114,7 +115,8 @@ def dialog_msg(action,
msg = line1
else:
msg = line1 + ': ' + line2
- xbmc.executebuiltin("XBMC.Notification(%s, %s, 7500, %s)" %
(line0, msg, __icon__))
+ if cancelled == False:
+ xbmc.executebuiltin("XBMC.Notification(%s, %s, 7500, %s)" %
(line0, msg, __icon__))
# Retrieve JSON data from cache function
def get_data(url, data_type ='json'):
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=b2292e54c58760f9836960ae9fcda177e958e346
commit b2292e54c58760f9836960ae9fcda177e958e346
Author: Martijn Kaijser <[email protected]>
Date: Sun Mar 31 17:30:19 2013 +0200
[script.randomandlastitems] 2.1.2
diff --git a/script.randomandlastitems/addon.xml
b/script.randomandlastitems/addon.xml
index 167bde1..d9a6640 100644
--- a/script.randomandlastitems/addon.xml
+++ b/script.randomandlastitems/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.randomandlastitems" name="Random and Last items script"
version="2.1.1" provider-name="MikeBZH44|Martijn">
+<addon id="script.randomandlastitems" name="Random and Last items script"
version="2.1.2" provider-name="MikeBZH44|Martijn">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="xbmc.json" version="6.0.0"/>
diff --git a/script.randomandlastitems/changelog.txt
b/script.randomandlastitems/changelog.txt
index 32c8073..529e0b3 100644
--- a/script.randomandlastitems/changelog.txt
+++ b/script.randomandlastitems/changelog.txt
@@ -1,3 +1,7 @@
+v2.1.2
+- Fix script error on tvshow playlist
+- Also set MPAA and studio for episodes in some cases
+
v2.1.1
- Fix runtime property to use duration from streamdetails
- Fix play property for albums
diff --git a/script.randomandlastitems/randomandlastitems.py
b/script.randomandlastitems/randomandlastitems.py
index ea4f451..10dfe45 100644
--- a/script.randomandlastitems/randomandlastitems.py
+++ b/script.randomandlastitems/randomandlastitems.py
@@ -234,7 +234,7 @@ def _getEpisodesFromPlaylist ( ):
if _file['type'] == 'tvshow':
_tvshows += 1
# Playlist return TV Shows - Need to get episodes
- _json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0",
"method": "VideoLibrary.GetEpisodes", "params": { "tvshowid": %s, "properties":
["title", "playcount", "season", "episode", "showtitle", "plot", "file",
"studio", "mpaa", "rating", "resume", "tvshowid", "art", "streamdetails",
"dateadded"] }, "id": 1}' %(_file['id']))
+ _json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0",
"method": "VideoLibrary.GetEpisodes", "params": { "tvshowid": %s, "properties":
["title", "playcount", "season", "episode", "showtitle", "plot", "file",
"rating", "resume", "tvshowid", "art", "streamdetails", "dateadded"] }, "id":
1}' %(_file['id']))
_json_query = unicode(_json_query, 'utf-8', errors='ignore')
_json_response = simplejson.loads(_json_query)
_episodes = _json_response.get( "result", {} ).get( "episodes"
)
@@ -248,6 +248,9 @@ def _getEpisodesFromPlaylist ( ):
_episode["id"]=_episode['episodeid']
_episode["tvshowfanart"]=art.get('tvshow.fanart')
_episode["tvshowthumb"]=art.get('thumb')
+ # Set MPAA and studio for all episodes
+ _episode["mpaa"]=_file['mpaa']
+ _episode["studio"]=_file['studio']
_total, _watched, _unwatched, _result =
_watchedOrResume ( _total, _watched, _unwatched, _result, _episode )
else:
log("[RandomAndLastItems] ## PLAYLIST %s COULD NOT BE
LOADED ##" %(PLAYLIST))
-----------------------------------------------------------------------
Summary of changes:
script.artwork.downloader/.gitignore | 4 -
script.artwork.downloader/addon.xml | 4 +-
script.artwork.downloader/changelog.txt | 5 ++
script.artwork.downloader/default.py | 74 ++++++++++++++------
.../resources/language/Albanian/strings.po | 64 +++++++++++++++++
.../resources/language/Amharic/strings.po | 4 +
.../resources/language/Belarusian/strings.po | 12 ---
.../resources/language/Bulgarian/strings.po | 4 +
.../resources/language/Catalan/strings.po | 12 +++
.../resources/language/Chinese (Simple)/strings.po | 12 ---
.../resources/language/Croatian/strings.po | 44 ++++++++++++
.../resources/language/Danish/strings.po | 12 ---
.../resources/language/Dutch/strings.po | 12 ---
.../resources/language/English/strings.po | 2 +
.../resources/language/French/strings.po | 12 ---
.../resources/language/Galician/strings.po | 32 +++++++++
.../resources/language/German/strings.po | 12 ---
.../resources/language/Greek/strings.po | 12 ---
.../resources/language/Hebrew/strings.po | 12 ---
.../resources/language/Hungarian/strings.po | 12 ---
.../resources/language/Indonesian/strings.po | 4 +
.../resources/language/Italian/strings.po | 12 ---
.../resources/language/Korean/strings.po | 12 ---
.../language/{Vietnamese => Malay}/strings.po | 10 ++--
.../resources/language/Norwegian/strings.po | 4 +
.../resources/language/Persian (Iran)/strings.po | 20 +++++
.../resources/language/Polish/strings.po | 12 ---
.../language/Portuguese (Brazil)/strings.po | 12 ---
.../resources/language/Portuguese/strings.po | 12 ---
.../resources/language/Slovak/strings.po | 12 ---
.../resources/language/Spanish/strings.po | 16 +----
.../resources/language/Swedish/strings.po | 12 ---
.../resources/language/Turkish/strings.po | 4 +
.../resources/language/Ukrainian/strings.po | 12 +++
.../resources/language/Vietnamese/strings.po | 68 ++++++++++++++++++
script.artwork.downloader/resources/lib/utils.py | 6 +-
script.randomandlastitems/addon.xml | 2 +-
script.randomandlastitems/changelog.txt | 4 +
script.randomandlastitems/randomandlastitems.py | 5 +-
39 files changed, 352 insertions(+), 244 deletions(-)
delete mode 100644 script.artwork.downloader/.gitignore
copy script.artwork.downloader/resources/language/{Vietnamese =>
Malay}/strings.po (75%)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Own the Future-Intel(R) Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest. Compete
for recognition, cash, and the chance to get your game on Steam.
$5K grand prize plus 10 genre and skill prizes. Submit your demo
by 6/6/13. http://altfarm.mediaplex.com/ad/ck/12124-176961-30367-2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons