The branch, eden has been updated
via 35ff1834f0cbf1334fac8b954bf529d9414c8d3e (commit)
from 07c2082001752f15cec4187b633ccd5d4b334035 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=35ff1834f0cbf1334fac8b954bf529d9414c8d3e
commit 35ff1834f0cbf1334fac8b954bf529d9414c8d3e
Author: spiff <[email protected]>
Date: Mon Aug 27 16:23:26 2012 +0200
[plugin.video.thatguywiththeglasses_com] updated to version 1.0.2
diff --git a/plugin.video.thatguywiththeglasses_com/addon.xml
b/plugin.video.thatguywiththeglasses_com/addon.xml
index 1c93f01..8877750 100644
--- a/plugin.video.thatguywiththeglasses_com/addon.xml
+++ b/plugin.video.thatguywiththeglasses_com/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.thatguywiththeglasses_com"
name="ThatGuyWithTheGlasses.com" version="1.0.1"
provider-name="AddonScriptorDE">
+<addon id="plugin.video.thatguywiththeglasses_com"
name="ThatGuyWithTheGlasses.com" version="1.0.2"
provider-name="AddonScriptorDE">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="plugin.video.bliptv" version="0.5.0"/>
@@ -10,9 +10,9 @@
</extension>
<extension point="xbmc.addon.metadata">
<platform>all</platform>
- <summary lang="en">ThatGuyWithTheGlasses and much more...</summary>
+ <summary lang="en">ThatGuyWithTheGlasses and many more...</summary>
<language>en</language>
- <description lang="en">ThatGuyWithTheGlasses and much
more...</description>
+ <description lang="en">ThatGuyWithTheGlasses and many
more...</description>
<platform>all</platform>
</extension>
</addon>
diff --git a/plugin.video.thatguywiththeglasses_com/changelog.txt
b/plugin.video.thatguywiththeglasses_com/changelog.txt
index 5809ac5..2eabb61 100644
--- a/plugin.video.thatguywiththeglasses_com/changelog.txt
+++ b/plugin.video.thatguywiththeglasses_com/changelog.txt
@@ -4,4 +4,6 @@
- Added BlisteredThumbs stuff
- Added support for more videotypes
- Fixed multi part handling
-- Changed icon
\ No newline at end of file
+- Changed icon
+1.0.2
+- Fixed site changes for newest vids
\ No newline at end of file
diff --git a/plugin.video.thatguywiththeglasses_com/default.py
b/plugin.video.thatguywiththeglasses_com/default.py
index 67d3a26..b81e616 100644
--- a/plugin.video.thatguywiththeglasses_com/default.py
+++ b/plugin.video.thatguywiththeglasses_com/default.py
@@ -2,17 +2,18 @@
# -*- coding: utf-8 -*-
import urllib,urllib2,re,xbmcplugin,xbmcgui,sys,xbmcaddon,base64,socket
+socket.setdefaulttimeout(30)
pluginhandle = int(sys.argv[1])
xbox = xbmc.getCondVisibility("System.Platform.xbox")
-settings = xbmcaddon.Addon(id='plugin.video.thatguywiththeglasses_com')
-translation = settings.getLocalizedString
+addon = xbmcaddon.Addon(id='plugin.video.thatguywiththeglasses_com')
+translation = addon.getLocalizedString
-forceViewMode=settings.getSetting("forceViewMode")
+forceViewMode=addon.getSetting("forceViewMode")
if forceViewMode=="true":
forceViewMode=True
else:
forceViewMode=False
-viewMode=str(settings.getSetting("viewMode"))
+viewMode=str(addon.getSetting("viewMode"))
def index():
addDir(translation(30001),"http://thatguywiththeglasses.com/videolinks";,'listLatest',"")
@@ -104,6 +105,7 @@ def playVideo(url):
url = listParts(match1)
else:
url="http://blip.tv/play/"+match1[0]
+ url=url.replace(".x?p=1","")
content = urllib.unquote_plus(getRedirectedUrl(url))
match=re.compile('/rss/flash/(.+?)&', re.DOTALL).findall(content)
if len(match)>0:
@@ -146,12 +148,8 @@ def cleanTitle(title):
def getRedirectedUrl(url):
req = urllib2.Request(url)
- req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:11.0)
Gecko/20100101 Firefox/11.0')
- if xbox==True:
- socket.setdefaulttimeout(30)
- response = urllib2.urlopen(req)
- else:
- response = urllib2.urlopen(req,timeout=30)
+ req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:14.0)
Gecko/20100101 Firefox/14.0.1')
+ response = urllib2.urlopen(req)
response.close()
return str(response.geturl())
@@ -161,12 +159,8 @@ def getUrl(url,data=None):
req.add_header('Content-Type', 'application/x-www-form-urlencoded')
else:
req = urllib2.Request(url)
- req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:11.0)
Gecko/20100101 Firefox/13.0')
- if xbox==True:
- socket.setdefaulttimeout(30)
- response = urllib2.urlopen(req)
- else:
- response = urllib2.urlopen(req,timeout=30)
+ req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:14.0)
Gecko/20100101 Firefox/14.0.1')
+ response = urllib2.urlopen(req)
link=response.read()
response.close()
return link
diff --git
a/plugin.video.thatguywiththeglasses_com/resources/language/English/strings.xml
b/plugin.video.thatguywiththeglasses_com/resources/language/English/strings.xml
index 01cb669..c9436c4 100644
---
a/plugin.video.thatguywiththeglasses_com/resources/language/English/strings.xml
+++
b/plugin.video.thatguywiththeglasses_com/resources/language/English/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30001">Latest episodes</string>
- <string id="30101">Force ViewMode</string>
- <string id="30102">ViewMode</string>
+ <string id="30101">Force View</string>
+ <string id="30102">ViewID</string>
</strings>
diff --git
a/plugin.video.thatguywiththeglasses_com/resources/language/German/strings.xml
b/plugin.video.thatguywiththeglasses_com/resources/language/German/strings.xml
index 3a5dd96..7f9c736 100644
---
a/plugin.video.thatguywiththeglasses_com/resources/language/German/strings.xml
+++
b/plugin.video.thatguywiththeglasses_com/resources/language/German/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30001">Letzte Folgen</string>
- <string id="30101">ViewMode erzwingen</string>
+ <string id="30101">View erzwingen</string>
</strings>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.thatguywiththeglasses_com/addon.xml | 6 ++--
.../changelog.txt | 4 ++-
plugin.video.thatguywiththeglasses_com/default.py | 26 +++++++------------
.../resources/language/English/strings.xml | 4 +-
.../resources/language/German/strings.xml | 2 +-
5 files changed, 19 insertions(+), 23 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
