summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMrKrabat <MrKrabat@users.noreply.github.com>2018-01-14 13:22:08 +0100
committerMartijn Kaijser <martijn@xbmc.org>2018-01-14 13:41:40 +0100
commit9ac19a57284a9e5f28bde14677d1e1aea54f6564 (patch)
tree97f6c8bc721e3859539aaec4578f74d63480ab43
parentb38d9847cd804f0abf749146b74124b76393e76b (diff)
[plugin.video.watchbox] 0.4.1
-rw-r--r--plugin.video.watchbox/README.md15
-rw-r--r--plugin.video.watchbox/addon.xml4
-rw-r--r--plugin.video.watchbox/changelog.txt3
-rw-r--r--plugin.video.watchbox/resources/lib/login.py9
4 files changed, 13 insertions, 18 deletions
diff --git a/plugin.video.watchbox/README.md b/plugin.video.watchbox/README.md
index 096a851..36bd7eb 100644
--- a/plugin.video.watchbox/README.md
+++ b/plugin.video.watchbox/README.md
@@ -9,26 +9,15 @@ Forum posting: https://www.kodinerds.net/index.php/Thread/58398-Release-Watchbox
**WARNING: This plugin is only available from Germany by geo blocking**
***
-Compatibility
-
-| Device | Kodi | Status |
-| ------------- | ------------- | ------------- |
-| Windows | 17.x | Yes |
-| Linux | 17.x | Yes |
-| MacOS | 17.x | untested |
-| Android | 17.x | Yes |
-| iOS | 17.x | untested |
-| RaspberryPi | 17.x | Yes |
-***
-
What this plugin currently can do:
- [x] Login with your account
- [x] Search for movies / tv shows
- [x] Show/browse all genres
- [x] Show/browse all seasons
- [x] Show/browse all episodes per season
+- [x] Show/browse new or popular content
- [x] Show/browse watchlist
-- [x] Display various informations (Kodi displays not all we provide)
+- [x] Display various informations
- [x] Watch all movies / tv shows
***
diff --git a/plugin.video.watchbox/addon.xml b/plugin.video.watchbox/addon.xml
index f24fc52..6782870 100644
--- a/plugin.video.watchbox/addon.xml
+++ b/plugin.video.watchbox/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.watchbox" name="Watchbox" version="0.4.0" provider-name="MrKrabat">
+<addon id="plugin.video.watchbox" name="Watchbox" version="0.4.1" provider-name="MrKrabat">
<requires>
<import addon="xbmc.python" version="2.25.0"/>
<import addon="script.module.beautifulsoup4" version="4.3.2"/>
@@ -16,7 +16,7 @@
<description lang="de_DE">Ob Anime, Horror, Action oder Komödie! Stöber durch unsere Top Genres! Alle Filme und Serien kostenlos im Online-Stream bei WATCHBOX.</description>
<disclaimer lang="en_GB">WARNING: This plugin is only available from Germany by geo blocking!</disclaimer>
<disclaimer lang="de_DE">HINWEIS: Dieses Plugin ist durch Geoblocking nur von Deutschland aus verfügbar!</disclaimer>
- <news>v0.4.0 (2017.12.28)[CR]- Readded media duration</news>
+ <news>v0.4.1 (2018.01.14)[CR]- Fix login not working</news>
<license>GNU Affero General Public License, v3</license>
<forum>https://www.kodinerds.net/index.php/Thread/58398-Release-Watchbox-de/</forum>
<website>https://www.watchbox.de/</website>
diff --git a/plugin.video.watchbox/changelog.txt b/plugin.video.watchbox/changelog.txt
index 06ce398..e5d9e5b 100644
--- a/plugin.video.watchbox/changelog.txt
+++ b/plugin.video.watchbox/changelog.txt
@@ -1,3 +1,6 @@
+v0.4.1 (2018.01.14)
+- Fix login not working
+
v0.4.0 (2017.12.28)
- Readded media duration
diff --git a/plugin.video.watchbox/resources/lib/login.py b/plugin.video.watchbox/resources/lib/login.py
index 58a1b5e..47dcfad 100644
--- a/plugin.video.watchbox/resources/lib/login.py
+++ b/plugin.video.watchbox/resources/lib/login.py
@@ -26,7 +26,7 @@ import xbmc
def login(username, password, args):
"""Login and session handler
"""
- login_url = "https://www.watchbox.de/login"
+ login_url = "https://www.watchbox.de/login/"
# create cookie path
cookiepath = os.path.join(
@@ -48,7 +48,7 @@ def login(username, password, args):
cj.load(cookiepath, ignore_discard=True)
# check if session is valid
- response = urllib2.urlopen("https://www.watchbox.de/")
+ response = urllib2.urlopen("https://www.watchbox.de/profil/")
html = response.read()
if username in html:
@@ -61,12 +61,15 @@ def login(username, password, args):
# build POST data
post_data = urllib.urlencode({"email": username,
- "password": password})
+ "password": password,
+ "lasturl": "/"})
# POST to login page
response = urllib2.urlopen(login_url, post_data)
+ html = response.read()
# check for login string
+ response = urllib2.urlopen("https://www.watchbox.de/profil/")
html = response.read()
if username in html: