codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

webui:torrent_list:use sclient.get_torrents_status instead of async

This commit is contained in:
Martijn Voncken 2008-02-25 17:44:32 +00:00
parent 9c0dc5f9e3
commit d1b8075fe6
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deluge/ui/webui/webui_plugin/templates/deluge/config.html
View File

@ -14,7 +14,6 @@ $for group in groups:
$else: $else:
<li><a href="/config/$page">$pages[page].title</a></li> <li><a href="/config/$page">$pages[page].title</a></li>
</ul> </ul>
</div>
<!--form block--> <!--form block-->
<div class="panel" id="config_panel"> <div class="panel" id="config_panel">
@ -31,8 +30,6 @@ $if error:
<input type="submit" name="submit" id="submit" value='$_("Save")'> <input type="submit" name="submit" id="submit" value='$_("Save")'>
</form> </form>
</div> </div>

12
deluge/ui/webui/webui_plugin/utils.py
View File

@ -232,14 +232,12 @@ def get_torrent_status(torrent_id):
def get_torrent_list(): def get_torrent_list():
""" """
uses async. returns a list of storified-torrent-dicts.
""" """
torrent_ids = proxy.get_session_state() #Syc-api. torrent_ids = proxy.get_session_state()
torrent_dict = {}
for id in torrent_ids: torrent_dict = proxy.get_torrents_status(torrent_ids, TORRENT_KEYS)
async_proxy.get_torrent_status(dict_cb(id,torrent_dict), id,
TORRENT_KEYS)
async_proxy.force_call(block=True)
return [enhance_torrent_status(id, status) return [enhance_torrent_status(id, status)
for id, status in torrent_dict.iteritems()] for id, status in torrent_dict.iteritems()]