[Xbmc-addons] Scripts branch, dharma-pre, updated. d4f4d1eea8777ce15c5a59b8376f97859c44fadc

Sun, 24 Oct 2010 05:43:30 -0700 

The branch, dharma-pre has been updated
       via  d4f4d1eea8777ce15c5a59b8376f97859c44fadc (commit)
      from  d519f798c472fead5db4c478aea8527be336a1ca (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=d4f4d1eea8777ce15c5a59b8376f97859c44fadc

commit d4f4d1eea8777ce15c5a59b8376f97859c44fadc
Author: Zeljko Ametovic <[email protected]>
Date:   Sun Oct 24 16:41:22 2010 +0400

    [script.xbmc.subtitles] -v2.0.0
    - added: new service Subdivx.com, Spanish subs only. Thanks to Enric Godes.
    - updated: use .getAddonInfo('path') instead of os.getcwd()
    - cosmetics

diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 669cd6c..d469b00 100644
--- a/script.xbmc.subtitles/addon.xml
+++ b/script.xbmc.subtitles/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.xbmc.subtitles"
        name="XBMC Subtitles"
-       version="1.9.9"
+       version="2.0.0"
        provider-name="Amet">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
@@ -15,11 +15,11 @@
     <summary lang="hu">XBMC feliratok</summary> 
     <summary lang="sr">XBMC Преводи</summary>
     <summary lang="nl">XBMC Ondertitels</summary>     
-    <description lang="en">Search and download subtitles from 11 
websites:OpenSubtitles.org, Podnapisi.net, Sublight.si, Bierdopje.com, 
Subscene.com, Undertexter.se, Ondertitel.com, Napiprojekt.pl, Titulky.com, 
Legendas.tv and Titlovi.com.Subtitle button on OSD needs to be activated and 
path set to XBMC Subtitles under System-> Skin-> Addon Scripts</description>
-    <description lang="es">Busca y descarga subtítulos de:OpenSubtitles.org, 
Podnapisi.net, Sublight.si, Bierdopje.com, Subscene.com, Undertexter.se, 
Ondertitel.com, Napiprojekt.pl, Titulky.com, Legendas.tv y Titlovi.com.El 
botón de subtitulos en el OSD debe ser añadido, y la ruta al addon debe 
ponerse en Sistema-> Skin-> Addons de Scripts</description>
-    <description lang="hu">Film feliratok keresése letöltése 
az:OpenSubtitles.org, Podnapisi.net, Sublight.si, Bierdopje.com, Subscene.com, 
Undertexter.se, Ondertitel.com, Napiprojekt.pl, Titulky.com, Legendas.tv és 
Titlovi.com webhelyekról.A dalszöveg OSD gombot aktiválni kell az elérési 
út megadásával a Beállítások -> Skin -> Szkriptek alatt.</description>
-    <description lang="sr">Претражи и скини преводе са 
11 веб страница:OpenSubtitles.org, Podnapisi.net, Sublight.si, 
Bierdopje.com, Subscene.com, Undertexter.se, Ondertitel.com, Napiprojekt.pl, 
Legendas.tv и Titlovi.com.Дугме за преводе на OSD треба 
да се активира и изабере XBMC Subtitles у Систем-> 
Маска-> Скрипт додаци</description>
-    <description lang="nl">Zoek en download ondertitels van 11 
websites:OpenSubtitles.org, Podnapisi.net, Sublight.si, Bierdopje.com, 
Subscene.com, Undertexter.se, Ondertitel.com, Napiprojekt.pl, Titulky.com, 
Legendas.tv en Titlovi.com.De ondertitel knop in het OSD scherm moet zijn 
geactiveerd met het pad naar XBMC Subtitles via Systeem-> Skin-> Addon 
Scripts.</description>
+    <description lang="en">Search and download subtitles from 12 
websites:OpenSubtitles.org, Podnapisi.net, Sublight.si, Bierdopje.com, 
Subscene.com, Undertexter.se, Ondertitel.com, Napiprojekt.pl, Titulky.com, 
Subdivx.com, Legendas.tv and Titlovi.com.Subtitle button on OSD needs to be 
activated and path set to XBMC Subtitles under System-> Skin-> Addon 
Scripts</description>
+    <description lang="es">Busca y descarga subtítulos de:OpenSubtitles.org, 
Podnapisi.net, Sublight.si, Bierdopje.com, Subscene.com, Undertexter.se, 
Ondertitel.com, Napiprojekt.pl, Titulky.com, Subdivx.com, Legendas.tv y 
Titlovi.com.El botón de subtitulos en el OSD debe ser añadido, y la ruta al 
addon debe ponerse en Sistema-> Skin-> Addons de Scripts</description>
+    <description lang="hu">Film feliratok keresése letöltése 
az:OpenSubtitles.org, Podnapisi.net, Sublight.si, Bierdopje.com, Subscene.com, 
Undertexter.se, Ondertitel.com, Napiprojekt.pl, Titulky.com, Subdivx.com, 
Legendas.tv és Titlovi.com webhelyekról.A dalszöveg OSD gombot aktiválni 
kell az elérési út megadásával a Beállítások -> Skin -> Szkriptek 
alatt.</description>
+    <description lang="sr">Претражи и скини преводе са 
12 веб страница:OpenSubtitles.org, Podnapisi.net, Sublight.si, 
Bierdopje.com, Subscene.com, Undertexter.se, Ondertitel.com, Napiprojekt.pl, 
Titulky.com, Subdivx.com, Legendas.tv и Titlovi.com.Дугме за 
преводе на OSD треба да се активира и изабере 
XBMC Subtitles у Систем-> Маска-> Скрипт 
додаци</description>
+    <description lang="nl">Zoek en download ondertitels van 12 
websites:OpenSubtitles.org, Podnapisi.net, Sublight.si, Bierdopje.com, 
Subscene.com, Undertexter.se, Ondertitel.com, Napiprojekt.pl, Titulky.com, 
Subdivx.com, Legendas.tv en Titlovi.com.De ondertitel knop in het OSD scherm 
moet zijn geactiveerd met het pad naar XBMC Subtitles via Systeem-> Skin-> 
Addon Scripts.</description>
     <platform>all</platform>
   </extension>
 </addon>
diff --git a/script.xbmc.subtitles/changelog.txt 
b/script.xbmc.subtitles/changelog.txt
index abc7db6..6619016 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,8 @@
+2.0.0
+- added: new service Subdivx.com, Spanish subs only. Thanks to Enric Godes.
+- updated: use .getAddonInfo('path') instead of os.getcwd()
+- cosmetics
+
 1.9.9
 - fixed: podnapisi name search string is urllib.quoted. helps with "$#*! My 
Dad Says" and similar
 - fixed: sync icon is made bigger on default skin window
diff --git a/script.xbmc.subtitles/default.py b/script.xbmc.subtitles/default.py
index 3839098..fab09f5 100644
--- a/script.xbmc.subtitles/default.py
+++ b/script.xbmc.subtitles/default.py
@@ -3,22 +3,23 @@ import os
 import xbmc
 import xbmcaddon
 
-BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join( os.getcwd(), 
'resources', 'lib' ) )
-sys.path.append (BASE_RESOURCE_PATH)
-
-__settings__ = xbmcaddon.Addon(id='script.xbmc.subtitles')
-__language__ = __settings__.getLocalizedString
-__version__  = __settings__.getAddonInfo('version')
+__settings__   = xbmcaddon.Addon(id='script.xbmc.subtitles')
+__language__   = __settings__.getLocalizedString
+__version__    = __settings__.getAddonInfo('version')
+__cwd__        = __settings__.getAddonInfo('path')
 __scriptname__ = "XBMC Subtitles"
-__scriptid__ = "script.xbmc.subtitles"
-__author__ = "Amet,mr_blobby"
+__scriptid__   = "script.xbmc.subtitles"
+__author__     = "Amet,mr_blobby"
+
+BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join( __cwd__, 'resources', 
'lib' ) )
+sys.path.append (BASE_RESOURCE_PATH)
 
 xbmc.output("### [%s] - Version: %s" % 
(__scriptname__,__version__,),level=xbmc.LOGDEBUG )
 
 if ( __name__ == "__main__" ):
     if not xbmc.getCondVisibility('Player.Paused') : xbmc.Player().pause() 
#Pause if not paused        
     import gui
-    ui = gui.GUI( "script-XBMC-Subtitles-main.xml" , os.getcwd(), "Default")
+    ui = gui.GUI( "script-XBMC-Subtitles-main.xml" , __cwd__ , "Default")
     ui.doModal()
     if xbmc.getCondVisibility('Player.Paused'): xbmc.Player().pause() # if 
Paused, un-pause
     del ui
diff --git a/script.xbmc.subtitles/resources/lib/gui.py 
b/script.xbmc.subtitles/resources/lib/gui.py
index be2e111..760d7d9 100644
--- a/script.xbmc.subtitles/resources/lib/gui.py
+++ b/script.xbmc.subtitles/resources/lib/gui.py
@@ -12,11 +12,12 @@ import socket
 _ = sys.modules[ "__main__" ].__language__
 __scriptname__ = sys.modules[ "__main__" ].__scriptname__
 __settings__ = sys.modules[ "__main__" ].__settings__
+__cwd__ = sys.modules[ "__main__" ].__cwd__
 
 STATUS_LABEL = 100
 LOADING_IMAGE = 110
 SUBTITLES_LIST = 120
-SERVICE_DIR = os.path.join(os.getcwd(), "resources", "lib", "services")
+SERVICE_DIR = os.path.join(__cwd__, "resources", "lib", "services")
 
 EXIT_SCRIPT = ( 9, 10, 247, 275, 61467, )
 CANCEL_DIALOG = EXIT_SCRIPT + ( 216, 257, 61448, )
@@ -39,7 +40,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
         if (movieFullPath.find("http://";) > -1 ):
             temp = True
 
-        if (movieFullPath.find("rar://") > -1 ) and path:
+        if (movieFullPath.find("rar://") > -1 ):
             rar = True
             
             movieFullPath = sub_folder = movieFullPath.replace("rar://","")
@@ -134,7 +135,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
             self.file_name = "%s (%s)" % (self.title, str(self.year),)    
           
           
-        self.tmp_sub_dir = os.path.join( xbmc.translatePath( 
"special://profile/" ), "addon_data", os.path.basename( os.getcwd() ),"sub_tmp" 
)
+        self.tmp_sub_dir = os.path.join( xbmc.translatePath( 
"special://profile/" ), "addon_data", os.path.basename( __cwd__ ),"sub_tmp" )
         
         
         if not self.tmp_sub_dir.endswith(':') and not 
os.path.exists(self.tmp_sub_dir):
@@ -159,7 +160,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
         def_movie_service = __settings__.getSetting( "defmovieservice")
         def_tv_service = __settings__.getSetting( "deftvservice")
         service_list = []
-        standard_service_list  = ['Titulky','OpenSubtitles', 'Podnapisi', 
'Sublight', 'Bierdopje', 'Subscene', 'Ondertitel', 'Undertexter', 
'Napiprojekt', 'Titlovi', 'LegendasTV']
+        standard_service_list  = ['Titulky','OpenSubtitles', 'Podnapisi', 
'Sublight', 'Bierdopje', 'Subscene', 'Ondertitel', 'Undertexter', 
'Napiprojekt', 'Titlovi', 'LegendasTV', 'Subdivx']
         service = ""
  
         for name in os.listdir(SERVICE_DIR):
@@ -200,6 +201,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
             log( __name__ ,"Default Service : [%s]"      % self.service)
             log( __name__ ,"Services : [%s]"             % self.service_list)
             log( __name__ ,"Temp?: [%s]"                 % self.set_temp)
+            log( __name__ ,"Rar?: [%s]"                  % self.rar)
             log( __name__ ,"File Path: [%s]"             % 
self.file_original_path)
             log( __name__ ,"Year: [%s]"                  % str(self.year))
             log( __name__ ,"Tv Show Title: [%s]"         % self.tvshow)
@@ -504,8 +506,8 @@ class GUI( xbmcgui.WindowXMLDialog ):
 
 ###-------------------------- "Esc" , "Back" button  
-------------################
         
-def onAction( self, action ):
-    if ( action.getButtonCode() in CANCEL_DIALOG):
-        self.exit_script()
+    def onAction( self, action ):
+        if ( action.getId() in CANCEL_DIALOG):
+            self.exit_script()
 
 
diff --git a/script.xbmc.subtitles/resources/settings.xml 
b/script.xbmc.subtitles/resources/settings.xml
old mode 100644
new mode 100755
index 8c68aa1..e73875d
--- a/script.xbmc.subtitles/resources/settings.xml
+++ b/script.xbmc.subtitles/resources/settings.xml
@@ -6,8 +6,8 @@
       <setting id="Lang03" type="enum" label="30111" 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"
 />
     </category>
     <category label="30103">
-      <setting id="defmovieservice" type="labelenum" label="30113" 
default="Sublight" 
values="Sublight|Podnapisi|OpenSubtitles|Subscene|Undertexter|Ondertitel|Bierdopje|Napiprojekt|Titlovi|LegendasTV|Titulky"
 />
-      <setting id="deftvservice" type="labelenum" label="30114" 
default="Sublight" 
values="Sublight|Podnapisi|OpenSubtitles|Subscene|Undertexter|Ondertitel|Bierdopje|Napiprojekt|Titlovi|LegendasTV|Titulky"
 />
+      <setting id="defmovieservice" type="labelenum" label="30113" 
default="Sublight" 
values="Sublight|Podnapisi|OpenSubtitles|Subscene|Undertexter|Ondertitel|Bierdopje|Napiprojekt|Titlovi|LegendasTV|Titulky|Subdivx"
 />
+      <setting id="deftvservice" type="labelenum" label="30114" 
default="Sublight" 
values="Sublight|Podnapisi|OpenSubtitles|Subscene|Undertexter|Ondertitel|Bierdopje|Napiprojekt|Titlovi|LegendasTV|Titulky|Subdivx"
 />
       <setting id="Sublight" type="bool" label="- Sublight.si" default="true"/>
       <setting id="Podnapisi" type="bool" label="- Podnapisi.net" 
default="false"/>
       <setting id="PNuser" type="text"  visible= "eq(-1,true)" 
enable="eq(-1,true)" label="30104" default=""/>
@@ -23,6 +23,7 @@
       <setting id="Napiprojekt" type="bool" label="- Napiprojekt.pl 
(Polish/English subs only)" default="false"/>         
       <setting id="Titlovi" type="bool" label="- Titlovi.com" 
default="false"/> 
       <setting id="Titulky" type="bool" label="- Titulky.com (Czech and Slovak 
subs only)" default="false"/>       
+      <setting id="Subdivx" type="bool" label="- Subdivx.com (Spanish subs 
only)" default="false"/>
     </category>
     <category label="30106">
       <setting id="subfolder" type="bool" label="30107" default="true" />

-----------------------------------------------------------------------

Summary of changes:
 script.xbmc.subtitles/addon.xml                    |   12 +-
 script.xbmc.subtitles/changelog.txt                |    5 +
 script.xbmc.subtitles/default.py                   |   19 ++--
 script.xbmc.subtitles/resources/lib/gui.py         |   16 ++--
 .../resources/lib/services/Subdivx}/__init__.py    |    0
 .../resources/lib/services/Subdivx/logo.png        |  Bin 0 -> 17817 bytes
 .../services/{Undertexter => Subdivx}/service.py   |  111 +++++++++-----------
 script.xbmc.subtitles/resources/settings.xml       |    5 +-
 8 files changed, 82 insertions(+), 86 deletions(-)
 copy {script.lrclyrics/resources/lib/scrapers => 
script.xbmc.subtitles/resources/lib/services/Subdivx}/__init__.py (100%)
 mode change 100644 => 100755
 create mode 100755 
script.xbmc.subtitles/resources/lib/services/Subdivx/logo.png
 copy script.xbmc.subtitles/resources/lib/services/{Undertexter => 
Subdivx}/service.py (51%)
 mode change 100644 => 100755 script.xbmc.subtitles/resources/settings.xml


hooks/post-receive
-- 
Scripts


------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to