fix #2359

6 files changed, 16 insertions, 15 deletions

diff --git a/module/plugins/hoster/FilefactoryCom.py b/module/plugins/hoster/FilefactoryCom.py
index e8f4204af..56b765049 100644
--- a/module/plugins/hoster/FilefactoryCom.py
+++ b/module/plugins/hoster/FilefactoryCom.py
@@ -13,7 +13,7 @@ def get_info(urls):
         m = re.search(r'Location: (.+)\r\n', h)
 
         if m and not re.match(m.group(1), FilefactoryCom.__pattern__):  #: It's a direct link! Skipping
-            yield (url, 0, 3, url)
+            yield (url, 0, 7, url)
         else:
             #: It's a standard html page
             yield parse_fileInfo(FilefactoryCom, url, get_url(url))
@@ -22,7 +22,7 @@ def get_info(urls):
 class FilefactoryCom(SimpleHoster):
     __name__    = "FilefactoryCom"
     __type__    = "hoster"
-    __version__ = "0.62"
+    __version__ = "0.63"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?filefactory\.com/(file|trafficshare/\w+)/\w+'
diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index f26680689..b7dc3a40a 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster
 class OneFichierCom(SimpleHoster):
     __name__    = "OneFichierCom"
     __type__    = "hoster"
-    __version__ = "0.98"
+    __version__ = "0.99"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?(?:\w+\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(?:es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?\w+)?'
@@ -66,7 +66,7 @@ class OneFichierCom(SimpleHoster):
 
                         info = {'name'  : name,
                                 'size'  : long(headers.get('content-length')),
-                                'status': 3,
+                                'status': 7,
                                 'url'   : url}
 
                     else:
diff --git a/module/plugins/internal/Base.py b/module/plugins/internal/Base.py
index 34ccde08b..6194ebfd9 100644
--- a/module/plugins/internal/Base.py
+++ b/module/plugins/internal/Base.py
@@ -27,7 +27,7 @@ def parse_fileInfo(klass, url="", html=""):
 class Base(Plugin):
     __name__    = "Base"
     __type__    = "base"
-    __version__ = "0.24"
+    __version__ = "0.25"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -49,7 +49,7 @@ class Base(Plugin):
                 'hash'   : {},
                 'pattern': {},
                 'size'   : 0,
-                'status' : 3 if url else 8,
+                'status' : 7 if url else 8,
                 'url'    : replace_patterns(url, cls.URL_REPLACEMENTS)}
 
         try:
@@ -286,10 +286,11 @@ class Base(Plugin):
 
     #: Deprecated method, use `_process` instead (Remove in 0.4.10)
     def preprocessing(self, *args, **kwargs):
-        self.pyfile.setStatus("starting")  #@NOTE: Set pyfile status from `queued` to `starting` as soon as possible to avoid race condition in ThreadManager's assignJob function
+        #@NOTE: Set pyfile status from `queued` to `starting` as soon as possible to avoid race condition in ThreadManager's assignJob function
+        #@NOTE: Move to ThreadManager in 0.4.10
+        self.pyfile.setStatus("starting")
 
         #@NOTE: Recheck info thread synchronization in 0.4.10
-        # time.sleep(1)
         return self._process(*args, **kwargs)
 
 
diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py
index 95f82cd0d..bc758e98e 100644
--- a/module/plugins/internal/Hoster.py
+++ b/module/plugins/internal/Hoster.py
@@ -34,7 +34,7 @@ if not hasattr(__builtin__.property, "setter"):
 class Hoster(Base):
     __name__    = "Hoster"
     __type__    = "hoster"
-    __version__ = "0.56"
+    __version__ = "0.57"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -139,7 +139,7 @@ class Hoster(Base):
         self.pyload.hookManager.dispatchEvent("download_processed", self.pyfile)
 
         try:
-            unfinished = any(fdata.get('status') == 3 for fid, fdata in pypack.getChildren().items()
+            unfinished = any(fdata.get('status') in (3, 7) for fid, fdata in pypack.getChildren().items()
                              if fid != self.pyfile.id)
             if unfinished:
                 return
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index a3dd44450..88a999d5e 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -11,7 +11,7 @@ from module.plugins.internal.misc import parse_name, replace_patterns
 class SimpleCrypter(Crypter):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.83"
+    __version__ = "0.84"
     __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'
@@ -95,7 +95,7 @@ class SimpleCrypter(Crypter):
                 info['error']  = "missing url"
                 info['status'] = 1
 
-            elif info['status'] == 3:
+            elif info['status'] in (3, 7):
                 try:
                     html = get_url(url, cookies=cls.COOKIES, decode=cls.TEXT_ENCODING)
 
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index aae1ba2a1..e74aac494 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -16,7 +16,7 @@ from module.plugins.internal.misc import (encode, parse_name, parse_size,
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "2.21"
+    __version__ = "2.22"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -142,7 +142,7 @@ class SimpleHoster(Hoster):
                 info['error']  = "missing url"
                 info['status'] = 1
 
-            elif info['status'] == 3:
+            elif info['status'] in (3, 7):
                 try:
                     html = get_url(url, cookies=cls.COOKIES, decode=cls.TEXT_ENCODING)
 
@@ -269,7 +269,7 @@ class SimpleHoster(Hoster):
                 self._preload()
                 self.check_errors()
 
-                if self.info.get('status', 3) != 2:
+                if self.info.get('status', 7) != 2:
                     self.grab_info()
                     self.check_status()
                     self.check_duplicates()