ukamnya
/
script.module.pyrrent2http
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

ожидание завершения желательно

sandbox1
inpos 2016-03-11 22:32:02 +03:00
parent 27da35cc4d
commit 453ed45166
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pyrrent2http/engine.py
View File

@ -13,7 +13,7 @@ import mimetypes
import xbmc import xbmc
from error import Error from error import Error
from . import SessionStatus, FileStatus, PeerInfo, MediaType, Encryption from . import SessionStatus, FileStatus, PeerInfo, MediaType, Encryption
from util import can_bind, find_free_port, ensure_fs_encoding from util import can_bind, find_free_port, localize_path
import threading import threading
LOGGING = True LOGGING = True
@ -151,7 +151,7 @@ class Engine:
path = path.replace("smb:", "").replace("/", "\\") path = path.replace("smb:", "").replace("/", "\\")
else: else:
raise Error("Downloading to an unmounted network share is not supported", Error.INVALID_DOWNLOAD_PATH) raise Error("Downloading to an unmounted network share is not supported", Error.INVALID_DOWNLOAD_PATH)
if not os.path.isdir(ensure_fs_encoding(path)): if not os.path.isdir(localize_path(path)):
raise Error("Download path doesn't exist (%s)" % path, Error.INVALID_DOWNLOAD_PATH) raise Error("Download path doesn't exist (%s)" % path, Error.INVALID_DOWNLOAD_PATH)
return path return path
@ -354,7 +354,7 @@ class Engine:
:param wait_timeout: Time in seconds to wait until pyrrent2http client shut down :param wait_timeout: Time in seconds to wait until pyrrent2http client shut down
""" """
#self.wait_on_close_timeout = wait_timeout self.wait_on_close_timeout = wait_timeout
def close(self): def close(self):
""" """
@ -364,7 +364,7 @@ class Engine:
if self.is_alive(): if self.is_alive():
self._log("Shutting down pyrrent2http...") self._log("Shutting down pyrrent2http...")
self.pyrrent2http.shutdown() self.pyrrent2http.shutdown()
'''finished = False finished = False
if self.wait_on_close_timeout is not None: if self.wait_on_close_timeout is not None:
start = time.time() start = time.time()
while (time.time() - start) < self.wait_on_close_timeout: while (time.time() - start) < self.wait_on_close_timeout:
@ -376,7 +376,7 @@ class Engine:
self._log("PANIC: Timeout occurred while shutting down pyrrent2http thread") self._log("PANIC: Timeout occurred while shutting down pyrrent2http thread")
else: else:
self._log("pyrrent2http successfully shut down.") self._log("pyrrent2http successfully shut down.")
self.wait_on_close_timeout = None''' self.wait_on_close_timeout = None
self._log("pyrrent2http successfully shut down.") self._log("pyrrent2http successfully shut down.")
self.started = False self.started = False
self.logpipe = None self.logpipe = None