The branch, gotham has been updated
via a6104ff32e7eeab85d3f94528f6f7c626b219c54 (commit)
via bf30e9a80c17baa3e2e13d3ecb098698b61b0ad4 (commit)
via d34ec57e94369e648617279b5500876c612e4547 (commit)
from 25d19524308b5c6525c3313b80210400a73d79c8 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=a6104ff32e7eeab85d3f94528f6f7c626b219c54
commit a6104ff32e7eeab85d3f94528f6f7c626b219c54
Author: Martijn Kaijser <[email protected]>
Date: Wed Jun 18 20:10:52 2014 +0200
[service.subtitles.legendasdivx] 0.1.1
diff --git a/service.subtitles.legendasdivx/addon.xml
b/service.subtitles.legendasdivx/addon.xml
index b5a5a89..04852a1 100644
--- a/service.subtitles.legendasdivx/addon.xml
+++ b/service.subtitles.legendasdivx/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.subtitles.legendasdivx"
name="LegendasDivx.com"
- version="0.1.0"
+ version="0.1.1"
provider-name="HiGhLaNdeR">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
diff --git a/service.subtitles.legendasdivx/changelog.txt
b/service.subtitles.legendasdivx/changelog.txt
index 44d5a4c..5fdad5e 100644
--- a/service.subtitles.legendasdivx/changelog.txt
+++ b/service.subtitles.legendasdivx/changelog.txt
@@ -1,3 +1,5 @@
+0.1.1
+- Added a last resort option to search for filename or title, configure in
advanced options of the add-on.
0.1.0
- Fix the decoding BUG in Raspberry Pi (Linux and Windows have different
behaviours).
- New pattern for the last resort search to check if it's a movie or tvshow.
@@ -30,4 +32,4 @@
- Improved scrapping on the description.
- Improved Sync results.
0.0.1
-- Initial port to new Gotham structure.
\ No newline at end of file
+- Initial port to new Gotham structure.
diff --git
a/service.subtitles.legendasdivx/resources/language/English/strings.xml
b/service.subtitles.legendasdivx/resources/language/English/strings.xml
index 1cca3fa..ded0955 100644
--- a/service.subtitles.legendasdivx/resources/language/English/strings.xml
+++ b/service.subtitles.legendasdivx/resources/language/English/strings.xml
@@ -16,8 +16,11 @@
<string id="32013">Off</string>
<string id="32014">Language Settings</string>
<string id="32015">Advanced Settings</string>
- <string id="32016">Username is required! Check add-on setttings!</string>
- <string id="32017">Password is required! Check add-on setttings!</string>
+ <string id="32016">Username is required! Check add-on settings!</string>
+ <string id="32017">Password is required! Check add-on settings!</string>
<string id="32018">Username and Password is required! Check add-on
setttings!</string>
<string id="32019">Only for registered users! Wrong username and/or
password? Check add-on settings. Thanks.</string>
+ <string id="32020">Priority Search by</string>
+ <string id="32021">Filename</string>
+ <string id="32022">Title</string>
</strings>
diff --git a/service.subtitles.legendasdivx/resources/language/Portuguese
(Brazil)/strings.xml
b/service.subtitles.legendasdivx/resources/language/Portuguese
(Brazil)/strings.xml
index c90a904..609b917 100644
--- a/service.subtitles.legendasdivx/resources/language/Portuguese
(Brazil)/strings.xml
+++ b/service.subtitles.legendasdivx/resources/language/Portuguese
(Brazil)/strings.xml
@@ -20,4 +20,7 @@
<string id="32017">A senha é obrigatória! Verifique as definições do
serviço!</string>
<string id="32018">O usuario e senha são obrigatórios! Verifique as
definições do serviço!</string>
<string id="32019">Apenas para usuarios registados! Usuario e/ou Senha
errados? Verifique as definições do serviço!. Obrigado.</string>
+ <string id="32020">Prioridade de Pesquisa por</string>
+ <string id="32021">Nome do Ficheiro</string>
+ <string id="32022">TÃtulo</string>
</strings>
diff --git
a/service.subtitles.legendasdivx/resources/language/Portuguese/strings.xml
b/service.subtitles.legendasdivx/resources/language/Portuguese/strings.xml
index 186e9b9..e30905c 100644
--- a/service.subtitles.legendasdivx/resources/language/Portuguese/strings.xml
+++ b/service.subtitles.legendasdivx/resources/language/Portuguese/strings.xml
@@ -20,4 +20,7 @@
<string id="32017">A palavra-passe é obrigatória! Verifique as
definições do serviço!</string>
<string id="32018">O utilizador e palavra-passe são obrigatórios!
Verifique as definições do serviço!</string>
<string id="32019">Apenas para utilizadores registados! Utilizador e/ou
Palavra-passe errados? Verifique as definições do serviço!.
Obrigado.</string>
+ <string id="32020">Prioridade de Pesquisa por</string>
+ <string id="32021">Nome do Ficheiro</string>
+ <string id="32022">TÃtulo</string>
</strings>
diff --git a/service.subtitles.legendasdivx/resources/settings.xml
b/service.subtitles.legendasdivx/resources/settings.xml
index be8f9c2..da15bb5 100644
--- a/service.subtitles.legendasdivx/resources/settings.xml
+++ b/service.subtitles.legendasdivx/resources/settings.xml
@@ -13,5 +13,6 @@
<category label="32015">
<setting id="DESC" type="bool" label="32008" default="false"/>
<setting id="PARENT" type="enum" lvalues="32011|32013" label="32010"
default="0"/>
+ <setting id="SEARCH" type="enum" lvalues="32021|32022" label="32020"
default="0"/>
</category>
</settings>
diff --git a/service.subtitles.legendasdivx/service.py
b/service.subtitles.legendasdivx/service.py
index da694f8..e3484c1 100644
--- a/service.subtitles.legendasdivx/service.py
+++ b/service.subtitles.legendasdivx/service.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Service LegendasDivx.com version 0.1.0
+# Service LegendasDivx.com version 0.1.1
# Code based on Undertext (FRODO) service
# Coded by HiGhLaNdR@OLDSCHOOL
# Ported to Gotham by HiGhLaNdR@OLDSCHOOL
@@ -41,6 +41,7 @@ __temp__ = xbmc.translatePath(pjoin(__profile__,
'temp'))
sys.path.append (__resource__)
__descon__ = __addon__.getSetting( 'DESC' )
+__search__ = __addon__.getSetting( 'SEARCH' )
main_url = "http://www.legendasdivx.com/";
debug_pretext = "LegendasDivx"
@@ -375,13 +376,22 @@ def Search(item):
searchstring = title[-1]
#log(u"TITLE NULL Searchstring string = %s" %
(searchstring,))
else:
- if re.search("(.+?s[0-9][0-9]e[0-9][0-9])", filename,
re.IGNORECASE):
- searchstring =
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", filename, re.IGNORECASE)
- searchstring = searchstring.group(0)
- #log(u"FilenameTV Searchstring = %s" % (searchstring,))
+ if __search__ == '0':
+ if
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", filename, re.IGNORECASE):
+ searchstring =
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", filename, re.IGNORECASE)
+ searchstring =
searchstring.group(0)
+ #log(u"FilenameTV
Searchstring = %s" % (searchstring,))
+ else:
+ searchstring = filename
+ #log(u"Filename
Searchstring = %s" % (searchstring,))
else:
- searchstring = filename
- #log(u"Filename Searchstring = %s" % (searchstring,))
+ if
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", title, re.IGNORECASE):
+ searchstring =
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", title, re.IGNORECASE)
+ searchstring =
searchstring.group(0)
+ #log(u"TitleTV
Searchstring = %s" % (searchstring,))
+ else:
+ searchstring = title
+ #log(u"Title
Searchstring = %s" % (searchstring,))
PT_ON = __addon__.getSetting( 'PT' )
PTBR_ON = __addon__.getSetting( 'PTBR' )
@@ -598,4 +608,4 @@ elif params['action'] == 'download':
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=sub,
listitem=listitem, isFolder=False)
# Send end of directory to XBMC
-xbmcplugin.endOfDirectory(int(sys.argv[1]))
\ No newline at end of file
+xbmcplugin.endOfDirectory(int(sys.argv[1]))
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=bf30e9a80c17baa3e2e13d3ecb098698b61b0ad4
commit bf30e9a80c17baa3e2e13d3ecb098698b61b0ad4
Author: Martijn Kaijser <[email protected]>
Date: Wed Jun 18 20:10:14 2014 +0200
[service.subtitles.pipocas] 0.1.1
diff --git a/service.subtitles.pipocas/addon.xml
b/service.subtitles.pipocas/addon.xml
index ab7192b..fbfa89a 100644
--- a/service.subtitles.pipocas/addon.xml
+++ b/service.subtitles.pipocas/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.subtitles.pipocas"
name="Pipocas.tv"
- version="0.1.0"
+ version="0.1.1"
provider-name="HiGhLaNdeR">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
diff --git a/service.subtitles.pipocas/changelog.txt
b/service.subtitles.pipocas/changelog.txt
index 962642b..5b0d02e 100644
--- a/service.subtitles.pipocas/changelog.txt
+++ b/service.subtitles.pipocas/changelog.txt
@@ -1,3 +1,5 @@
+0.1.1
+- Added a last resort option to search for filename or title, configure in
advanced options of the add-on
0.1.0
- Fix the decoding BUG in Raspberry Pi (Linux and Windows have different
behaviours).
- New pattern for the last resort search to check if it's a movie or tvshow.
@@ -16,4 +18,4 @@
0.0.2
- Changed description display and fixed rating score.
0.0.1
-- Initial port to new Gotham structure.
\ No newline at end of file
+- Initial port to new Gotham structure.
diff --git a/service.subtitles.pipocas/resources/language/English/strings.xml
b/service.subtitles.pipocas/resources/language/English/strings.xml
index 1cca3fa..ded0955 100644
--- a/service.subtitles.pipocas/resources/language/English/strings.xml
+++ b/service.subtitles.pipocas/resources/language/English/strings.xml
@@ -16,8 +16,11 @@
<string id="32013">Off</string>
<string id="32014">Language Settings</string>
<string id="32015">Advanced Settings</string>
- <string id="32016">Username is required! Check add-on setttings!</string>
- <string id="32017">Password is required! Check add-on setttings!</string>
+ <string id="32016">Username is required! Check add-on settings!</string>
+ <string id="32017">Password is required! Check add-on settings!</string>
<string id="32018">Username and Password is required! Check add-on
setttings!</string>
<string id="32019">Only for registered users! Wrong username and/or
password? Check add-on settings. Thanks.</string>
+ <string id="32020">Priority Search by</string>
+ <string id="32021">Filename</string>
+ <string id="32022">Title</string>
</strings>
diff --git a/service.subtitles.pipocas/resources/language/Portuguese
(Brazil)/strings.xml b/service.subtitles.pipocas/resources/language/Portuguese
(Brazil)/strings.xml
index c90a904..609b917 100644
--- a/service.subtitles.pipocas/resources/language/Portuguese
(Brazil)/strings.xml
+++ b/service.subtitles.pipocas/resources/language/Portuguese
(Brazil)/strings.xml
@@ -20,4 +20,7 @@
<string id="32017">A senha é obrigatória! Verifique as definições do
serviço!</string>
<string id="32018">O usuario e senha são obrigatórios! Verifique as
definições do serviço!</string>
<string id="32019">Apenas para usuarios registados! Usuario e/ou Senha
errados? Verifique as definições do serviço!. Obrigado.</string>
+ <string id="32020">Prioridade de Pesquisa por</string>
+ <string id="32021">Nome do Ficheiro</string>
+ <string id="32022">TÃtulo</string>
</strings>
diff --git
a/service.subtitles.pipocas/resources/language/Portuguese/strings.xml
b/service.subtitles.pipocas/resources/language/Portuguese/strings.xml
index 186e9b9..e30905c 100644
--- a/service.subtitles.pipocas/resources/language/Portuguese/strings.xml
+++ b/service.subtitles.pipocas/resources/language/Portuguese/strings.xml
@@ -20,4 +20,7 @@
<string id="32017">A palavra-passe é obrigatória! Verifique as
definições do serviço!</string>
<string id="32018">O utilizador e palavra-passe são obrigatórios!
Verifique as definições do serviço!</string>
<string id="32019">Apenas para utilizadores registados! Utilizador e/ou
Palavra-passe errados? Verifique as definições do serviço!.
Obrigado.</string>
+ <string id="32020">Prioridade de Pesquisa por</string>
+ <string id="32021">Nome do Ficheiro</string>
+ <string id="32022">TÃtulo</string>
</strings>
diff --git a/service.subtitles.pipocas/resources/settings.xml
b/service.subtitles.pipocas/resources/settings.xml
index ba40749..0a0f47f 100644
--- a/service.subtitles.pipocas/resources/settings.xml
+++ b/service.subtitles.pipocas/resources/settings.xml
@@ -12,5 +12,6 @@
</category>
<category label="32015">
<setting id="PARENT" type="enum" lvalues="32011|32013" label="32010"
default="0"/>
+ <setting id="SEARCH" type="enum" lvalues="32021|32022" label="32020"
default="0"/>
</category>
</settings>
\ No newline at end of file
diff --git a/service.subtitles.pipocas/service.py
b/service.subtitles.pipocas/service.py
index 1358e2a..6f5ca2d 100644
--- a/service.subtitles.pipocas/service.py
+++ b/service.subtitles.pipocas/service.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Service Pipocas.tv version 0.1.0
+# Service Pipocas.tv version 0.1.1
# Code based on Undertext (FRODO) service
# Coded by HiGhLaNdR@OLDSCHOOL
# Ported to Gotham by HiGhLaNdR@OLDSCHOOL
@@ -40,6 +40,8 @@ __temp__ = xbmc.translatePath(pjoin(__profile__,
'temp'))
sys.path.append (__resource__)
+__search__ = __addon__.getSetting( 'SEARCH' )
+
main_url = "http://pipocas.tv/";
debug_pretext = "Pipocas"
#SEARCH_PAGE_URL = main_url +
"modules.php?name=Downloads&file=jz&d_op=search_next&order=&form_cat=28&page=%(page)s&query=%(query)s"
@@ -111,12 +113,14 @@ def getallsubs(searchstring, languageshort, languagelong,
file_original_path, se
page = 0
if languageshort == "pt":
url = main_url + "subtitles.php?grupo=rel&linguagem=portugues&page=" +
str(page) + "&release=" + urllib.quote_plus(searchstring)
- if languageshort == "pb":
+ elif languageshort == "pb":
url = main_url + "subtitles.php?grupo=rel&linguagem=brasileiro&page="
+ str(page) + "&release=" + urllib.quote_plus(searchstring)
- if languageshort == "en":
- url = main_url + "subtitles.php?grupo=rel&linguagem=ingles&page=" +
str(page) + "&release=" + urllib.quote_plus(searchstring)
- if languageshort == "es":
+ elif languageshort == "es":
url = main_url + "subtitles.php?grupo=rel&linguagem=espanhol&page=" +
str(page) + "&release=" + urllib.quote_plus(searchstring)
+ elif languageshort == "en":
+ url = main_url + "subtitles.php?grupo=rel&linguagem=ingles&page=" +
str(page) + "&release=" + urllib.quote_plus(searchstring)
+ else:
+ url = main_url + "index.php"
content = opener.open(url)
content = content.read()
@@ -218,17 +222,18 @@ def getallsubs(searchstring, languageshort, languagelong,
file_original_path, se
page = page + 1
if languageshort == "pt":
url = main_url +
"subtitles.php?grupo=rel&linguagem=portugues&page=" + str(page) + "&release=" +
urllib.quote_plus(searchstring)
- if languageshort == "pb":
+ elif languageshort == "pb":
url = main_url +
"subtitles.php?grupo=rel&linguagem=brasileiro&page=" + str(page) + "&release="
+ urllib.quote_plus(searchstring)
- if languageshort == "en":
- url = main_url + "subtitles.php?grupo=rel&linguagem=ingles&page="
+ str(page) + "&release=" + urllib.quote_plus(searchstring)
- if languageshort == "es":
+ elif languageshort == "es":
url = main_url +
"subtitles.php?grupo=rel&linguagem=espanhol&page=" + str(page) + "&release=" +
urllib.quote_plus(searchstring)
+ elif languageshort == "en":
+ url = main_url + "subtitles.php?grupo=rel&linguagem=ingles&page="
+ str(page) + "&release=" + urllib.quote_plus(searchstring)
+ else:
+ url = main_url + "index.php"
content = opener.open(url)
content = content.read()
content = content.decode('latin1')
-
# Bubble sort, to put syncs on top
for n in range(0,len(subtitles_list)):
for i in range(1, len(subtitles_list)):
@@ -356,13 +361,22 @@ def Search(item):
searchstring = title[-1]
#log(u"TITLE NULL Searchstring string = %s" %
(searchstring,))
else:
- if re.search("(.+?s[0-9][0-9]e[0-9][0-9])", filename,
re.IGNORECASE):
- searchstring =
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", filename, re.IGNORECASE)
- searchstring = searchstring.group(0)
- #log(u"FilenameTV Searchstring = %s" % (searchstring,))
+ if __search__ == '0':
+ if
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", filename, re.IGNORECASE):
+ searchstring =
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", filename, re.IGNORECASE)
+ searchstring =
searchstring.group(0)
+ #log(u"FilenameTV
Searchstring = %s" % (searchstring,))
+ else:
+ searchstring = filename
+ #log(u"Filename
Searchstring = %s" % (searchstring,))
else:
- searchstring = filename
- #log(u"Filename Searchstring = %s" % (searchstring,))
+ if
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", title, re.IGNORECASE):
+ searchstring =
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", title, re.IGNORECASE)
+ searchstring =
searchstring.group(0)
+ #log(u"TitleTV
Searchstring = %s" % (searchstring,))
+ else:
+ searchstring = title
+ #log(u"Title
Searchstring = %s" % (searchstring,))
PT_ON = __addon__.getSetting( 'PT' )
PTBR_ON = __addon__.getSetting( 'PTBR' )
@@ -602,4 +616,4 @@ elif params['action'] == 'download':
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=sub,
listitem=listitem, isFolder=False)
# Send end of directory to XBMC
-xbmcplugin.endOfDirectory(int(sys.argv[1]))
\ No newline at end of file
+xbmcplugin.endOfDirectory(int(sys.argv[1]))
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=d34ec57e94369e648617279b5500876c612e4547
commit d34ec57e94369e648617279b5500876c612e4547
Author: Martijn Kaijser <[email protected]>
Date: Wed Jun 18 20:09:35 2014 +0200
[service.subtitles.legendaszone] 0.1.1
diff --git a/service.subtitles.legendaszone/addon.xml
b/service.subtitles.legendaszone/addon.xml
index 97c4cd2..a2cba0b 100644
--- a/service.subtitles.legendaszone/addon.xml
+++ b/service.subtitles.legendaszone/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.subtitles.legendaszone"
name="Legendas-Zone.org"
- version="0.1.0"
+ version="0.1.1"
provider-name="HiGhLaNdeR">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
diff --git a/service.subtitles.legendaszone/changelog.txt
b/service.subtitles.legendaszone/changelog.txt
index 15abd52..767e9af 100644
--- a/service.subtitles.legendaszone/changelog.txt
+++ b/service.subtitles.legendaszone/changelog.txt
@@ -1,3 +1,5 @@
+0.1.1
+- Added a last resort option to search for filename or title, configure in
advanced options of the add-on.
0.1.0
- Fix the decoding BUG in Raspberry Pi (Linux and Windows have different
behaviours).
- New pattern for the last resort search to check if it's a movie or tvshow.
@@ -18,4 +20,4 @@
0.0.2
- Fix for multiple movies hit.
0.0.1
-- Initial port to new Gotham structure.
\ No newline at end of file
+- Initial port to new Gotham structure.
diff --git
a/service.subtitles.legendaszone/resources/language/English/strings.xml
b/service.subtitles.legendaszone/resources/language/English/strings.xml
index 1cca3fa..ded0955 100644
--- a/service.subtitles.legendaszone/resources/language/English/strings.xml
+++ b/service.subtitles.legendaszone/resources/language/English/strings.xml
@@ -16,8 +16,11 @@
<string id="32013">Off</string>
<string id="32014">Language Settings</string>
<string id="32015">Advanced Settings</string>
- <string id="32016">Username is required! Check add-on setttings!</string>
- <string id="32017">Password is required! Check add-on setttings!</string>
+ <string id="32016">Username is required! Check add-on settings!</string>
+ <string id="32017">Password is required! Check add-on settings!</string>
<string id="32018">Username and Password is required! Check add-on
setttings!</string>
<string id="32019">Only for registered users! Wrong username and/or
password? Check add-on settings. Thanks.</string>
+ <string id="32020">Priority Search by</string>
+ <string id="32021">Filename</string>
+ <string id="32022">Title</string>
</strings>
diff --git a/service.subtitles.legendaszone/resources/language/Portuguese
(Brazil)/strings.xml
b/service.subtitles.legendaszone/resources/language/Portuguese
(Brazil)/strings.xml
index c90a904..609b917 100644
--- a/service.subtitles.legendaszone/resources/language/Portuguese
(Brazil)/strings.xml
+++ b/service.subtitles.legendaszone/resources/language/Portuguese
(Brazil)/strings.xml
@@ -20,4 +20,7 @@
<string id="32017">A senha é obrigatória! Verifique as definições do
serviço!</string>
<string id="32018">O usuario e senha são obrigatórios! Verifique as
definições do serviço!</string>
<string id="32019">Apenas para usuarios registados! Usuario e/ou Senha
errados? Verifique as definições do serviço!. Obrigado.</string>
+ <string id="32020">Prioridade de Pesquisa por</string>
+ <string id="32021">Nome do Ficheiro</string>
+ <string id="32022">TÃtulo</string>
</strings>
diff --git
a/service.subtitles.legendaszone/resources/language/Portuguese/strings.xml
b/service.subtitles.legendaszone/resources/language/Portuguese/strings.xml
index 186e9b9..e30905c 100644
--- a/service.subtitles.legendaszone/resources/language/Portuguese/strings.xml
+++ b/service.subtitles.legendaszone/resources/language/Portuguese/strings.xml
@@ -20,4 +20,7 @@
<string id="32017">A palavra-passe é obrigatória! Verifique as
definições do serviço!</string>
<string id="32018">O utilizador e palavra-passe são obrigatórios!
Verifique as definições do serviço!</string>
<string id="32019">Apenas para utilizadores registados! Utilizador e/ou
Palavra-passe errados? Verifique as definições do serviço!.
Obrigado.</string>
+ <string id="32020">Prioridade de Pesquisa por</string>
+ <string id="32021">Nome do Ficheiro</string>
+ <string id="32022">TÃtulo</string>
</strings>
diff --git a/service.subtitles.legendaszone/resources/settings.xml
b/service.subtitles.legendaszone/resources/settings.xml
index e7c2741..ac85d54 100644
--- a/service.subtitles.legendaszone/resources/settings.xml
+++ b/service.subtitles.legendaszone/resources/settings.xml
@@ -12,5 +12,6 @@
</category>
<category label="32015">
<setting id="PARENT" type="enum" lvalues="32011|32013" label="32010"
default="0"/>
+ <setting id="SEARCH" type="enum" lvalues="32021|32022" label="32020"
default="0"/>
</category>
</settings>
\ No newline at end of file
diff --git a/service.subtitles.legendaszone/service.py
b/service.subtitles.legendaszone/service.py
index 2e484b7..84f7683 100644
--- a/service.subtitles.legendaszone/service.py
+++ b/service.subtitles.legendaszone/service.py
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
-# Service Legendas-Zone.org version 0.1.0
+# Service Legendas-Zone.org version 0.1.1
# Code based on Undertext (FRODO) service
# Coded by HiGhLaNdR@OLDSCHOOL
# Ported to Gotham by HiGhLaNdR@OLDSCHOOL
-# Help by VaRaTRoN
+# Help by VaRaTRoN and Mafarricos
# Bugs & Features to [email protected]
# http://www.teknorage.com
# License: GPL v2
@@ -39,6 +39,7 @@ __resource__ = xbmc.translatePath(pjoin(__cwd__,
'resources', 'lib' ) ).decode
__temp__ = xbmc.translatePath(pjoin(__profile__, 'temp'))
sys.path.append (__resource__)
+__search__ = __addon__.getSetting( 'SEARCH' )
main_url = "http://www.legendas-zone.org/";
debug_pretext = "LegendasZone"
@@ -521,13 +522,22 @@ def Search(item):
searchstring = title[-1]
#log(u"TITLE NULL Searchstring string = %s" %
(searchstring,))
else:
- if re.search("(.+?s[0-9][0-9]e[0-9][0-9])", filename,
re.IGNORECASE):
- searchstring =
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", filename, re.IGNORECASE)
- searchstring = searchstring.group(0)
- #log(u"FilenameTV Searchstring = %s" % (searchstring,))
+ if __search__ == '0':
+ if
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", filename, re.IGNORECASE):
+ searchstring =
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", filename, re.IGNORECASE)
+ searchstring =
searchstring.group(0)
+ #log(u"FilenameTV
Searchstring = %s" % (searchstring,))
+ else:
+ searchstring = filename
+ #log(u"Filename
Searchstring = %s" % (searchstring,))
else:
- searchstring = filename
- #log(u"Filename Searchstring = %s" % (searchstring,))
+ if
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", title, re.IGNORECASE):
+ searchstring =
re.search("(.+?s[0-9][0-9]e[0-9][0-9])", title, re.IGNORECASE)
+ searchstring =
searchstring.group(0)
+ #log(u"TitleTV
Searchstring = %s" % (searchstring,))
+ else:
+ searchstring = title
+ #log(u"Title
Searchstring = %s" % (searchstring,))
PT_ON = __addon__.getSetting( 'PT' )
PTBR_ON = __addon__.getSetting( 'PTBR' )
@@ -655,8 +665,11 @@ def Download(id, filename):
#if file.split('.')[-1] in SUB_EXTS and
os.stat(pjoin(__temp__, file)).st_mtime > init_max_mtime:
if searchsubscount == 1:
# unpacked file is a newly created subtitle file
- log(u"Unpacked subtitles file '%s'" % (file,))
- subs_file = pjoin(__temp__, file.decode("utf-8"))
+ #log(u"Unpacked subtitles file '%s'" %
(file.decode('utf-8'),))
+ try:
+ subs_file = pjoin(__temp__, file.decode("utf-8"))
+ except:
+ subs_file = pjoin(__temp__, file.decode("latin1"))
subtitles_list.append(subs_file)
break
else:
-----------------------------------------------------------------------
Summary of changes:
service.subtitles.legendasdivx/addon.xml | 2 +-
service.subtitles.legendasdivx/changelog.txt | 4 +-
.../resources/language/English/strings.xml | 7 ++-
.../language/Portuguese (Brazil)/strings.xml | 3 +
.../resources/language/Portuguese/strings.xml | 3 +
.../resources/settings.xml | 1 +
service.subtitles.legendasdivx/service.py | 26 +++++++---
service.subtitles.legendaszone/addon.xml | 2 +-
service.subtitles.legendaszone/changelog.txt | 4 +-
.../resources/language/English/strings.xml | 7 ++-
.../language/Portuguese (Brazil)/strings.xml | 3 +
.../resources/language/Portuguese/strings.xml | 3 +
.../resources/settings.xml | 1 +
service.subtitles.legendaszone/service.py | 33 +++++++++----
service.subtitles.pipocas/addon.xml | 2 +-
service.subtitles.pipocas/changelog.txt | 4 +-
.../resources/language/English/strings.xml | 7 ++-
.../language/Portuguese (Brazil)/strings.xml | 3 +
.../resources/language/Portuguese/strings.xml | 3 +
service.subtitles.pipocas/resources/settings.xml | 1 +
service.subtitles.pipocas/service.py | 48 +++++++++++++-------
21 files changed, 120 insertions(+), 47 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
