The branch, eden has been updated
via 0c6fcbd0d825e8da31bfdabbbd17207351b3f68a (commit)
from 55c9a4bdb781308893bcb2b823a58527a081c31f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=0c6fcbd0d825e8da31bfdabbbd17207351b3f68a
commit 0c6fcbd0d825e8da31bfdabbbd17207351b3f68a
Author: beenje <[email protected]>
Date: Sun Apr 7 11:57:14 2013 +0200
[plugin.video.4od] updated to version 2.0.10
diff --git a/plugin.video.4od/addon.xml b/plugin.video.4od/addon.xml
index ba2525b..d58843e 100644
--- a/plugin.video.4od/addon.xml
+++ b/plugin.video.4od/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.4od"
name="4oD"
- version="2.0.9"
+ version="2.0.10"
provider-name="mossy">
<requires>
<import addon="script.module.socksipy" version="1.0.0"/>
diff --git a/plugin.video.4od/changelog.txt b/plugin.video.4od/changelog.txt
index cc9e644..75e7f55 100644
--- a/plugin.video.4od/changelog.txt
+++ b/plugin.video.4od/changelog.txt
@@ -1,3 +1,6 @@
+Version 2.0.10 (28 Mar 2013)
+- Option to use port 443 for RTMP streams
+
Version 2.0.9 (16 Mar 2013)
- Prevent potential divide-by-zero problem when "Show Watched" is on.
diff --git a/plugin.video.4od/default.py b/plugin.video.4od/default.py
index 7f61bb1..27ead6b 100644
--- a/plugin.video.4od/default.py
+++ b/plugin.video.4od/default.py
@@ -42,10 +42,12 @@ import rtmp
from utils import log
-pluginName = 'plugin.video.4od'
pluginHandle = int(sys.argv[1])
-addon = Addon(pluginName)
+addon = Addon()
+version = addon.getAddonInfo('version')
+pluginName = addon.getAddonInfo('id')
+name = addon.getAddonInfo('name')
language = addon.getLocalizedString
httpManager = HttpManager()
@@ -105,6 +107,8 @@ def executeCommand():
if __name__ == "__main__":
try:
+ log (u"Name: %s, Version: %s" % (name, version), xbmc.LOGDEBUG)
+
if addon.getSetting('http_cache_disable_adv') == 'false':
httpManager.SetCacheDir( CACHE_FOLDER )
diff --git a/plugin.video.4od/fourOD.py b/plugin.video.4od/fourOD.py
index 7ec9ba6..118886f 100644
--- a/plugin.video.4od/fourOD.py
+++ b/plugin.video.4od/fourOD.py
@@ -567,6 +567,7 @@ class FourODProvider(Provider):
# Get the stream info
(streamUri, auth) = self.GetStreamInfo(assetUrl)
+ self.log(u'streamUri: %s' % streamUri, xbmc.LOGDEBUG)
url = re.search(u'(.*?)mp4:', streamUri).group(1)
app = re.search(u'.com/(.*?)mp4:', streamUri).group(1)
@@ -575,8 +576,14 @@ class FourODProvider(Provider):
url = url + u"?ovpfv=1.1&" + auth
app = app + u"?ovpfv=1.1&" + auth
+ self.log(u'url: %s' % url, xbmc.LOGDEBUG)
swfPlayer = self.GetSwfPlayer()
- rtmpvar = rtmp.RTMP(rtmp = streamUri, app = app, swfVfy = swfPlayer,
playPath = playPath, pageUrl = urlRoot)
+
+ port = None
+ if self.addon.getSetting('rtmp_port_alt') == "true":
+ port = 443
+
+ rtmpvar = rtmp.RTMP(rtmp = url, app = app, swfVfy = swfPlayer,
playPath = playPath, pageUrl = urlRoot, port = port)
return rtmpvar
#==============================================================================
diff --git a/plugin.video.4od/resources/language/English/strings.po
b/plugin.video.4od/resources/language/English/strings.po
index 250e39d..c721d66 100644
--- a/plugin.video.4od/resources/language/English/strings.po
+++ b/plugin.video.4od/resources/language/English/strings.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: XBMC-Addons\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2013-03-16 14:46+0000\n"
+"POT-Creation-Date: 2013-03-28 15:09+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
@@ -435,7 +435,13 @@ msgctxt "#50501"
msgid "Auto-Watch Percentage"
msgstr ""
-#empty strings from id 50502 to 51039
+#empty strings from id 50502 to 50509
+
+msgctxt "#50510"
+msgid "Use alternative RTMP port: 443"
+msgstr ""
+
+#empty strings from id 50511 to 51039
msgctxt "#51040"
msgid "Error processing asset data"
diff --git a/plugin.video.4od/resources/language/English/strings.xml
b/plugin.video.4od/resources/language/English/strings.xml
index f6499b5..6b236f6 100644
--- a/plugin.video.4od/resources/language/English/strings.xml
+++ b/plugin.video.4od/resources/language/English/strings.xml
@@ -68,7 +68,10 @@
<string id="32700">Getting video stream url</string>
<string id="32710">Getting episode information</string>
<string id="32720">Preparing to play video</string>
+ <string id="32730"></string>
+
<string id="50500">Showed Watched</string>
<string id="50501">Auto-Watch Percentage</string>
+ <string id="50510">Use alternative RTMP port: 443</string>
<string id="51040">Error processing asset data</string>
</strings>
\ No newline at end of file
diff --git a/plugin.video.4od/resources/settings.xml
b/plugin.video.4od/resources/settings.xml
index 77046ae..e1ae4da 100644
--- a/plugin.video.4od/resources/settings.xml
+++ b/plugin.video.4od/resources/settings.xml
@@ -34,5 +34,6 @@
<category label="30400">
<setting id="socket_timeout" type="number" label="30420" default="0"/>
<setting id="http_cache_disable_adv" label="30170" type="bool"
default="false" />
+ <setting id="rtmp_port_alt" label="50510" type="bool" default="false"
/>
</category>
</settings>
diff --git a/plugin.video.4od/rtmp.py b/plugin.video.4od/rtmp.py
index 808fa59..2591e0b 100644
--- a/plugin.video.4od/rtmp.py
+++ b/plugin.video.4od/rtmp.py
@@ -1,10 +1,11 @@
# -*- coding: utf-8 -*-
import xbmc
import sys
+import re
class RTMP:
- def __init__(self, rtmp, tcUrl = None, auth = None, app = None, playPath =
None, swfUrl = None, swfVfy = None, pageUrl = None, live = None, socks = None):
+ def __init__(self, rtmp, tcUrl = None, auth = None, app = None, playPath =
None, swfUrl = None, swfVfy = None, pageUrl = None, live = None, socks = None,
port = None):
if hasattr(sys.modules[u"__main__"], u"log"):
self.log = sys.modules[u"__main__"].log
else:
@@ -20,6 +21,7 @@ class RTMP:
self.pageUrl = pageUrl
self.live = live
self.socks = socks
+ self.port = port
self.rtmpdumpPath = None
self.downloadFolder = None
@@ -95,6 +97,9 @@ class RTMP:
if self.socks is not None:
parameters[u"socks"] = self.socks
+ if self.port is not None:
+ parameters[u"port"] = self.port
+
self.log(u"parameters: " + unicode(parameters), xbmc.LOGDEBUG)
return parameters
@@ -146,6 +151,10 @@ class RTMP:
args.append(u"--socks")
args.append(u'"%s"' % self.socks)
+ if self.port is not None:
+ args.append(u"--port")
+ args.append(u'%d' % self.port)
+
parameters = u' '.join(args)
self.log(u"parameters: " + parameters, xbmc.LOGDEBUG)
@@ -157,7 +166,20 @@ class RTMP:
exception = Exception(self.language(32020))
raise exception;
- args = [u"%s" % self.rtmp]
+ if self.port is None:
+ args = [u"%s" % self.rtmp]
+ else:
+ try:
+ # Replace "rtmp://abc.def.com:default_port/ghi/jkl" with
"rtmp://abc.def.com:port/ghi/jkl"
+ match=re.search("(.+//[^/]+):\d+(/.*)", self.rtmp, re.DOTALL
| re.IGNORECASE )
+ if match is None:
+ # Replace "rtmp://abc.def.com/ghi/jkl" with
"rtmp://abc.def.com:port/ghi/jkl"
+ match=re.search("(.+//[^/]+)(/.*)", self.rtmp, re.DOTALL
| re.IGNORECASE )
+
+ args = [u"%s:%d%s" % (match.group(1), self.port,
match.group(2))]
+ except (Exception) as exception:
+ self.log("Exception changing default port: " + repr(exception))
+ args = [u"%s" % self.rtmp]
if self.auth is not None:
args.append(u"auth=%s" % self.auth)
-----------------------------------------------------------------------
Summary of changes:
plugin.video.4od/addon.xml | 2 +-
plugin.video.4od/changelog.txt | 3 ++
plugin.video.4od/default.py | 8 ++++-
plugin.video.4od/fourOD.py | 9 ++++++-
.../resources/language/English/strings.po | 10 ++++++-
.../resources/language/English/strings.xml | 3 ++
plugin.video.4od/resources/settings.xml | 1 +
plugin.video.4od/rtmp.py | 26 ++++++++++++++++++-
8 files changed, 54 insertions(+), 8 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
