[Xbmc-addons] Plugins branch, frodo, updated. 8ccae43e0f74dffe9bc4fbc0da168e7662ed82c6

Tristan Fischer Mon, 21 Apr 2014 00:39:07 -0700

The branch, frodo has been updated
       via  8ccae43e0f74dffe9bc4fbc0da168e7662ed82c6 (commit)
      from  0f5fc8367473bd48a286ee41b5ca8e3bff1dd972 (commit)


- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=8ccae43e0f74dffe9bc4fbc0da168e7662ed82c6

commit 8ccae43e0f74dffe9bc4fbc0da168e7662ed82c6
Author: sphere <[email protected]>
Date:   Mon Apr 21 09:36:12 2014 +0200

    [plugin.video.disclose_tv] updated to version 0.0.4

diff --git a/plugin.video.disclose_tv/addon.xml 
b/plugin.video.disclose_tv/addon.xml
index ed1c2a0..a422998 100644
--- a/plugin.video.disclose_tv/addon.xml
+++ b/plugin.video.disclose_tv/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.disclose_tv" name="Disclose.tv" version="0.0.3" 
provider-name="Tristan Fischer ([email protected])">
+<addon id="plugin.video.disclose_tv" name="Disclose.tv" version="0.0.4" 
provider-name="Tristan Fischer ([email protected])">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.xbmcswift2" version="1.3.0"/>
@@ -24,6 +24,7 @@
     <summary lang="de">TRUTH REVEALED</summary>
     <summary lang="el">ÎÎ ÎÎÎÎÎ¥Î¨Î Î¤ÎÎ£ ÎÎÎÎÎÎÎÎ£</summary>
     <summary lang="en">TRUTH REVEALED</summary>
+    <summary lang="en_NZ">TRUTH REVEALED</summary>
     <summary lang="es">LA VERDAD REVELADA</summary>
     <summary lang="es_AR">REVELACION</summary>
     <summary lang="fa_IR">ØÙÛÙØª ÙØ´Ø§Ù Ø¯Ø§Ø¯Ù</summary>
@@ -50,6 +51,7 @@
     <description lang="de">GrÃ¶Ãte Internet-Nachrichtenseite Ã¼ber UFO 
Videos, VerschwÃ¶rungstheorien, Top Secrets, N.W.O. und mehr!</description>
     <description lang="el">Î Î¼ÎµÎ³Î±Î»ÏÏÎµÏÎ· ÏÎ·Î³Î® 
ÎµÎ½Î±Î»Î»Î±ÎºÏÎ¹ÎºÏÎ½ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¹ÏÎ½ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ 
Î²Î¯Î½ÏÎµÎ¿ ÎÎ¤ÎÎ (UFO), ÎÏÏÎ±Î¯Î± ÎÏÏÏÎ®ÏÎ¹Î±, ÎÎµÏÏÎ¯ÎµÏ Î£Ï
Î½ÏÎ¼Î¿ÏÎ¯Î±Ï, ÎÏÏÏÏÎ·ÏÎ± ÎÏÏÏÎ¹ÎºÎ¬, ÎÎÎ± Î¤Î¬Î¾Î· Î 
ÏÎ±Î³Î¼Î¬ÏÏÎ½ + ÏÎ¿Î»Î»Î¬ Î¬Î»Î»Î±!</description>
     <description lang="en">Largest multimedia hub and alternative news website 
about UFO Videos, Ancient Mysteries, Conspiracy Theories, Top Secrets, N.W.O. + 
more!</description>
+    <description lang="en_NZ">Largest multimedia hub and alternative news 
website about UFO Videos, Ancient Mysteries, Conspiracy Theories, Top Secrets, 
N.W.O. + more!</description>
     <description lang="es">El mayor centro multimedia y sitio web de noticias 
alternativas sobre Videos de OVNIs, Misterios Antiguos, TeorÃas de la 
ConspiraciÃ³n, Altos Secretos, N.O.M. y mÃ¡s!</description>
     <description lang="es_AR">El mayor centro multimedia y de noticias 
alternativas con de videos de OVNIS, misterios antiguos, teorias conspirativas, 
secretos absolutos, Nuevo Orden Mundial y mas! </description>
     <description lang="fa_IR">Ø¨Ø²Ø±Ú¯ØªØ±ÛÙ ÙØ±Ú©Ø² ÚÙØ¯ Ø±Ø³Ø§ÙÙ Ø§Û 
Ù ÙØ¨ Ø³Ø§ÛØª Ø®Ø¨Ø±Û Ø¯Ø± ÙÙØ±Ø¯ Ø¬Ø§ÛÚ¯Ø²ÛÙ UFO ÙÛØ¯Ø¦Ù ÙØ§Ø 
Ø§Ø³Ø±Ø§Ø± Ø¨Ø§Ø³ØªØ§ÙÛØ ØªØ¦ÙØ±Û ÙØ§Û ØªÙØ·Ø¦ÙØ Ø§Ø³Ø±Ø§Ø± 
Ø¨Ø§ÙØ§Ø NWO + Ø¨ÛØ´ØªØ±!</description>
diff --git a/plugin.video.disclose_tv/changelog.txt 
b/plugin.video.disclose_tv/changelog.txt
index 22b1b3a..ef1c0e8 100644
--- a/plugin.video.disclose_tv/changelog.txt
+++ b/plugin.video.disclose_tv/changelog.txt
@@ -1,3 +1,8 @@
+0.0.4 (21.04.2014)
+ - fixed playback
+ - updated translations
+ - small fixes
+
 0.0.3 (16.03.2014)
  - updated translations
 
diff --git a/plugin.video.disclose_tv/resources/language/English (New 
Zealand)/strings.xml b/plugin.video.disclose_tv/resources/language/English (New 
Zealand)/strings.xml
index c9ffbff..b6a60cf 100644
--- a/plugin.video.disclose_tv/resources/language/English (New 
Zealand)/strings.xml     
+++ b/plugin.video.disclose_tv/resources/language/English (New 
Zealand)/strings.xml     
@@ -6,4 +6,7 @@
 <strings>
     <!-- Default strings -->
     <string id="30001">Page</string>
+
+    <!-- Settings -->
+    <string id="30100">Force ViewMode "Thumbnail"</string>
 </strings>
diff --git a/plugin.video.disclose_tv/resources/lib/scraper.py 
b/plugin.video.disclose_tv/resources/lib/scraper.py
index dcc1702..af79bfa 100644
--- a/plugin.video.disclose_tv/resources/lib/scraper.py
+++ b/plugin.video.disclose_tv/resources/lib/scraper.py
@@ -16,8 +16,13 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
+import sys
+
+if sys.version_info >= (2, 7):
+    import json
+else:
+    import simplejson as json
 
-import simplejson
 from BeautifulSoup import BeautifulSoup
 from urllib2 import urlopen
 
@@ -69,9 +74,9 @@ class Scraper:
         return videos
 
     def get_video_url(self, video_id):
-        url = MAIN_URL + '/videos/config/video/%s.js' % video_id
-        json = self.__get_json(url)
-        return json['clip']['url']
+        url = MAIN_URL + 'videos/config/xxx/%s.js' % video_id
+        data = self.__get_json(url)
+        return data['playlist'][1]['url']
 
     @staticmethod
     def __secs_from_duration(d):
@@ -85,8 +90,10 @@ class Scraper:
         return url.replace('135x76', '').split('?')[0]
 
     def __get_json(self, url):
-        html = self.__get_url(url)
-        return simplejson.loads(html)
+        response = self.__get_url(url)
+        if not '"' in response:
+            response = response.replace('\'', '"')
+        return json.loads(response)
 
     def __get_tree(self, url):
         html = self.__get_url(url)
@@ -94,13 +101,9 @@ class Scraper:
 
     def __get_url(self, url):
         log('__get_url opening url: %s' % url)
-        try:
-            html = urlopen(url).read()
-        except HTTPError, error:
-            log('__urlopen HTTPError: %s' % error)
-            raise NetworkError('HTTPError: %s' % error)
-        log('__get_url got %d bytes' % len(html))
-        return html
+        response = urlopen(url).read()
+        log('__get_url got %d bytes' % len(response))
+        return response
 
 
 def log(text):

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

Summary of changes:
 plugin.video.disclose_tv/addon.xml                 |    4 ++-
 plugin.video.disclose_tv/changelog.txt             |    5 +++
 .../language/English (New Zealand)/strings.xml     |    3 ++
 plugin.video.disclose_tv/resources/lib/scraper.py  |   29 +++++++++++---------
 4 files changed, 27 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Plugins

------------------------------------------------------------------------------
Start Your Social Network Today - Download eXo Platform
Build your Enterprise Intranet with eXo Platform Software
Java Based Open Source Intranet - Social, Extensible, Cloud Ready
Get Started Now And Turn Your Intranet Into A Collaboration Platform
http://p.sf.net/sfu/ExoPlatform

_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

[Xbmc-addons] Plugins branch, frodo, updated. 8ccae43e0f74dffe9bc4fbc0da168e7662ed82c6

Reply via email to