diff options
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/crypter/FilecryptCc.py | 2 | ||||
| -rw-r--r-- | module/plugins/crypter/RelinkUs.py | 4 | ||||
| -rw-r--r-- | module/plugins/hoster/RealdebridCom.py | 2 | ||||
| -rw-r--r-- | module/plugins/hoster/RehostTo.py | 7 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleCrypter.py | 16 | 
5 files changed, 17 insertions, 14 deletions
| diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py index 726389ca1..af31dc743 100644 --- a/module/plugins/crypter/FilecryptCc.py +++ b/module/plugins/crypter/FilecryptCc.py @@ -74,7 +74,7 @@ class FilecryptCc(Crypter):          self.logInfo(_("Folder is password protected"))          password = self.getPassword() -         +          if not password:              self.fail(_("Please enter the password in package section and try again")) diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index 5a3eca803..c5a3f1011 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -129,9 +129,9 @@ class RelinkUs(Crypter):      def unlockPasswordProtection(self):          password = self.getPassword() -         +          self.logDebug("Submitting password [%s] for protected links" % password) -         +          if password:              passwd_url = self.PASSWORD_SUBMIT_URL + "?id=%s" % self.fileid              passwd_data = {'id': self.fileid, 'password': password, 'pw': 'submit'} diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py index 49cfc01f7..5a31cc388 100644 --- a/module/plugins/hoster/RealdebridCom.py +++ b/module/plugins/hoster/RealdebridCom.py @@ -3,7 +3,7 @@  import re  from random import randrange -from urllib import quote, unquote +from urllib import unquote  from time import time  from module.common.json_layer import json_loads diff --git a/module/plugins/hoster/RehostTo.py b/module/plugins/hoster/RehostTo.py index 8cfe833fd..5dd17e374 100644 --- a/module/plugins/hoster/RehostTo.py +++ b/module/plugins/hoster/RehostTo.py @@ -1,6 +1,6 @@  # -*- coding: utf-8 -*- -from urllib import quote, unquote +from urllib import unquote  from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo @@ -22,12 +22,11 @@ class RehostTo(MultiHoster):      def handlePremium(self): -        data     = self.account.getAccountInfo(self.user) -        long_ses = data['long_ses'] +        data = self.account.getAccountInfo(self.user)          self.download("http://rehost.to/process_download.php",                        get={'user': "cookie", -                           'pass': long_ses, +                           'pass': data['long_ses'],                             'dl'  : self.pyfile.url},                        disposition=True) diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index c83ee8a78..bfc473801 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -125,13 +125,17 @@ class SimpleCrypter(Crypter, SimpleHoster):              self.info.update(self.getInfo(self.pyfile.url, self.html))              self.logDebug("File info (AFTER): %s"  % self.info) -        name = self.info['name'] -        url  = self.info['url'] +        try: +            name = self.info['name'] +            url  = self.info['url'] + +            if name and name != url: +                self.pyfile.name = name +            else: +                self.pyfile.name = self.info['name'] = urlparse(name).path.split('/')[-1] -        if name and name != url: -            self.pyfile.name = name -        else: -            self.pyfile.name = self.info['name'] = urlparse(name).path.split('/')[-1] +        except Exception: +            pass          folder = self.info['folder'] = self.pyfile.name | 
