The branch, gotham has been updated
via 8295e6c98401eb410c770a6255b8935eb0ee851b (commit)
from 41fc09cb1c8c24b19039cfe1630834cae7bd958b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=8295e6c98401eb410c770a6255b8935eb0ee851b
commit 8295e6c98401eb410c770a6255b8935eb0ee851b
Author: sphere <[email protected]>
Date: Wed Mar 12 14:02:10 2014 +0100
[service.subtitles.itasa] updated to version 0.0.4
diff --git a/service.subtitles.itasa/addon.xml
b/service.subtitles.itasa/addon.xml
index 5436784..2bd1cc9 100644
--- a/service.subtitles.itasa/addon.xml
+++ b/service.subtitles.itasa/addon.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.subtitles.itasa"
name="italiansubs.net"
- version="0.0.1"
+ version="0.0.4"
provider-name="phate89">
<requires>
- <import addon="xbmc.python" version="2.1.0"/>
+ <import addon="xbmc.python" version="2.14.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
</requires>
<extension point="xbmc.subtitle.module"
@@ -16,6 +16,7 @@
<summary lang="it">Addon sottotitoli ItaSA</summary>
<description lang="it">Trova e scarica sottotitoli da
italiansubs.net</description>
<disclaimer lang="it">Sentitevi liberi di usare questo script. Per
informazioni visitate il forum.</disclaimer>
+ <language>it</language>
<platform>all</platform>
<license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
<forum>http://forum.xbmc.org/showthread.php?tid=188074</forum>
diff --git a/service.subtitles.itasa/changelog.txt
b/service.subtitles.itasa/changelog.txt
index ef17dba..3028cce 100644
--- a/service.subtitles.itasa/changelog.txt
+++ b/service.subtitles.itasa/changelog.txt
@@ -1,2 +1,12 @@
+0.0.4
+- added notification in case of failed login, attempt to search other language
than italian and attempt to search movies
+- fixed check of WEB-DL quality with different namings
+
+0.0.3
+- fixed check for the normal (hdtv) version
+
+0.0.2
+- fixed a bug with a sync check and added the check for the normal (hdtv)
version
+
0.0.1
- initial release
\ No newline at end of file
diff --git a/service.subtitles.itasa/resources/language/English/strings.xml
b/service.subtitles.itasa/resources/language/English/strings.xml
index 39fb4a2..1a5569d 100644
--- a/service.subtitles.itasa/resources/language/English/strings.xml
+++ b/service.subtitles.itasa/resources/language/English/strings.xml
@@ -6,4 +6,8 @@
<string id="32001">Username</string>
<string id="32002">Password</string>
<string id="32003">Login Details</string>
+ <string id="32004">Login to ItaSA failed. Check your username and password
in addon settings</string>
+ <string id="32005">ItaSA has only italian subtitles. Add italian to the
subtitle settings</string>
+ <string id="32006">ItaSA only works with tv shows subtitles</string>
+ <string id="32007">Download link not found in ItaSA subtitle page.
Downloaded too many times?</string>
</strings>
diff --git a/service.subtitles.itasa/resources/language/Italian/strings.xml
b/service.subtitles.itasa/resources/language/Italian/strings.xml
index 93d5696..3234d9c 100644
--- a/service.subtitles.itasa/resources/language/Italian/strings.xml
+++ b/service.subtitles.itasa/resources/language/Italian/strings.xml
@@ -6,4 +6,8 @@
<string id="32001">Nome utente</string>
<string id="32002">Password</string>
<string id="32003">Dettagli login</string>
+ <string id="32004">Login a ItaSA fallito. Controlla il tuo username e la
tua password nelle impostazioni dell'addon</string>
+ <string id="32005">ItaSA ha solo sottotitoli italiani. Aggiungete
l'italiano nelle impostazioni sottotitoli..</string>
+ <string id="32006">ItaSA funziona solo con sottotitoli di serie
tv</string>
+ <string id="32007">Download link non trovato nella pagina ItaSA del
sottotitolo. Già scaricato più di 10 volte?</string>
</strings>
diff --git a/service.subtitles.itasa/service.py
b/service.subtitles.itasa/service.py
index 518f701..ef27e65 100644
--- a/service.subtitles.itasa/service.py
+++ b/service.subtitles.itasa/service.py
@@ -267,10 +267,12 @@ def search(item):
elif item['tvshow']:
search_tvshow(item['tvshow'], item['season'],
item['episode'], item['onlineid'], filename)
elif item['title'] and item['year']:
+ xbmc.executebuiltin((u'Notification(%s,%s)' %
(__scriptname__ , __language__(32006))).encode('utf-8'))
log(__name__, 'Itasa only works with tv shows. Skipped')
else:
search_filename(filename)
else:
+ xbmc.executebuiltin((u'Notification(%s,%s)' % (__scriptname__ ,
__language__(32005))).encode('utf-8'))
log(__name__, 'Itasa only works with italian. Skipped')
def search_tvshow(tvshow, season, episode, onlineid, filename):
@@ -311,14 +313,26 @@ def search_manual(searchstr, filename):
def checksyncandadd(result, filename):
fl = filename.lower()
for (subtitleid, subtitlename, subtitleversion) in result:
- if subtitleversion == '720p':
- if '720p' in fl and 'hdtv' in fl:
+ if subtitleversion == 'WEB-DL':
+ if ('web-dl' in fl) or ('web.dl' in fl) or ('webdl' in
fl) or ('web dl' in fl):
+ append_subtitle(subtitleid, subtitlename + ' '
+ subtitleversion, filename, True)
+ elif subtitleversion == '720p':
+ if ('720p' in fl) and ('hdtv' in fl):
+ append_subtitle(subtitleid, subtitlename + ' '
+ subtitleversion, filename, True)
+ elif subtitleversion == 'Normale':
+ if ('hdtv' in fl) and ( not ('720p' in fl)):
append_subtitle(subtitleid, subtitlename + ' '
+ subtitleversion, filename, True)
elif subtitleversion.lower() in fl:
append_subtitle(subtitleid, subtitlename + ' ' +
subtitleversion, filename, True)
for (subtitleid, subtitlename, subtitleversion) in result:
- if subtitleversion == '720p':
- if not('720p' in fl and 'hdtv') in fl:
+ if subtitleversion == 'WEB-DL':
+ if not (('web-dl' in fl) or ('web.dl' in fl) or
('webdl' in fl) or ('web dl' in fl)):
+ append_subtitle(subtitleid, subtitlename + ' '
+ subtitleversion, filename, True)
+ elif subtitleversion == '720p':
+ if not (('720p' in fl) and ('hdtv' in fl)):
+ append_subtitle(subtitleid, subtitlename + ' '
+ subtitleversion, filename, False)
+ elif subtitleversion == 'Normale':
+ if not (('hdtv' in fl) and ( not ('720p' in fl))):
append_subtitle(subtitleid, subtitlename + ' '
+ subtitleversion, filename, False)
elif not (subtitleversion.lower() in fl):
append_subtitle(subtitleid, subtitlename + ' ' +
subtitleversion, filename, False)
@@ -420,12 +434,14 @@ def download (subid): #standard input
else:
match = re.search('logouticon.png', content,
re.IGNORECASE | re.DOTALL)
if match:
+
xbmc.executebuiltin((u'Notification(%s,%s)' % (__scriptname__ ,
__language__(32007))).encode('utf-8'))
log( __name__ ,'Can\'t find the
download url. Probably you downloaded the file too many times (more than 10)')
else:
log( __name__ ,'Can\'t find the
download url. Probably not logged in')
else:
log( __name__ ,'Download of subtitle page failed')
else:
+ xbmc.executebuiltin((u'Notification(%s,%s)' % (__scriptname__ ,
__language__(32004))).encode('utf-8'))
log( __name__ ,'Login to Itasa failed. Check your
username/password at the addon configuration')
return []
-----------------------------------------------------------------------
Summary of changes:
service.subtitles.itasa/addon.xml | 5 ++-
service.subtitles.itasa/changelog.txt | 10 ++++++++
.../resources/language/English/strings.xml | 4 +++
.../resources/language/Italian/strings.xml | 4 +++
service.subtitles.itasa/service.py | 24 ++++++++++++++++---
5 files changed, 41 insertions(+), 6 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
