Ark/deluge-streaming
1
0
Fork 0
mirror of https://github.com/JohnDoee/deluge-streaming/ synced 2026-07-01 07:31:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug streaming completed files

Browse Source
This commit is contained in:
JohnDoee
2015-04-15 09:31:06 +02:00
parent 1b877cb918
commit 217e5dfa93
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
streaming/core.py
View File

@@ -105,9 +105,13 @@ class FileServeResource(resource.Resource):
if key not in self.file_mapping:
return resource.NoResource().render(request)
tf = self.file_mapping[key].copy()
tf.open()
return FilelikeObjectResource(tf, tf.size).render_GET(request)
v = self.file_mapping[key]
if isinstance(v, static.File):
return v.render_GET(request)
else:
tf = v.copy()
tf.open()
return FilelikeObjectResource(tf, tf.size).render_GET(request)
class AddTorrentResource(Resource):
isLeaf = True
@@ -156,7 +160,7 @@ class TorrentFile(object):
file_handler = None
def __init__(self, torrent_handler, file_path, torrent_file_path, size, chunk_size, offset, file_index):
self.torrent_handler = torrent_handler
self.file_path = file_path
self.file_path = self.path = file_path
self.torrent_file_path = torrent_file_path
self.first_chunk = offset / chunk_size
self.last_chunk = (offset + size) / chunk_size
@@ -544,5 +548,5 @@ class Core(CorePluginBase):
defer.returnValue({
'status': 'success',
'url': 'http://%s:%s/file/%s/%s' % (self.config.config['ip'], self.config.config['port'],
self.fsr.add_file(tf), urllib.quote_plus(os.path.basename(tf.file_path)))
self.fsr.add_file(tf), urllib.quote_plus(os.path.basename(tf.path)))
})