[Xbmc-addons] Scripts branch, dharma, updated. da7457f79aab29d8d2bef7d3780c5e68bcaeba59

Mon, 20 Dec 2010 12:36:55 -0800 

The branch, dharma has been updated
       via  da7457f79aab29d8d2bef7d3780c5e68bcaeba59 (commit)
      from  00588bc8ddad38cc6a5ac29b9de37dd3a74f1077 (commit)

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

commit da7457f79aab29d8d2bef7d3780c5e68bcaeba59
Author: amet <a...@nospam>
Date:   Tue Dec 21 00:36:10 2010 +0400

    [script.xbmc.subtitles]  -v 2.2.1
    
    -added Swesub.nu, thx mr_blobby
    
    2.2.0
    - simplify services code
    - automatically retrieve list of available services

diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index a004328..d4870d2 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="2.1.9"
+       version="2.2.1"
        provider-name="Amet">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
@@ -16,12 +16,12 @@
     <summary lang="sr">XBMC Преводи</summary>
     <summary lang="nl">XBMC Ondertitels</summary>
     <summary lang="bg">XBMC Субтитри</summary>    
-    <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>
-    <description lang="bg"> Търси и сваляй субтитри от 
12 уебсайта: 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. Бутонът за субтитри в OSD менюто над 
филма трябва да бъде активиран и пътя към 
приложението трябва да бъде указан, като и 
за двете отивате в менюто на Система(System)-> 
Кожа(Skin)-> Добавка(Addon Scripts)</description>     
<platform>all</platform>
+    <description lang="en">Search and download subtitles from 13 
websites:OpenSubtitles.org, Podnapisi.net, Sublight.si, Bierdopje.com, 
Subscene.com, Undertexter.se, Ondertitel.com, Napiprojekt.pl, Titulky.com, 
Subdivx.com, Legendas.tv, Swesub.nu 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, 
Swesub.nu 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, Swesub.nu é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">Претражи и скини преводе са 
13 веб страница:OpenSubtitles.org, Podnapisi.net, Sublight.si, 
Bierdopje.com, Subscene.com, Undertexter.se, Ondertitel.com, Napiprojekt.pl, 
Titulky.com, Subdivx.com, Legendas.tv, Swesub.nu и Titlovi.com.Дугме за 
преводе на OSD треба да се активира и изабере 
XBMC Subtitles у Систем-> Маска-> Скрипт 
додаци</description>
+    <description lang="nl">Zoek en download ondertitels van 13 
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>
+    <description lang="bg"> Търси и сваляй субтитри от 
13 уебсайта: OpenSubtitles.org (Препоръчвам за филми, 
също за сериали), Podnapisi.net (Препоръчвам за 
сериали), Sublight.si, Bierdopje.com, Subscene.com, Undertexter.se, 
Ondertitel.com, Napiprojekt.pl, Titulky.com, Subdivx.com, Legendas.tv, 
Swesub.nu and Titlovi.com. Бутонът за субтитри в OSD 
менюто над филма трябва да бъде активиран и 
пътя към приложението трябва да бъде 
указан, като и за двете отивате в менюто на 
Система(System)-> Кожа(Skin)-> Добавка(Addon 
Scripts)</description>     <platform>all</platform>
     <platform>all</platform>
   </extension>
 </addon>
diff --git a/script.xbmc.subtitles/changelog.txt 
b/script.xbmc.subtitles/changelog.txt
index 97fc220..ee7612c 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,10 @@
+2.2.1
+-added Swesub.nu, thx mr_blobby
+
+2.2.0
+- simplify services code
+- automatically retrieve list of available services
+
 2.1.9
 - fixed: addic7ed service changes due to the changed website layout
 
diff --git a/script.xbmc.subtitles/resources/lib/gui.py 
b/script.xbmc.subtitles/resources/lib/gui.py
index f26b55b..bd25e8f 100644
--- a/script.xbmc.subtitles/resources/lib/gui.py
+++ b/script.xbmc.subtitles/resources/lib/gui.py
@@ -135,35 +135,22 @@ class GUI( xbmcgui.WindowXMLDialog ):
             break
 #### ---------------------------- Set Service ----------------------------###  
   
 
-    def_service = __settings__.getSetting( "defservice")
     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', 'Subdivx', 'Addic7ed']
     service = ""
 
     for name in os.listdir(SERVICE_DIR):
-      if not (name.startswith('.')) and not (name.startswith('_')):
-        service_list.append(name)
-
-    for serv in standard_service_list:
-      if not __settings__.getSetting( serv ) == "true" :
-        service_list.remove( serv )
-      else:
-        service = serv
+      if os.path.isdir(os.path.join(SERVICE_DIR,name)) and 
__settings__.getSetting( name ) == "true":
+        service_list.append( name )
+        service = name
 
     if len(self.tvshow) > 0:
       if service_list.count(def_tv_service) > 0:
         service = def_tv_service
-      else:
-        if service_list.count(def_service) > 0:
-          service = def_service
     else:
       if service_list.count(def_movie_service) > 0:
         service = def_movie_service
-      else:
-        if service_list.count(def_service) > 0:
-          service = def_service
 
     if len(service_list) > 0:  
       if len(service) < 1:
@@ -173,7 +160,6 @@ class GUI( xbmcgui.WindowXMLDialog ):
 
       self.service_list = service_list
       self.controlId = -1
-      self.shufle = 0
       self.subtitles_list = []
 
       log( __name__ ,"Manual Search : [%s]"        % self.mansearch)
diff --git a/script.xbmc.subtitles/resources/settings.xml 
b/script.xbmc.subtitles/resources/settings.xml
index cbd150c..2b373ab 100755
--- a/script.xbmc.subtitles/resources/settings.xml
+++ b/script.xbmc.subtitles/resources/settings.xml
@@ -23,10 +23,11 @@
       <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"/>
       <setting id="Addic7ed" type="bool" label="Addic7ed.com" default="false"/>
+      <setting id="Swesub" type="bool" label="Swesub.nu" default="false"/>
     </category>
     <category label="30106">
-      <setting id="defmovieservice" type="labelenum" label="30113" 
default="Sublight" 
values="Sublight|Podnapisi|OpenSubtitles|Subscene|Undertexter|Ondertitel|Bierdopje|Napiprojekt|Titlovi|LegendasTV|Titulky|Subdivx|Addic7ed"
 />
-      <setting id="deftvservice" type="labelenum" label="30114" 
default="Sublight" 
values="Sublight|Podnapisi|OpenSubtitles|Subscene|Undertexter|Ondertitel|Bierdopje|Napiprojekt|Titlovi|LegendasTV|Titulky|Subdivx|Addic7ed"
 />    
+      <setting id="defmovieservice" type="fileenum" mask="/" label="30113" 
default="OpenSubtitles" values="/resources/lib/services" />
+      <setting id="deftvservice" type="fileenum" mask="/" label="30114" 
default="OpenSubtitles" values="/resources/lib/services" />    
       <setting id="subfolder" type="bool" label="30107" default="true" />
       <setting id="subfolderpath" type="folder" visible= "eq(-1,false)" 
source="files" label="30108" default="" />
       <setting id="searchstr" type="bool" label="30110" default="false"/>

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

Summary of changes:
 script.xbmc.subtitles/addon.xml                    |   14 +-
 script.xbmc.subtitles/changelog.txt                |    7 +
 script.xbmc.subtitles/resources/lib/gui.py         |   20 +---
 .../resources/lib/services/Swesub}/__init__.py     |    0
 .../resources/lib/services/Swesub/logo.png         |  Bin 0 -> 5635 bytes
 .../resources/lib/services/Swesub/service.py       |  117 ++++++++++++++++++++
 script.xbmc.subtitles/resources/settings.xml       |    5 +-
 7 files changed, 137 insertions(+), 26 deletions(-)
 copy {script.lrclyrics/resources/lib/scrapers => 
script.xbmc.subtitles/resources/lib/services/Swesub}/__init__.py (100%)
 create mode 100644 script.xbmc.subtitles/resources/lib/services/Swesub/logo.png
 create mode 100644 
script.xbmc.subtitles/resources/lib/services/Swesub/service.py


hooks/post-receive
-- 
Scripts


------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to