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

Изменил получение статуса

Browse Source
This commit is contained in:
inpos 2016-03-04 17:52:41 +03:00
parent 65380ffca4
commit 312fcf05e0
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pyrrent2http/engine.py
View File

@ -368,7 +368,7 @@ class Engine:
:rtype : SessionStatus :rtype : SessionStatus
:param timeout: pyrrent2http client request timeout :param timeout: pyrrent2http client request timeout
""" """
status = self._decode(self._request('status', timeout)) status = self.pyrrent2http.Status()
status = SessionStatus(**status) status = SessionStatus(**status)
return status return status

46
lib/pyrrent2http/pyrrent2http.py
View File

@ -526,28 +526,7 @@ def HttpHandlerFactory():
self.send_response(200) self.send_response(200)
self.send_header("Content-type", "application/json") self.send_header("Content-type", "application/json")
self.end_headers() self.end_headers()
torrentHandle = self.server.root_obj.torrentHandle status = self.server.root_obj.Status()
try:
info = torrentHandle.torrent_file()
except:
info = torrentHandle.get_torrent_info()
tstatus = torrentHandle.status()
status = {
'name' : info.name(),
'state' : int(tstatus.state),
'state_str' : str(tstatus.state),
'error' : tstatus.error,
'progress' : tstatus.progress,
'download_rate' : tstatus.download_rate / 1024,
'upload_rate' : tstatus.upload_rate / 1024,
'total_download' : tstatus.total_download,
'total_upload' : tstatus.total_upload,
'num_peers' : tstatus.num_peers,
'num_seeds' : tstatus.num_seeds,
'total_seeds' : tstatus.num_complete,
'total_peers' : tstatus.num_incomplete
}
output = json.dumps(status) output = json.dumps(status)
self.wfile.write(output) self.wfile.write(output)
def lsHandler(self): def lsHandler(self):
@ -887,6 +866,29 @@ class Pyrrent2http(object):
except Exception as e: except Exception as e:
logging.info('Encryption not supported: %s' % (e.args,)) logging.info('Encryption not supported: %s' % (e.args,))
def Status(self):
try:
info = self.torrentHandle.torrent_file()
except:
info = self.torrentHandle.get_torrent_info()
tstatus = self.torrentHandle.status()
status = {
'name' : info.name(),
'state' : int(tstatus.state),
'state_str' : str(tstatus.state),
'error' : tstatus.error,
'progress' : tstatus.progress,
'download_rate' : tstatus.download_rate / 1024,
'upload_rate' : tstatus.upload_rate / 1024,
'total_download' : tstatus.total_download,
'total_upload' : tstatus.total_upload,
'num_peers' : tstatus.num_peers,
'num_seeds' : tstatus.num_seeds,
'total_seeds' : tstatus.num_complete,
'total_peers' : tstatus.num_incomplete
}
return status
def stats(self): def stats(self):
status = self.torrentHandle.status() status = self.torrentHandle.status()
dhtStatusStr = '' dhtStatusStr = ''