The branch, frodo has been updated
via 3214f4d0d261085fbf97f0bc27385925f42e253a (commit)
from 1e5b34eb695ac228bfe5dcb456bcbadbad0325e8 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=3214f4d0d261085fbf97f0bc27385925f42e253a
commit 3214f4d0d261085fbf97f0bc27385925f42e253a
Author: beenje <[email protected]>
Date: Tue Dec 10 12:26:42 2013 +0100
[plugin.video.oppetarkiv] updated to version 0.2.4
diff --git a/plugin.video.oppetarkiv/README.md
b/plugin.video.oppetarkiv/README.md
index 9fa2f4e..14e27d9 100755
--- a/plugin.video.oppetarkiv/README.md
+++ b/plugin.video.oppetarkiv/README.md
@@ -1,7 +1,9 @@
# XBMC Ãppet Arkiv addon
-# 0.2.3
+# 0.2.4
Forked from nielzen/xbmc-svtplay
This addon is used to stream videos from www.oppetarkiv.se
+Install from repo
+or
Download and "install from zip file" in xbmc.
diff --git a/plugin.video.oppetarkiv/addon.xml
b/plugin.video.oppetarkiv/addon.xml
old mode 100755
new mode 100644
index 2bc0406..90779d9
--- a/plugin.video.oppetarkiv/addon.xml
+++ b/plugin.video.oppetarkiv/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.oppetarkiv"
name="Ãppet Arkiv"
- version="0.2.3"
+ version="0.2.4"
provider-name="khoda">
<requires>
<import addon="script.module.parsedom" version="1.2.0"/>
diff --git a/plugin.video.oppetarkiv/changelog.txt
b/plugin.video.oppetarkiv/changelog.txt
old mode 100755
new mode 100644
diff --git a/plugin.video.oppetarkiv/default.py
b/plugin.video.oppetarkiv/default.py
old mode 100755
new mode 100644
index 9f62797..39dd76e
--- a/plugin.video.oppetarkiv/default.py
+++ b/plugin.video.oppetarkiv/default.py
@@ -86,6 +86,18 @@ def viewAtoO():
addDirectoryItem(program["title"], { "mode": MODE_PROGRAM, "url":
program["url"], "page": 1 })
+def viewAlphaDirectories():
+ alphas = svt.getAlphas()
+
+ for alpha in alphas:
+ addDirectoryItem(alpha["title"], { "mode": MODE_LETTER, "letter":
alpha["char"] })
+
+
+def viewProgramsByLetter(letter):
+ programs = svt.getProgramsByLetter(letter)
+
+ for program in programs:
+ addDirectoryItem(program["title"], { "mode": MODE_PROGRAM, "url":
program["url"], "page": 1 })
def viewProgram(url,page,index):
diff --git a/plugin.video.oppetarkiv/resources/__init__.py
b/plugin.video.oppetarkiv/resources/__init__.py
old mode 100755
new mode 100644
diff --git a/plugin.video.oppetarkiv/resources/language/English/strings.xml
b/plugin.video.oppetarkiv/resources/language/English/strings.xml
old mode 100755
new mode 100644
index d2deb2d..dca641a
--- a/plugin.video.oppetarkiv/resources/language/English/strings.xml
+++ b/plugin.video.oppetarkiv/resources/language/English/strings.xml
@@ -25,6 +25,6 @@
<string id="30506">Show both clips and episodes for programs</string>
<string id="30507">Set bandwidth manually</string>
<string id="30508">Bandwidth</string>
- <string id="40001">General</string>
- <string id="40002">Advanced</string>
+ <string id="30901">General</string>
+ <string id="30902">Advanced</string>
</strings>
diff --git a/plugin.video.oppetarkiv/resources/language/Swedish/strings.xml
b/plugin.video.oppetarkiv/resources/language/Swedish/strings.xml
old mode 100755
new mode 100644
index fa59714..5e1a5d1
--- a/plugin.video.oppetarkiv/resources/language/Swedish/strings.xml
+++ b/plugin.video.oppetarkiv/resources/language/Swedish/strings.xml
@@ -25,6 +25,6 @@
<string id="30506">Visa både klipp och avsnitt för program</string>
<string id="30507">Ställ in bandbredd manuellt</string>
<string id="30508">Bandbredd</string>
- <string id="40001">Allmänt</string>
- <string id="40002">Avancerat</string>
+ <string id="30901">Allmänt</string>
+ <string id="30902">Avancerat</string>
</strings>
diff --git a/plugin.video.oppetarkiv/resources/lib/__init__.py
b/plugin.video.oppetarkiv/resources/lib/__init__.py
old mode 100755
new mode 100644
diff --git a/plugin.video.oppetarkiv/resources/lib/helper.py
b/plugin.video.oppetarkiv/resources/lib/helper.py
old mode 100755
new mode 100644
diff --git a/plugin.video.oppetarkiv/resources/lib/svt.py
b/plugin.video.oppetarkiv/resources/lib/svt.py
old mode 100755
new mode 100644
index c97af17..95de71f
--- a/plugin.video.oppetarkiv/resources/lib/svt.py
+++ b/plugin.video.oppetarkiv/resources/lib/svt.py
@@ -50,9 +50,6 @@ def getAtoO():
return programs
-
-
-
def getProgramsByLetter(letter):
"""
Returns a list of all program starting with the supplied letter.
@@ -60,17 +57,19 @@ def getProgramsByLetter(letter):
letter = urllib.unquote(letter)
html = getPage(URL_A_TO_O)
-
- letterboxes = common.parseDOM(html, "div", attrs = { "class":
"[^\"']*playAlphabeticLetter[^\"']*" })
+
+ #check if letter is à due to different CSS class *doh*
+ if letter == "Ö":
+ letterboxes = common.parseDOM(html, "section", attrs = { "class":
"svtClearfix svt-padding-top-20px svt-margin-bottom-25px svt-border-top " })
+ else:
+ letterboxes = common.parseDOM(html, "section", attrs = { "class":
"svtClearfix svt-padding-top-20px svt-margin-bottom-25px svt-border-top " })
for letterbox in letterboxes:
-
- heading = common.parseDOM(letterbox, "h3")[0]
-
+ heading = common.parseDOM(letterbox, "a", attrs = { "class":
"svt-color-almostblack" })[0]
if heading == letter:
break
- lis = common.parseDOM(letterbox, "li", attrs = { "class":
"[^\"']*playListItem[^\"']*" })
+ lis = common.parseDOM(letterbox, "li")
programs = []
@@ -104,6 +103,25 @@ def getAjaxUrl(html,tabname):
return None
+def getAlphas():
+ """
+ Returns a list of all letters in the alphabet that
+ matches the starting letter of some program.
+ """
+ html = getPage(URL_A_TO_O)
+
+ letters = common.parseDOM(html, "a" , attrs = { "class":
"svt-color-almostblack" })
+
+ alphas = []
+
+ for letter in letters:
+ alpha = {}
+ alpha["title"] = helper.convertChar(letter)
+ alpha["char"] = letter
+ alphas.append(alpha)
+
+ return alphas
+
def getPlayBox(html,tabname):
container = common.parseDOM(html,
diff --git a/plugin.video.oppetarkiv/resources/settings.xml
b/plugin.video.oppetarkiv/resources/settings.xml
old mode 100755
new mode 100644
index 3e1283a..153b7c8
--- a/plugin.video.oppetarkiv/resources/settings.xml
+++ b/plugin.video.oppetarkiv/resources/settings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
- <category label="40001">
+ <category label="30901">
<setting id="diritems" type="slider" label="30503" default="20"
range="20,10,100" option="int" />
<setting id="alpha" type="bool" label="30502" default="false" />
<setting id="fullparse" type="bool" label="30506" default="false" />
@@ -8,7 +8,7 @@
<setting id="showsubtitles" type="bool" label="30501" default="false" />
<setting id="debug" type="bool" label="30500" default="false" />
</category>
- <category label="40002">
+ <category label="30902">
<setting id="hlsstrip" type="bool" label="30505" default="false" />
<setting id="bwselect" type="bool" label="30507" default="false"
enable="eq(-1,false)" />
<setting id="bandwidth" type="select" label="30508" default="2500"
values="300|500|900|1600|2500" enable="eq(-1,true) + eq(-2,false)" />
-----------------------------------------------------------------------
Summary of changes:
plugin.video.oppetarkiv/README.md | 4 ++-
plugin.video.oppetarkiv/addon.xml | 2 +-
plugin.video.oppetarkiv/default.py | 12 ++++++
.../resources/language/English/strings.xml | 4 +-
.../resources/language/Swedish/strings.xml | 4 +-
plugin.video.oppetarkiv/resources/lib/svt.py | 36 +++++++++++++++-----
plugin.video.oppetarkiv/resources/settings.xml | 4 +-
7 files changed, 49 insertions(+), 17 deletions(-)
mode change 100755 => 100644 plugin.video.oppetarkiv/addon.xml
mode change 100755 => 100644 plugin.video.oppetarkiv/changelog.txt
mode change 100755 => 100644 plugin.video.oppetarkiv/default.py
mode change 100755 => 100644 plugin.video.oppetarkiv/resources/__init__.py
mode change 100755 => 100644
plugin.video.oppetarkiv/resources/language/English/strings.xml
mode change 100755 => 100644
plugin.video.oppetarkiv/resources/language/Swedish/strings.xml
mode change 100755 => 100644 plugin.video.oppetarkiv/resources/lib/__init__.py
mode change 100755 => 100644 plugin.video.oppetarkiv/resources/lib/helper.py
mode change 100755 => 100644 plugin.video.oppetarkiv/resources/lib/svt.py
mode change 100755 => 100644 plugin.video.oppetarkiv/resources/settings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Sponsored by Intel(R) XDK
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
