The branch, frodo has been updated
via 462911eb04607ea3edce964dbdccb08430b385d9 (commit)
from 7f6e041e23028ca7d7f8ee04b93b60624722ded1 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=462911eb04607ea3edce964dbdccb08430b385d9
commit 462911eb04607ea3edce964dbdccb08430b385d9
Author: beenje <[email protected]>
Date: Fri Mar 15 22:42:29 2013 +0100
[plugin.video.thegeekgroup] updated to version 1.1.0
diff --git a/plugin.video.thegeekgroup/README.md
b/plugin.video.thegeekgroup/README.md
index fbc229a..d6aadae 100644
--- a/plugin.video.thegeekgroup/README.md
+++ b/plugin.video.thegeekgroup/README.md
@@ -4,7 +4,7 @@ Watch shows from the [The Geek
Group](http://www.Thegeekgroup.org) network in [X
Shows
-----
-* [Live Show](http://www.thegeekgroup.org)
+* [Live Show](http://www.thegeekgroup.org/live)
Instructions
@@ -14,5 +14,7 @@ Instructions
About
-----
-* Author: [MadManMarkAu] () [KB3NZQ]
+* Author: [MadManMarkAu](https://bitbucket.org/MadManMarkAu)
+* Author: [KB3NZQ](https://bitbucket.org/kb3nzq)
* Source: [GitHub](https://github.com/KB3NZQ/XBMC-TheGeekGroup)
+* Source: [BitBucket](https://bitbucket.org/kb3nzq/xbmc-thegeekgroup)
diff --git a/plugin.video.thegeekgroup/addon.xml
b/plugin.video.thegeekgroup/addon.xml
index da3d6c5..dbe79da 100644
--- a/plugin.video.thegeekgroup/addon.xml
+++ b/plugin.video.thegeekgroup/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.thegeekgroup"
name="The Geek Group"
- version="1.0.0"
+ version="1.1.0"
provider-name="MadManMarkAu,KB3NZQ">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
@@ -16,6 +16,5 @@
<description>The Geek Group live stream.</description>
<platform>all</platform>
<language>en</language>
- <broken>The Geek Group switched stream providers working on recoding to
bring the plugin back if you wish to help contact KB3NZQ at gmail </broken>
</extension>
</addon>
diff --git a/plugin.video.thegeekgroup/changelog.txt
b/plugin.video.thegeekgroup/changelog.txt
index 9d71194..4e17a33 100644
--- a/plugin.video.thegeekgroup/changelog.txt
+++ b/plugin.video.thegeekgroup/changelog.txt
@@ -1,3 +1,8 @@
Changelog
-Ver0.01 2-8-2013
+
+1.1.0 3-15-2013
+rewrote the plugin to play from justin.tv/thegeekgroup code snippets from
twit.tv xbmc plugin
+
+
+Ver1.0.0 2-8-2013
inital commit
\ No newline at end of file
diff --git a/plugin.video.thegeekgroup/default.py
b/plugin.video.thegeekgroup/default.py
index 2b68c28..a9d94ab 100644
--- a/plugin.video.thegeekgroup/default.py
+++ b/plugin.video.thegeekgroup/default.py
@@ -1,10 +1,42 @@
import urllib, urllib2, re, xbmcplugin, xbmcgui, xbmcaddon, os
from time import strftime
from BeautifulSoup import BeautifulSoup, BeautifulStoneSoup
+import StorageServer
+from datetime import datetime
+try:
+ import json
+except:
+ import simplejson as json
__settings__ = xbmcaddon.Addon(id='plugin.video.thegeekgroup')
__language__ = __settings__.getLocalizedString
+def make_request(url):
+ try:
+ headers = {'User-agent' : 'Mozilla/5.0 (Windows NT 6.1; WOW64;
rv:6.0) Gecko/20100101 Firefox/6.0',
+ 'Referer' : 'http://thegeekgroup.org'}
+ req = urllib2.Request(url,None,headers)
+ response = urllib2.urlopen(req)
+ data = response.read()
+ response.close()
+ return data
+ except urllib2.URLError, e:
+ addon_log( 'We failed to open "%s".' % url)
+ if hasattr(e, 'reason'):
+ addon_log('We failed to reach a server.')
+ addon_log('Reason: ', e.reason)
+ if hasattr(e, 'code'):
+ addon_log('We failed with error code - %s.' % e.code)
+
+def get_jtv():
+ soup =
BeautifulSoup(make_request('http://usher.justin.tv/find/thegeekgroup.xml?type=live'))
+ token = ' jtv='+soup.token.string.replace('\\','\\5c').replace('
','\\20').replace('"','\\22')
+ rtmp = soup.connect.string+'/'+soup.play.string
+ Pageurl = ' Pageurl=http://www.justin.tv/thegeekgroup'
+ swf = '
swfUrl=http://www.justin.tv/widgets/live_embed_player.swf?channel=thegeekgroup
live=true'
+ url = rtmp+token+swf+Pageurl
+ return url
+
def CATEGORIES():
# List all the shows.
shows = {}
@@ -12,7 +44,7 @@ def CATEGORIES():
# TGG live stream
addLink(
name = __language__(30000),
- url =
'rtsp://thegeekgroup.videocdn.scaleengine.net/thegeekgroup-live/play/thegeekgroup.stream',
+ url = get_jtv(),
date = '',
iconimage = os.path.join(__settings__.getAddonInfo('path'),
'resources', 'media', 'tgg.png'),
info = {
@@ -34,4 +66,3 @@ def addLink(name, url, date, iconimage, info):
CATEGORIES()
xbmcplugin.endOfDirectory(int(sys.argv[1]))
-
diff --git a/plugin.video.thegeekgroup/resources/language/English/strings.xml
b/plugin.video.thegeekgroup/resources/language/English/strings.xml
index 2367f3b..a02240f 100644
--- a/plugin.video.thegeekgroup/resources/language/English/strings.xml
+++ b/plugin.video.thegeekgroup/resources/language/English/strings.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- Shows -->
- <string id="30000">The Geek Group</string>
+ <string id="30000">The Geek Group Live</string>
<string id="30200">The Geek Group's live stream.</string>
-
+ <string id="30300">The Geek Group on YouTube.</string>
+
</strings>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.thegeekgroup/DEVS READ This first.txt | 4 --
plugin.video.thegeekgroup/README.md | 6 ++-
plugin.video.thegeekgroup/addon.xml | 3 +-
plugin.video.thegeekgroup/changelog.txt | 7 +++-
plugin.video.thegeekgroup/default.py | 35 ++++++++++++++++++-
.../resources/language/English/strings.xml | 5 ++-
6 files changed, 47 insertions(+), 13 deletions(-)
delete mode 100644 plugin.video.thegeekgroup/DEVS READ This first.txt
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
