diff options
author | Stefano <l.stickell@yahoo.it> | 2014-03-25 00:16:34 +0100 |
---|---|---|
committer | Stefano <l.stickell@yahoo.it> | 2014-04-21 17:09:19 +0200 |
commit | 29b54aaa68ac146db030c51586dc4ac0a28bf950 (patch) | |
tree | 8beffdb1f93c2052a5f0425906305f55e8d2256b | |
parent | 1fichier: fixed #553 (diff) | |
download | pyload-29b54aaa68ac146db030c51586dc4ac0a28bf950.tar.xz |
Merge pull request #561 from vuolter/s/hoster/UptoboxCom
XFileSharingPro: Fixed expired session detection
Fixes #558
(cherry picked from commit b87861c6f906e826b6834da7fe0745b7cb2aee56)
-rw-r--r-- | pyload/plugins/hoster/UptoboxCom.py | 1 | ||||
-rw-r--r-- | pyload/plugins/hoster/XFileSharingPro.py | 38 |
2 files changed, 19 insertions, 20 deletions
diff --git a/pyload/plugins/hoster/UptoboxCom.py b/pyload/plugins/hoster/UptoboxCom.py index 4568526cb..b4b35ab20 100644 --- a/pyload/plugins/hoster/UptoboxCom.py +++ b/pyload/plugins/hoster/UptoboxCom.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - ############################################################################### # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/pyload/plugins/hoster/XFileSharingPro.py b/pyload/plugins/hoster/XFileSharingPro.py index 6dec8e02a..c4c05f604 100644 --- a/pyload/plugins/hoster/XFileSharingPro.py +++ b/pyload/plugins/hoster/XFileSharingPro.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. - - @author: zoidberg -""" +############################################################################### +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, +# or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see <http://www.gnu.org/licenses/>. +# +# @author: zoidberg +############################################################################### import re from random import random @@ -36,7 +36,7 @@ class XFileSharingPro(SimpleHoster): __name__ = "XFileSharingPro" __type__ = "hoster" __pattern__ = r"^unmatchable$" - __version__ = "0.26" + __version__ = "0.27" __description__ = """XFileSharingPro common hoster base""" __author_name__ = ("zoidberg", "stickell") __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it") @@ -225,8 +225,8 @@ class XFileSharingPro(SimpleHoster): self.setWait(3600, True) self.wait() self.retry(25) - elif 'countdown' in self.errmsg or 'Expired session' in self.errmsg: - self.retry(3) + elif 'countdown' in self.errmsg or 'Expired' in self.errmsg: + self.retry() elif 'maintenance' in self.errmsg: self.tempOffline() elif 'download files up to' in self.errmsg: |