The branch, eden has been updated
via 73e9ca8917d9217f9784535062d9b3211d923398 (commit)
via 6834bf0ee8740a244a24fdeaa21ba09ca6b42d2f (commit)
from 7703a125c8b48716e5bf03030e134360d0de5fde (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=73e9ca8917d9217f9784535062d9b3211d923398
commit 73e9ca8917d9217f9784535062d9b3211d923398
Author: spiff <[email protected]>
Date: Fri May 11 09:39:44 2012 +0200
[plugin.video.lachschon_de] updated to version 1.0.5
diff --git a/plugin.video.lachschon_de/addon.xml
b/plugin.video.lachschon_de/addon.xml
index fb33bed..e5c474a 100644
--- a/plugin.video.lachschon_de/addon.xml
+++ b/plugin.video.lachschon_de/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.lachschon_de" name="Lachschon.de" version="1.0.4"
provider-name="AddonScriptorDE">
+<addon id="plugin.video.lachschon_de" name="LachSchon.de" version="1.0.5"
provider-name="AddonScriptorDE">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="plugin.video.youtube" version="2.9.1"/>
diff --git a/plugin.video.lachschon_de/changelog.txt
b/plugin.video.lachschon_de/changelog.txt
index cc5d8cb..188dcb2 100644
--- a/plugin.video.lachschon_de/changelog.txt
+++ b/plugin.video.lachschon_de/changelog.txt
@@ -2,4 +2,5 @@
1.0.1 - Changed addon.xml
1.0.2 - Added string localization
1.0.3 - Changed Timeout
-1.0.4 - Various fixes and optical optimizations
\ No newline at end of file
+1.0.4 - Various fixes and optical optimizations
+1.0.5 - Added Random Videos & Search
\ No newline at end of file
diff --git a/plugin.video.lachschon_de/default.py
b/plugin.video.lachschon_de/default.py
index 2c7bdfd..e1bc33f 100644
--- a/plugin.video.lachschon_de/default.py
+++ b/plugin.video.lachschon_de/default.py
@@ -9,10 +9,18 @@ translation = settings.getLocalizedString
def index():
addDir(translation(30001),"http://www.lachschon.de/gallery/trend/?set_gallery_type=video&set_image_type=small&page=1",1,"";)
-
addDir(translation(30002),"http://www.lachschon.de/gallery/mostvoted/?set_gallery_type=video&set_image_type=small&page=1",1,"";)
-
addDir(translation(30003),"http://www.lachschon.de/gallery/top/?set_gallery_type=video&set_image_type=small&page=1",1,"";)
+
addDir(translation(30002),"http://www.lachschon.de/gallery/top/?set_gallery_type=video&set_image_type=small&page=1",1,"";)
+
addDir(translation(30003),"http://www.lachschon.de/gallery/random/?set_gallery_type=video&set_image_type=small&page=1",1,"";)
+ addDir(translation(30004),"SEARCH",3,"")
xbmcplugin.endOfDirectory(pluginhandle)
+def search():
+ keyboard = xbmc.Keyboard('', str(translation(30004)))
+ keyboard.doModal()
+ if keyboard.isConfirmed() and keyboard.getText():
+ search_string = keyboard.getText().replace(" ","+")
+
listVideos("http://www.lachschon.de/gallery/search_item/?set_gallery_type=video&set_image_type=small&q="+search_string)
+
def listVideos(url):
content = getUrl(url)
urlNextPage=""
@@ -30,6 +38,7 @@ def listVideos(url):
thumb=match[0]
match=re.compile('<span class="subtitle">(.+?)</span>',
re.DOTALL).findall(entry)
title=match[0]
+ title=cleanTitle(title)
addLink(title,"http://www.lachschon.de"+url,2,thumb)
if urlNextPage!="":
addDir("Next Page",urlNextPage,1,'')
@@ -43,6 +52,12 @@ def playVideo(url):
listitem = xbmcgui.ListItem(path=fullData)
return xbmcplugin.setResolvedUrl(pluginhandle, True, listitem)
+def cleanTitle(title):
+
title=title.replace("<","<").replace(">",">").replace("&","&").replace("'","\\").replace("'","\\").replace(""","\"").replace("ß","Ã").replace("–","-")
+
title=title.replace("Ä","Ã").replace("Ü","Ã").replace("Ö","Ã").replace("ä","ä").replace("ü","ü").replace("ö","ö")
+ title=title.strip()
+ return title
+
def getUrl(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')
@@ -100,3 +115,5 @@ elif mode==1:
listVideos(url)
elif mode==2:
playVideo(url)
+elif mode==3:
+ search()
diff --git a/plugin.video.lachschon_de/resources/language/English/strings.xml
b/plugin.video.lachschon_de/resources/language/English/strings.xml
index e3126bc..8fe122a 100644
--- a/plugin.video.lachschon_de/resources/language/English/strings.xml
+++ b/plugin.video.lachschon_de/resources/language/English/strings.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30001">Newest Videos</string>
- <string id="30002">Most Voted</string>
- <string id="30003">Best Voted</string>
+ <string id="30002">Best Voted</string>
+ <string id="30003">Random Videos</string>
+ <string id="30004">Video Search</string>
</strings>
diff --git a/plugin.video.lachschon_de/resources/language/German/strings.xml
b/plugin.video.lachschon_de/resources/language/German/strings.xml
index 13bb86f..205e6b6 100644
--- a/plugin.video.lachschon_de/resources/language/German/strings.xml
+++ b/plugin.video.lachschon_de/resources/language/German/strings.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30001">Neueste Videos</string>
- <string id="30002">Meiste Stimmen</string>
- <string id="30003">Beste Bewertung</string>
+ <string id="30002">Beste Bewertung</string>
+ <string id="30003">Zufällige Videos</string>
+ <string id="30004">Video suche</string>
</strings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=6834bf0ee8740a244a24fdeaa21ba09ca6b42d2f
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 0
plugin.video.dtm_tv/addon.xml | 18 ++
plugin.video.dtm_tv/changelog.txt | 1 +
plugin.video.dtm_tv/default.py | 166 ++++++++++++++++++++
plugin.video.dtm_tv/icon.png | Bin 0 -> 20295 bytes
.../resources/language/English/strings.xml | 8 +
.../resources/language/German/strings.xml | 8 +
plugin.video.dtm_tv/resources/settings.xml | 3 +
plugin.video.lachschon_de/addon.xml | 2 +-
plugin.video.lachschon_de/changelog.txt | 3 +-
plugin.video.lachschon_de/default.py | 21 +++-
.../resources/language/English/strings.xml | 5 +-
.../resources/language/German/strings.xml | 5 +-
13 files changed, 232 insertions(+), 8 deletions(-)
copy {plugin.audio.radio_de => plugin.video.dtm_tv}/LICENSE.txt (100%)
create mode 100644 plugin.video.dtm_tv/addon.xml
create mode 100644 plugin.video.dtm_tv/changelog.txt
create mode 100644 plugin.video.dtm_tv/default.py
create mode 100644 plugin.video.dtm_tv/icon.png
create mode 100644 plugin.video.dtm_tv/resources/language/English/strings.xml
create mode 100644 plugin.video.dtm_tv/resources/language/German/strings.xml
create mode 100644 plugin.video.dtm_tv/resources/settings.xml
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
