diff options
Diffstat (limited to 'module')
| -rw-r--r-- | module/RequestFactory.py | 21 | ||||
| -rwxr-xr-x | module/network/Request.py | 7 |
2 files changed, 17 insertions, 11 deletions
diff --git a/module/RequestFactory.py b/module/RequestFactory.py index a2a3ad902..9b56f4778 100644 --- a/module/RequestFactory.py +++ b/module/RequestFactory.py @@ -29,17 +29,20 @@ class RequestFactory(): def getRequest(self, pluginName, account=None): self.lock.acquire() + cookieFile = None for req in self.requests: if req[0:2] == (pluginName, account): - self.lock.release() - return req[2] - name = pluginName - if account: - name += "_" - name += account - th = NamedTemporaryFile(mode="w", prefix="pyload_cookies_%s" % name, delete=False) - cookieFile = th.name - th.close() + cookieFile = req[2].cookieFile + break + + if not cookieFile: + name = pluginName + if account: + name += "_" + name += account + th = NamedTemporaryFile(mode="w", prefix="pyload_cookies_%s" % name, delete=False) + cookieFile = th.name + th.close() req = Request(cookieFile) self.requests.append((pluginName, account, req)) diff --git a/module/network/Request.py b/module/network/Request.py index 73ba06e2f..3340a74da 100755 --- a/module/network/Request.py +++ b/module/network/Request.py @@ -347,10 +347,13 @@ class Request: def clean(self): try: - remove(self.cookieFile) self.pycurl.close() except: - print "cant clean" + pass + try: + remove(self.cookieFile) + except Exception as e: + pass def getURL(url): """ |