From 0e1ef9bc01579328e17e79416fa3c1c7b77adcc8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 06:08:01 +0200 Subject: Update everything --- module/plugins/hoster/ZDF.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/ZDF.py') diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index 8d3de5b26..76cf9ec56 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -4,14 +4,14 @@ import re from xml.etree.ElementTree import fromstring -from module.plugins.Hoster import Hoster +from module.plugins.internal.Hoster import Hoster # Based on zdfm by Roland Beermann (http://github.com/enkore/zdfm/) class ZDF(Hoster): __name__ = "ZDF Mediathek" __type__ = "hoster" - __version__ = "0.80" + __version__ = "0.81" __pattern__ = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*' -- cgit v1.2.3 From c1764e2fea0bb05164c83a876e8cd58b97f58f25 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 16 Jun 2015 17:31:38 +0200 Subject: Update all --- module/plugins/hoster/ZDF.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/ZDF.py') diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index 76cf9ec56..2a4708a0d 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- import re - -from xml.etree.ElementTree import fromstring +import xml.etree.ElementTree as etree from module.plugins.internal.Hoster import Hoster @@ -42,7 +41,7 @@ class ZDF(Hoster): def process(self, pyfile): - xml = fromstring(self.load(self.XML_API % self.get_id(pyfile.url))) + xml = etree.fromstring(self.load(self.XML_API % self.get_id(pyfile.url))) status = xml.findtext("./status/statuscode") if status != "ok": -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/hoster/ZDF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/ZDF.py') diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index 2a4708a0d..4829f1bf8 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -10,7 +10,7 @@ from module.plugins.internal.Hoster import Hoster class ZDF(Hoster): __name__ = "ZDF Mediathek" __type__ = "hoster" - __version__ = "0.81" + __version__ = "0.82" __pattern__ = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*' -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/hoster/ZDF.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/ZDF.py') diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index 4829f1bf8..ae52f95a5 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -11,6 +11,7 @@ class ZDF(Hoster): __name__ = "ZDF Mediathek" __type__ = "hoster" __version__ = "0.82" + __status__ = "stable" __pattern__ = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*' -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/hoster/ZDF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/ZDF.py') diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index ae52f95a5..f66c07a13 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -11,7 +11,7 @@ class ZDF(Hoster): __name__ = "ZDF Mediathek" __type__ = "hoster" __version__ = "0.82" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*' -- cgit v1.2.3 From d92b4f08f623295028cf59338ca33d2a55c29f7b Mon Sep 17 00:00:00 2001 From: jellysheep Date: Sun, 2 Aug 2015 19:35:01 +0200 Subject: [ZDF] Encode unicode characters when loading XML The XML file from the ZDF website often contains unicode characters, which lead to errors like `'ascii' codec can't decode byte 0xc3 in position 29: ordinal not in range(128)`. This change makes the plugin encode unicode characters to UTF-8 before parsing the XML data. --- module/plugins/hoster/ZDF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/ZDF.py') diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index f66c07a13..549dd718c 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -42,7 +42,7 @@ class ZDF(Hoster): def process(self, pyfile): - xml = etree.fromstring(self.load(self.XML_API % self.get_id(pyfile.url))) + xml = etree.fromstring(self.load(self.XML_API % self.get_id(pyfile.url)).encode("UTF-8")) status = xml.findtext("./status/statuscode") if status != "ok": -- cgit v1.2.3 From 2cf928db10224b5327f918dceaa13273753620ac Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 4 Aug 2015 18:06:42 +0200 Subject: Some fixes --- module/plugins/hoster/ZDF.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/ZDF.py') diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index 549dd718c..008a6241d 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -10,7 +10,7 @@ from module.plugins.internal.Hoster import Hoster class ZDF(Hoster): __name__ = "ZDF Mediathek" __type__ = "hoster" - __version__ = "0.82" + __version__ = "0.83" __status__ = "testing" __pattern__ = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*' @@ -42,7 +42,7 @@ class ZDF(Hoster): def process(self, pyfile): - xml = etree.fromstring(self.load(self.XML_API % self.get_id(pyfile.url)).encode("UTF-8")) + xml = etree.fromstring(self.load(self.XML_API % self.get_id(pyfile.url), decode=False)) status = xml.findtext("./status/statuscode") if status != "ok": -- cgit v1.2.3 From 9588e0d5e22e35515606a0950cda3efdba87d13a Mon Sep 17 00:00:00 2001 From: jellysheep Date: Tue, 4 Aug 2015 18:25:24 +0200 Subject: [ZDF] Encode file name / title The title used as file name is encoded in Latin-1. This commit enables pyload to download those files and display their names in the queue correctly. --- module/plugins/hoster/ZDF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/ZDF.py') diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index 008a6241d..b00077cce 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -51,7 +51,7 @@ class ZDF(Hoster): video = xml.find("video") title = video.findtext("information/title") - pyfile.name = title + pyfile.name = title.encode("Latin-1") target_url = sorted((v for v in video.iter("formitaet") if self.video_valid(v)), key=self.video_key)[-1].findtext("url") -- cgit v1.2.3 From f80576bd8c809932dd9f62483402ec18532699b2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 4 Aug 2015 22:08:42 +0200 Subject: Some fixes (2) --- module/plugins/hoster/ZDF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/ZDF.py') diff --git a/module/plugins/hoster/ZDF.py b/module/plugins/hoster/ZDF.py index b00077cce..f0b85d11a 100644 --- a/module/plugins/hoster/ZDF.py +++ b/module/plugins/hoster/ZDF.py @@ -10,7 +10,7 @@ from module.plugins.internal.Hoster import Hoster class ZDF(Hoster): __name__ = "ZDF Mediathek" __type__ = "hoster" - __version__ = "0.83" + __version__ = "0.84" __status__ = "testing" __pattern__ = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*' -- cgit v1.2.3