[Xbmc-addons] Scripts branch, frodo, updated. f2fe753b1c639e3ab75ceea64d951399b5a0c753

Tue, 10 Dec 2013 07:49:13 -0800 

The branch, frodo has been updated
       via  f2fe753b1c639e3ab75ceea64d951399b5a0c753 (commit)
       via  ccc02be188397e44de3af301866d2116637f4711 (commit)
      from  0fa7a322e307ed77070bd38b87142ca88f34308c (commit)

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

commit f2fe753b1c639e3ab75ceea64d951399b5a0c753
Author: amet <[email protected]>
Date:   Tue Dec 10 19:47:11 2013 +0400

    [script.xbmc.subtitles] -v3.9.17
    
    3.9.17
    - Remove Bierdopje.com as a service

diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 266f033..ddb862d 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="3.9.16"
+       version="3.9.17"
        provider-name="amet, mr_blobby">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
@@ -77,7 +77,7 @@
     <description lang="ko">다양한 사이트에서 자막을 찾고 
다운로드합니다. OSD에서 자막 버튼을 사용하려면 '시스템 
&gt; 스킨 &gt; 자막 추가기능' 에서 'XBMC Subtitles'를 선택하여 
활성화하여야 합니다.</description>
     <description lang="lt">Ieškoti ir atsisiųsti subtitrus iš Multipe 
teikėjų. Paantraštės mygtukas OSD turi būti aktyvuotas. Nustatytas kelias 
iki XBMC Subtitrai -&gt; Sistema -&gt; Teminė išvaizda/Tema -&gt; Addon 
Skriptai</description>
     <description lang="mk">Барај и превземи преводи од 
повеќе добавувачи. Копчето за преводи на OSD 
треба да е активирано и патеката да биде 
подесена на XBMC Преводи при Систем-&gt; 
Маска-&gt; Скрипти на додаток</description>
-    <description lang="nl">Zoek en download ondertitels van 19 
websites:Bierdopje.com, Italiansubs.net, Legendas.tv, Napiprojekt.pl, 
OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, theSubDB.com, 
Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, Subscenter.org, Titlovi.com, 
Titulky.com en Undertexter.se.De ondertitel knop in het OSD scherm moet zijn 
geactiveerd met het pad naar XBMC Subtitles via Systeem-&gt; Skin-&gt; Addon 
Scripts.</description>
+    <description lang="nl">Zoek en download ondertitels van meerdere 
aanbieders. De ondertitel knop in het OSD scherm moet zijn geactiveerd met het 
pad naar XBMC Subtitles via Systeem-&gt; Skin-&gt; Addon Scripts.</description>
     <description lang="pl">Wyszukaj i pobierz napisy równoczesnie z wielu 
źródeł. Przycisk napisów w Menu Ekranowym powinien zostać aktywowany w 
opcjach XBMC. Ścieżka: System-&gt; Skóra-&gt; Skrypty Addon-&gt; XBMC 
Subtitles</description>
     <description lang="pt">Procure e transfira legendas de vários 
fornecedores. O botão das legendas deve ser adicionado no visor e a 
localização definida em Sistema-&gt; Tema-&gt; Addons</description>
     <description lang="pt_BR">Procure e efetue download de legendas de 
múltiplos provedores. Botão de Legendas na tela OSD precisa ser ativado 
manualmente e o caminho deve estar definido para o XBMC Legendas em 
Sistema-&gt; Skin-&gt; Scripts de Addons. </description>
diff --git a/script.xbmc.subtitles/changelog.txt 
b/script.xbmc.subtitles/changelog.txt
index 96904a9..67b9eb8 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,6 @@
+3.9.17
+- Remove Bierdopje.com as a service
+
 3.9.16
 - Fix Torec support, thx barbedino
 - Fixed broken support for Ondertitel subtitle provider, Robby Holsteyns
diff --git a/script.xbmc.subtitles/resources/settings.xml 
b/script.xbmc.subtitles/resources/settings.xml
index b24ff6b..167b9bf 100644
--- a/script.xbmc.subtitles/resources/settings.xml
+++ b/script.xbmc.subtitles/resources/settings.xml
@@ -10,7 +10,6 @@
       <setting id="AsiaTeam" type="bool" label="Asia-Team.net" 
default="false"/>
 
       <setting id="BetaSeries" type="bool" label="betaseries.com" 
default="false"/>
-      <setting id="Bierdopje" type="bool" label="Bierdopje.com (TV Shows and 
Dutch/English subs only)" default="false"/>
 
       <setting id="Divxplanet" type="bool" label="Divxplanet.com (English and 
Turkish subs only)" default="false"/>
 

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

commit ccc02be188397e44de3af301866d2116637f4711
Author: amet <[email protected]>
Date:   Tue Dec 10 19:46:32 2013 +0400

    [weather.worldweatheronline] -v1.0.10
    
    1.0.10
    - add weather provider logo

diff --git a/weather.worldweatheronline/addon.xml 
b/weather.worldweatheronline/addon.xml
index f25356f..d1691ea 100644
--- a/weather.worldweatheronline/addon.xml
+++ b/weather.worldweatheronline/addon.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="weather.worldweatheronline"
        name="World Weather Online"
-       version="1.0.8"
+       version="1.0.10"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.python" version="2.0"/>
diff --git a/weather.worldweatheronline/changelog.txt 
b/weather.worldweatheronline/changelog.txt
index fde0b35..4d2e33a 100644
--- a/weather.worldweatheronline/changelog.txt
+++ b/weather.worldweatheronline/changelog.txt
@@ -1,3 +1,9 @@
+1.0.10
+- add weather provider logo
+
+1.0.9
+- new key
+
 1.0.8
 - fix: decode utf-8 paths to internal encoding otherwise the addon fails to 
load on windows with non-ascii profile paths like G:\XBMC\íö. thx chadoe for 
this
 
diff --git a/weather.worldweatheronline/default.py 
b/weather.worldweatheronline/default.py
index 95111f5..68aa84e 100644
--- a/weather.worldweatheronline/default.py
+++ b/weather.worldweatheronline/default.py
@@ -17,6 +17,7 @@
 
 import os, sys
 import urllib
+import base64
 from xml.dom import minidom
 import xbmcgui, xbmcaddon
 from time import strftime, strptime
@@ -36,10 +37,10 @@ sys.path.append (__resource__)
 
 from utilities import *
 
-DEVELOPER_KEY  = "75b745967f114856110511"
+DEVELOPER_KEY  = "Njh2dGpwYWJ1OXg5YW1yY21rbnZiaHBq"
 NUMBER_OF_DAYS = 4
-SEARCH_URL     = 
"http://free.worldweatheronline.com/feed/search.ashx?key=%s&query=%s&format=xml";
-LOCATION_URL   = 
"http://free.worldweatheronline.com/feed/weather.ashx?q=%s&format=xml&num_of_days=%i&key=%s";
+SEARCH_URL     = 
"http://api.worldweatheronline.com/free/v1/search.ashx?key=%s&query=%s&format=xml";
+LOCATION_URL   = 
"http://api.worldweatheronline.com/free/v1/weather.ashx?q=%s&format=xml&num_of_days=%i&key=%s";
 
 WEATHER_WINDOW = xbmcgui.Window( 12600 )
 
@@ -106,18 +107,19 @@ def get_elements(xml, tag):
 def location(string):
   log("search for '%s'" % (string,))
   loc = []
-  query   = fetch( SEARCH_URL % (DEVELOPER_KEY, string))
+  query   = fetch( SEARCH_URL % (base64.b64decode(DEVELOPER_KEY)[::-1], 
string))
   locations = query.getElementsByTagName("result")
   for location in locations:
-    try:
-      loc.append("%s,%s,%s" % (get_elements(location, "areaName"), 
get_elements(location, "region"), get_elements(location, "country")))
-    except:
-      loc.append("%s,%s" % (get_elements(location, "areaName"), 
get_elements(location, "country")))
+    loc.append("%s,%s" % (get_elements(location, "areaName"), 
get_elements(location, "country")))
+#    try:
+#      loc.append("%s,%s,%s" % (get_elements(location, "areaName"), 
get_elements(location, "region"), get_elements(location, "country")))
+#    except:
+#      loc.append("%s,%s" % (get_elements(location, "areaName"), 
get_elements(location, "country")))
   return loc
 
 def forecast(city):
   log("get forecast for '%s'" % (city,))
-  query    = fetch( LOCATION_URL % (city, NUMBER_OF_DAYS, DEVELOPER_KEY))
+  query    = fetch( LOCATION_URL % (city, NUMBER_OF_DAYS, 
base64.b64decode(DEVELOPER_KEY)[::-1]))
   current  = query.getElementsByTagName("current_condition")[0]
   celsius  = get_elements(current,"temp_C")
   humidity = get_elements(current,"humidity")
@@ -177,6 +179,7 @@ elif sys.argv[1] == "1" or sys.argv[1] == "2" or 
sys.argv[1] == "3":
 
 refresh_locations()
 set_property("WeatherProvider", "WorldWeatherOnline.com")                      
    # set name of the provider, this will be visible in the Weather page
+set_property('WeatherProviderLogo', xbmc.translatePath(os.path.join(__cwd__, 
'resources', 'logo.png')).decode("utf-8"))   # set logo of the provider, this 
will be visible in the Weather page
 
 
 

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

Summary of changes:
 script.xbmc.subtitles/addon.xml                    |    4 +-
 script.xbmc.subtitles/changelog.txt                |    3 +
 .../resources/lib/services/Bierdopje/__init__.py   |    1 -
 .../resources/lib/services/Bierdopje/logo.png      |  Bin 19175 -> 0 bytes
 .../resources/lib/services/Bierdopje/service.py    |  249 --------------------
 script.xbmc.subtitles/resources/settings.xml       |    1 -
 weather.worldweatheronline/addon.xml               |    4 +-
 weather.worldweatheronline/changelog.txt           |    6 +
 weather.worldweatheronline/default.py              |   21 +-
 weather.worldweatheronline/resources/logo.png      |  Bin 0 -> 12966 bytes
 10 files changed, 25 insertions(+), 264 deletions(-)
 delete mode 100644 
script.xbmc.subtitles/resources/lib/services/Bierdopje/__init__.py
 delete mode 100644 
script.xbmc.subtitles/resources/lib/services/Bierdopje/logo.png
 delete mode 100644 
script.xbmc.subtitles/resources/lib/services/Bierdopje/service.py
 create mode 100644 weather.worldweatheronline/resources/logo.png


hooks/post-receive
-- 
Scripts


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to