The branch, eden has been updated
via b8048b22c41a0c42fc3aab711523db6321fec069 (commit)
via 37670b99a2384f817a512ea77d7517848d5653c7 (commit)
from be30a0c6846a641fd4c8e4042966a3f5296e769b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b8048b22c41a0c42fc3aab711523db6321fec069
commit b8048b22c41a0c42fc3aab711523db6321fec069
Author: beenje <bee...@xbmc.org>
Date: Sat Jan 12 22:42:48 2013 +0100
[plugin.video.vgtv] updated to version 1.0.4
diff --git a/plugin.video.vgtv/addon.py b/plugin.video.vgtv/addon.py
index 9278502..96bd108 100644
--- a/plugin.video.vgtv/addon.py
+++ b/plugin.video.vgtv/addon.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright 2012 Espen Hovlandsdal
+# Copyright 2012-2013 Espen Hovlandsdal
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/plugin.video.vgtv/addon.xml b/plugin.video.vgtv/addon.xml
index 77637ba..3148b11 100644
--- a/plugin.video.vgtv/addon.xml
+++ b/plugin.video.vgtv/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.vgtv" name="VGTV" version="1.0.2" provider-name="Espen
Hovlandsdal">
+<addon id="plugin.video.vgtv" name="VGTV" version="1.0.4" provider-name="Espen
Hovlandsdal">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.xbmcswift2" version="1.1.1"/>
diff --git a/plugin.video.vgtv/changelog.txt b/plugin.video.vgtv/changelog.txt
index fe99d88..52a1dc3 100644
--- a/plugin.video.vgtv/changelog.txt
+++ b/plugin.video.vgtv/changelog.txt
@@ -1,3 +1,9 @@
+[B]1.0.4[/B]
+- Changed versioning scheme to differentiate frodo from eden branch
+
+[B]1.0.3[/B]
+- Fixed a crash when a video does not have a mp4 or m3u8 entry in the feed
+
[B]1.0.2[/B]
- Updated xbmc.python version and language tag for plugin
diff --git a/plugin.video.vgtv/resources/lib/api.py
b/plugin.video.vgtv/resources/lib/api.py
index 1c64264..943d42f 100644
--- a/plugin.video.vgtv/resources/lib/api.py
+++ b/plugin.video.vgtv/resources/lib/api.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright 2012 Espen Hovlandsdal
+# Copyright 2012-2013 Espen Hovlandsdal
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -150,6 +150,9 @@ class VgtvApi():
if ('mp4' not in video['formats']['http'] and
'm3u8' in video['formats']['http']):
format = 'm3u8'
+ elif ('mp4' not in video['formats']['http'] and
+ 'flv' in video['formats']['http']):
+ format = 'flv'
else:
# Reverse order for stuff we have to resolve
# Had some trouble getting mp4 stream to work
diff --git a/plugin.video.vgtv/resources/lib/utils.py
b/plugin.video.vgtv/resources/lib/utils.py
index 2876c1d..bd4ee7d 100644
--- a/plugin.video.vgtv/resources/lib/utils.py
+++ b/plugin.video.vgtv/resources/lib/utils.py
@@ -1,19 +1,23 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+# Copyright 2012-2013 Espen Hovlandsdal
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+# This module contains utility functions used throughout the VGTV plugin
+
import re
import htmlentitydefs
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=37670b99a2384f817a512ea77d7517848d5653c7
commit 37670b99a2384f817a512ea77d7517848d5653c7
Author: beenje <bee...@xbmc.org>
Date: Sat Jan 12 22:42:43 2013 +0100
[plugin.video.manoto] updated to version 0.0.7
diff --git a/plugin.video.manoto/addon.xml b/plugin.video.manoto/addon.xml
index 7a97b12..cddbe2e 100755
--- a/plugin.video.manoto/addon.xml
+++ b/plugin.video.manoto/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.manoto"
name="Manoto TV"
- version="0.0.6"
+ version="0.0.7"
provider-name="babak">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.manoto/default.py b/plugin.video.manoto/default.py
index 6bd2037..ab50c2a 100644
--- a/plugin.video.manoto/default.py
+++ b/plugin.video.manoto/default.py
@@ -79,20 +79,9 @@ def loginAndParse():
ck = cookielib.Cookie(version=0, name=parsedJS[0][0],
value=parsedJS[0][1], port=None, port_specified=False, domain=domain,
domain_specified=False, domain_initial_dot=False, path='/',
path_specified=True, secure=False, expires=None, discard=True, comment=None,
comment_url=None, rest={'HttpOnly': None}, rfc2109=False)
cj.set_cookie(ck)
- resp = opener.open(url)
- html_data = resp.read()
-
- soup = BeautifulSoup(html_data)
- eventVal = soup.find('input',id='__EVENTVALIDATION',type='hidden')
- viewState = soup.find('input',id='__VIEWSTATE',type='hidden')
+ params = 'UserName=%s&Password=%s&btnLogin=ture&bRememberMe=false' %
(urllib.quote(__settings__.getSetting('username')),
urllib.quote(__settings__.getSetting('password')))
- if eventVal is None or viewState is None:
- xbmcplugin.endOfDirectory(handle=int(sys.argv[1]))
- return False
-
- params =
'__EVENTARGUMENT=&__EVENTTARGET=ctl00%%24ContentPlaceHolderMainContent%%24lbtnEnter&__EVENTVALIDATION=%s&__VIEWSTATE=%s&ctl00%%24ContentPlaceHolderMainContent%%24txtUsername=%s&ctl00%%24ContentPlaceHolderMainContent%%24txtPassword=%s'
% (urllib.quote(eventVal['value']), urllib.quote(viewState['value']),
urllib.quote(__settings__.getSetting('username')),
urllib.quote(__settings__.getSetting('password')))
-
- resp = opener.open('https://www.manoto1.com/LiveStream.aspx', params)
+ resp = opener.open('https://www.manoto1.com/User/Home/Login', params)
resp = opener.open(url)
html_data = resp.read()
-----------------------------------------------------------------------
Summary of changes:
plugin.video.manoto/addon.xml | 2 +-
plugin.video.manoto/default.py | 15 ++-------------
plugin.video.vgtv/addon.py | 2 +-
plugin.video.vgtv/addon.xml | 2 +-
plugin.video.vgtv/changelog.txt | 6 ++++++
plugin.video.vgtv/resources/lib/api.py | 5 ++++-
plugin.video.vgtv/resources/lib/utils.py | 26 +++++++++++++++-----------
7 files changed, 30 insertions(+), 28 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122912
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
