The branch, dharma-pre has been updated
via a71b01e57641a61267f1dfa1b0a28911cde09d7d (commit)
via 0e1490a4fc40bdb54c7f39e957b008b2d0364314 (commit)
from 3b40e7aa1eba3521904b083624c7f5ef4a8542e4 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=a71b01e57641a61267f1dfa1b0a28911cde09d7d
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=0e1490a4fc40bdb54c7f39e957b008b2d0364314
commit 0e1490a4fc40bdb54c7f39e957b008b2d0364314
Author: spiff <[email protected]>
Date: Wed Nov 3 13:33:03 2010 +0100
[plugin.video.zoneminder] updated to version 1.1.1
diff --git a/plugin.video.zoneminder/addon.xml
b/plugin.video.zoneminder/addon.xml
index f58e5fe..fe73db0 100644
--- a/plugin.video.zoneminder/addon.xml
+++ b/plugin.video.zoneminder/addon.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.zoneminder"
- version="1.1.0"
+ version="1.1.1"
name="ZoneMinder"
provider-name="Mark Honeychurch (markhoney)">
<requires>
diff --git a/plugin.video.zoneminder/changelog.txt
b/plugin.video.zoneminder/changelog.txt
index 99ce07f..6affc40 100644
--- a/plugin.video.zoneminder/changelog.txt
+++ b/plugin.video.zoneminder/changelog.txt
@@ -1,3 +1,7 @@
+1.1.1
+- Added option to manually enter IP address for hashed authentication
+- Better quality icon from Freezy
+
1.1.0
- Added authentication. Both plain and hashed are available
diff --git a/plugin.video.zoneminder/default.py
b/plugin.video.zoneminder/default.py
index 0d114f2..87e6262 100644
--- a/plugin.video.zoneminder/default.py
+++ b/plugin.video.zoneminder/default.py
@@ -58,14 +58,7 @@ def defaultinfo(folder = 0): #Set the default info for
folders (1) and videos (0
info["Icon"] = "DefaultFolder.png"
else:
info["Icon"] = "DefaultVideo.png"
- #info["VideoCodec"] = "flv"
- #info["VideoCodec"] = "avc1"
- #info["VideoCodec"] = "h264"
- #info["VideoResolution"] = "480" #actually 360 (640x360)
- #info["VideoAspect"] = "1.78"
- #info["AudioCodec"] = "aac"
- #info["AudioChannels"] = "2"
- #info["AudioLanguage"] = "eng"
+ info["VideoCodec"] = "mp4v"
info["Thumb"] = ""
return info
@@ -129,10 +122,14 @@ def createauthstring():
if __addon__.getSetting('hash') == 'true':
myIP = ""
if __addon__.getSetting('ip') == 'true':
- myIP = xbmc.getIPAddress()
+ if __addon__.getSetting('thisip') == 'true':
+ myIP = xbmc.getIPAddress()
+ else:
+ myIP = __addon__.getSetting('otherip')
nowtime = time.localtime()
- sys.stderr.write("Time: %s-%s-%s-%s" % (nowtime[3], nowtime[2], nowtime[1]
- 1, nowtime[0] - 1900))
- hashable = "%s%s%s%s%s%s%s%s" % (__addon__.getSetting('secret'),
__addon__.getSetting('username'),
mysql_password(__addon__.getSetting('password')), myIP, nowtime[3], nowtime[2],
nowtime[1] - 1, nowtime[0] - 1900)
+ hashtime = "%s%s%s%s" % (nowtime[3], nowtime[2], nowtime[1] - 1, nowtime[0]
- 1900)
+ sys.stderr.write("Time (for hash): %s" % hashtime)
+ hashable = "%s%s%s%s%s" % (__addon__.getSetting('secret'),
__addon__.getSetting('username'),
mysql_password(__addon__.getSetting('password')), myIP, hashtime)
hash = md5.new(hashable).hexdigest()
authurl = "&auth=%s" % (hash)
videoauthurl = authurl
@@ -170,9 +167,7 @@ def listcameras():
sys.stderr.write(localize(30202))
message(localize(30202))
-params = cgi.parse_qs(urlparse.urlparse(sys.argv[2])[4])
listcameras()
xbmcplugin.addSortMethod(handle = int(sys.argv[1]), sortMethod =
xbmcplugin.SORT_METHOD_UNSORTED)
-#xbmcplugin.addSortMethod(handle = int(sys.argv[1]), sortMethod =
xbmcplugin.SORT_METHOD_PROGRAM_COUNT)
xbmcplugin.addSortMethod(handle = int(sys.argv[1]), sortMethod =
xbmcplugin.SORT_METHOD_LABEL)
xbmcplugin.endOfDirectory(int(sys.argv[1]))
\ No newline at end of file
diff --git a/plugin.video.zoneminder/icon.png b/plugin.video.zoneminder/icon.png
index 97d2e80..0524140 100644
Binary files a/plugin.video.zoneminder/icon.png and
b/plugin.video.zoneminder/icon.png differ
diff --git a/plugin.video.zoneminder/resources/language/English/strings.xml
b/plugin.video.zoneminder/resources/language/English/strings.xml
index 1bd0f0a..e875aca 100644
--- a/plugin.video.zoneminder/resources/language/English/strings.xml
+++ b/plugin.video.zoneminder/resources/language/English/strings.xml
@@ -10,6 +10,8 @@
<string id="30008">Hashed Authentication</string>
<string id="30009">Hash Secret</string>
<string id="30010">Include IP in Hash</string>
+ <string id="30011">Use this machine's IP</string>
+ <string id="30012">Hash IP Address</string>
<string id="30100">Connection</string>
<string id="30101">Authentication</string>
<string id="30200">Authentication Required</string>
diff --git a/plugin.video.zoneminder/resources/settings.xml
b/plugin.video.zoneminder/resources/settings.xml
index 4716a7c..7013262 100644
--- a/plugin.video.zoneminder/resources/settings.xml
+++ b/plugin.video.zoneminder/resources/settings.xml
@@ -1,17 +1,19 @@
<settings>
<category label="30100">
- <setting id="server" type="text" label="30000" default="zoneminder"/>
- <setting id="zmurl" type="text" label="30001" default="zm"/>
- <setting id="cgiurl" type="text" label="30002" default="cgi-bin"/>
- <setting id="bitrate" type="enum" label="30003" default="10"
values="0.1|0.5|1|2|5|10|50|100"/>
- <setting id="fps" type="enum" label="30004" default="25"
values="1|2|5|10|15|20|25|30|50"/>
+ <setting id="server" type="text" label="30000" default="zoneminder"/>
+ <setting id="zmurl" type="text" label="30001" default="zm"/>
+ <setting id="cgiurl" type="text" label="30002" default="cgi-bin"/>
+ <setting id="bitrate" type="labelenum" label="30003" default="10"
values="0.1|0.5|1|2|5|10|50|100"/>
+ <setting id="fps" type="labelenum" label="30004" default="25"
values="1|2|5|10|15|20|25|30|50"/>
</category>
<category label="30101">
- <setting id="auth" type="bool" label="30005" default="false"/>
- <setting id="username" type="text" label="30006" default="admin"
enable="eq(-1,true)"/>
- <setting id="password" type="text" label="30007" default="admin"
enable="eq(-2,true)" option="hidden" />
- <setting id="hash" type="bool" label="30008" default="false"
enable="eq(-3,true)"/>
- <setting id="secret" type="text" label="30009" default="This is my hash
secret" enable="eq(-4,true) + eq(-1,true)"/>
- <setting id="ip" type="bool" label="30010" default="false"
enable="eq(-5,true) + eq(-2,true)"/>
+ <setting id="auth" type="bool" label="30005" default="false"/>
+ <setting id="username" type="text" label="30006" default="admin"
enable="eq(-1,true)"/>
+ <setting id="password" type="text" label="30007" default="admin"
enable="eq(-2,true)" option="hidden" />
+ <setting id="hash" type="bool" label="30008" default="false"
enable="eq(-3,true)"/>
+ <setting id="secret" type="text" label="30009" default="This is my
hash secret" visible="eq(-4,true) + eq(-1,true)"/>
+ <setting id="ip" type="bool" label="30010" default="false"
visible="eq(-5,true) + eq(-2,true)"/>
+ <setting id="thisip" type="bool" label="30011" default="true"
visible="eq(-6,true) + eq(-3,true) + eq(-1,true)"/>
+ <setting id="otherip" type="ipaddress" label="30012" default=""
visible="eq(-7,true) + eq(-4,true) + eq(-2,true) + eq(-1,false)"/>
</category>
</settings>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE | 0
.../LICENSE.txt | 0
.../addon.xml | 12 +-
plugin.video.jupiterbroadcasting/changelog.txt | 2 +
plugin.video.jupiterbroadcasting/default.py | 149 ++++++++++++++++++++
.../feedparser.py | 0
plugin.video.jupiterbroadcasting/icon.png | Bin 0 -> 72053 bytes
.../resources/language/English/strings.xml | 10 ++
plugin.video.zoneminder/addon.xml | 2 +-
plugin.video.zoneminder/changelog.txt | 4 +
plugin.video.zoneminder/default.py | 21 +--
plugin.video.zoneminder/icon.png | Bin 65404 -> 71682 bytes
.../resources/language/English/strings.xml | 2 +
plugin.video.zoneminder/resources/settings.xml | 24 ++--
14 files changed, 195 insertions(+), 31 deletions(-)
copy {plugin.video.nrk/NRK_API/feedparser =>
plugin.video.jupiterbroadcasting}/LICENSE (100%)
copy {plugin.audio.ListenLiveEU =>
plugin.video.jupiterbroadcasting}/LICENSE.txt (100%)
copy {plugin.video.secsports => plugin.video.jupiterbroadcasting}/addon.xml
(55%)
create mode 100644 plugin.video.jupiterbroadcasting/changelog.txt
create mode 100644 plugin.video.jupiterbroadcasting/default.py
copy {plugin.image.icanhascheezburger.com/resources/lib =>
plugin.video.jupiterbroadcasting}/feedparser.py (100%)
mode change 100755 => 100644
create mode 100644 plugin.video.jupiterbroadcasting/icon.png
create mode 100644
plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Achieve Improved Network Security with IP and DNS Reputation.
Defend against bad network traffic, including botnets, malware,
phishing sites, and compromised hosts - saving your company time,
money, and embarrassment. Learn More!
http://p.sf.net/sfu/hpdev2dev-nov
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
