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

added label support

Browse Source
This commit is contained in:
Anders Jensen
2018-09-02 10:42:28 +02:00
parent a20e623223
commit 9c4c6f5db2
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
streaming/core.py
View File

@@ -468,7 +468,7 @@ class TorrentHandler(object):
filesystem = self.get_filesystem(infohash) filesystem = self.get_filesystem(infohash)
if path: if path:
stream_item = filesystem.get_item_from_path(path) stream_item = filesystem.get_item_from_path(path)
if filesystem == stream_item: if stream_item and filesystem == stream_item and path != stream_item.id:
stream_item = filesystem.get_item_from_path('%s/%s' % (filesystem.id, path)) stream_item = filesystem.get_item_from_path('%s/%s' % (filesystem.id, path))
else: else:
stream_item = filesystem stream_item = filesystem
@@ -574,6 +574,7 @@ class StreamResource(Resource):
infohash = request.args.get('infohash') infohash = request.args.get('infohash')
path = request.args.get('path') path = request.args.get('path')
wait_for_end_pieces = bool(request.args.get('wait_for_end_pieces')) wait_for_end_pieces = bool(request.args.get('wait_for_end_pieces'))
label = request.args.get('label')
if path: if path:
path = path[0] path = path[0]
@@ -585,11 +586,16 @@ class StreamResource(Resource):
else: else:
infohash = infohash infohash = infohash
if label:
label = label[0]
else:
label = None
payload = request.content.read() payload = request.content.read()
if not payload: if not payload:
defer.returnValue(json.dumps({'status': 'error', 'message': 'invalid torrent'})) defer.returnValue(json.dumps({'status': 'error', 'message': 'invalid torrent'}))
result = yield self.client.stream_torrent(infohash=infohash, filedump=payload, filepath_or_index=path, wait_for_end_pieces=wait_for_end_pieces) result = yield self.client.stream_torrent(infohash=infohash, filedump=payload, filepath_or_index=path, wait_for_end_pieces=wait_for_end_pieces, label=label)
defer.returnValue(json.dumps(result)) defer.returnValue(json.dumps(result))
@defer.inlineCallbacks @defer.inlineCallbacks
@@ -763,7 +769,7 @@ class Core(CorePluginBase):
@export @export
@defer.inlineCallbacks @defer.inlineCallbacks
def stream_torrent(self, infohash=None, url=None, filedump=None, filepath_or_index=None, includes_name=False, wait_for_end_pieces=False): def stream_torrent(self, infohash=None, url=None, filedump=None, filepath_or_index=None, includes_name=False, wait_for_end_pieces=False, label=None):
logger.debug('Trying to stream infohash:%s, url:%s, filepath_or_index:%s' % (infohash, url, filepath_or_index)) logger.debug('Trying to stream infohash:%s, url:%s, filepath_or_index:%s' % (infohash, url, filepath_or_index))
torrent = get_torrent(infohash) torrent = get_torrent(infohash)
@@ -782,6 +788,15 @@ class Core(CorePluginBase):
core = component.get("Core") core = component.get("Core")
try: try:
yield core.add_torrent_file('file.torrent', filedump.encode('base64'), {'add_paused': True}) yield core.add_torrent_file('file.torrent', filedump.encode('base64'), {'add_paused': True})
if label and 'Label' in component.get('CorePluginManager').get_enabled_plugins():
label_plugin = component.get('CorePlugin.Label')
if label not in label_plugin.get_labels():
label_plugin.add(label)
try:
label_plugin.set_torrent(infohash, label)
except:
logger.exception('Failed to set label')
except: except:
logger.exception('Failed to add torrent') logger.exception('Failed to add torrent')
defer.returnValue({'status': 'error', 'message': 'failed to add torrent'}) defer.returnValue({'status': 'error', 'message': 'failed to add torrent'})