summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-12-30 23:55:08 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-12-30 23:55:08 +0100
commit7c989169b8bc5e61258304ba0513cc7f5459aced (patch)
tree5b2d00673414a22803094bb1520ac68640118576
parentUpdate some MultiHoster __pattern__ (diff)
parentversion bump (diff)
downloadpyload-7c989169b8bc5e61258304ba0513cc7f5459aced.tar.xz
Merge pull request #993 from synweap15/nopremium-multihook-fix
[NoPremium.pl] Transition to MultiHook fix
-rw-r--r--module/plugins/hooks/NoPremiumPl.py25
1 files changed, 11 insertions, 14 deletions
diff --git a/module/plugins/hooks/NoPremiumPl.py b/module/plugins/hooks/NoPremiumPl.py
index 84a019b8d..2347fc58a 100644
--- a/module/plugins/hooks/NoPremiumPl.py
+++ b/module/plugins/hooks/NoPremiumPl.py
@@ -1,31 +1,28 @@
# -*- coding: utf-8 -*-
-from module.plugins.internal.MultiHoster import MultiHoster
-from module.network.RequestFactory import getURL
+from module.plugins.internal.MultiHook import MultiHook
from module.common.json_layer import json_loads as loads
-class NoPremiumPl(MultiHoster):
+class NoPremiumPl(MultiHook):
__name__ = "NoPremiumPl"
- __version__ = "0.01"
+ __version__ = "0.02"
__type__ = "hook"
- __config__ = [("activated", "bool", "Activated", "False"),
+ __config__ = [("activated", "bool", "Activated", False),
("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"),
("hosterList", "str", "Hoster list (comma separated)", ""),
- ("unloadFailing", "bool", "Try standard download if download fails", "False"),
- ("interval", "int", "Reload supported hosts interval in hours (0 to disable)", "24")]
+ ("unloadFailing", "bool", "Try standard download if download fails", False),
+ ("interval", "int", "Reload supported hosts interval in hours (0 to disable)", 24)]
__description__ = "NoPremium.pl hook"
__license__ = "GPLv3"
__authors__ = [("goddie", "dev@nopremium.pl")]
- def getHoster(self):
- hostings = loads(getURL("https://www.nopremium.pl/clipboard.php?json=3").strip())
-
- return [domain for row in hostings for domain in row["domains"] if row["sdownload"] == "0"]
-
- def getHosterCached(self):
- return self.getHoster()
+ def getHosters(self):
+ hostings = loads(self.getURL("https://www.nopremium.pl/clipboard.php?json=3").strip())
+ hostings_domains = [domain for row in hostings for domain in row["domains"] if row["sdownload"] == "0"]
+ self.logDebug(hostings_domains)
+ return hostings_domains