From 63b5b8b4aac285be9e11302535ca805040522167 Mon Sep 17 00:00:00 2001 From: Richard Schwab Date: Sun, 7 Apr 2013 01:47:20 +0200 Subject: Removing MegaUploadCom leftovers --- module/plugins/crypter/SerienjunkiesOrg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/SerienjunkiesOrg.py') diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py index dfe34ff6e..5cf2454c1 100644 --- a/module/plugins/crypter/SerienjunkiesOrg.py +++ b/module/plugins/crypter/SerienjunkiesOrg.py @@ -17,7 +17,7 @@ class SerienjunkiesOrg(Crypter): ("changeNameDJ", "Packagename;Show;Format;Episode", "Take DJ.org name", "Show"), ("randomPreferred", "bool", "Randomize Preferred-List", False), ("hosterListMode", "OnlyOne;OnlyPreferred(One);OnlyPreferred(All);All", "Use for hosters (if supported)", "All"), - ("hosterList", "str", "Preferred Hoster list (comma separated)", "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,FreakshareNet,FilebaseTo,MegauploadCom,HotfileCom,DepositfilesCom,EasyshareCom,KickloadCom"), + ("hosterList", "str", "Preferred Hoster list (comma separated)", "RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom,FreakshareNet,FilebaseTo,HotfileCom,DepositfilesCom,EasyshareCom,KickloadCom"), ("ignoreList", "str", "Ignored Hoster list (comma separated)", "MegauploadCom") ] __description__ = """serienjunkies.org Container Plugin""" -- cgit v1.2.3 From b1ee282d4f63ed76ea7fa0e37e61d17b0909ba78 Mon Sep 17 00:00:00 2001 From: Stefano Date: Mon, 15 Apr 2013 14:15:26 +0300 Subject: SerienjunkiesOrg: increased version after #85 --- module/plugins/crypter/SerienjunkiesOrg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/SerienjunkiesOrg.py') diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py index 5cf2454c1..0506d90fb 100644 --- a/module/plugins/crypter/SerienjunkiesOrg.py +++ b/module/plugins/crypter/SerienjunkiesOrg.py @@ -11,7 +11,7 @@ class SerienjunkiesOrg(Crypter): __name__ = "SerienjunkiesOrg" __type__ = "container" __pattern__ = r"http://.*?(serienjunkies.org|dokujunkies.org)/.*?" - __version__ = "0.36" + __version__ = "0.37" __config__ = [ ("changeNameSJ", "Packagename;Show;Season;Format;Episode", "Take SJ.org name", "Show"), ("changeNameDJ", "Packagename;Show;Format;Episode", "Take DJ.org name", "Show"), -- cgit v1.2.3 From cff3a4897e312a904a43ca0155dab922c6723d3a Mon Sep 17 00:00:00 2001 From: Stefano Date: Tue, 30 Apr 2013 20:25:20 +0200 Subject: SerienjunkiesOrg: fail if the link is blocked by the GeoIP see #93 --- module/plugins/crypter/SerienjunkiesOrg.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'module/plugins/crypter/SerienjunkiesOrg.py') diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py index 0506d90fb..5d887de02 100644 --- a/module/plugins/crypter/SerienjunkiesOrg.py +++ b/module/plugins/crypter/SerienjunkiesOrg.py @@ -30,6 +30,8 @@ class SerienjunkiesOrg(Crypter): def getSJSrc(self, url): src = self.req.load(str(url)) + if "This website is not available in your country" in src: + self.fail("Not available in your country") if not src.find("Enter Serienjunkies") == -1: sleep(1) src = self.req.load(str(url)) -- cgit v1.2.3 From 376b58ed62ae2fd27e56de960a00888accff98d4 Mon Sep 17 00:00:00 2001 From: Stefano Date: Tue, 30 Apr 2013 20:27:18 +0200 Subject: SerienjunkiesOrg: version increased after cff3a4897e312a904a43ca0155dab922c6723d3a --- module/plugins/crypter/SerienjunkiesOrg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/SerienjunkiesOrg.py') diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py index 5d887de02..3fcc12e36 100644 --- a/module/plugins/crypter/SerienjunkiesOrg.py +++ b/module/plugins/crypter/SerienjunkiesOrg.py @@ -11,7 +11,7 @@ class SerienjunkiesOrg(Crypter): __name__ = "SerienjunkiesOrg" __type__ = "container" __pattern__ = r"http://.*?(serienjunkies.org|dokujunkies.org)/.*?" - __version__ = "0.37" + __version__ = "0.38" __config__ = [ ("changeNameSJ", "Packagename;Show;Season;Format;Episode", "Take SJ.org name", "Show"), ("changeNameDJ", "Packagename;Show;Format;Episode", "Take DJ.org name", "Show"), -- cgit v1.2.3