codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-12 04:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[#2463] [AutoAdd] Fix not loading torrents

Browse Source 
The owner attribute for tm.add() method was moved to options dict
This commit is contained in:
Calum Lind 2014-07-02 19:32:32 +01:00
parent f1a9e2ae32
commit 48fb321699
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py
View File

@ -41,6 +41,8 @@
from deluge._libtorrent import lt
import os
import logging
import base64
from deluge.plugins.pluginbase import CorePluginBase
import deluge.component as component
import deluge.configmanager
@ -164,10 +166,11 @@ class Core(CorePluginBase):
def load_torrent(self, filename, magnet):
try:
log.debug("Attempting to open %s for add.", filename)
if magnet == False:
_file = open(filename, "rb")
elif magnet == True:
if magnet:
_file = open(filename, "r")
else:
_file = open(filename, "rb")
filedump = _file.read()
if not filedump:
raise RuntimeError, "Torrent is 0 bytes!"
@ -180,7 +183,7 @@ class Core(CorePluginBase):
if magnet == False:
lt.torrent_info(lt.bdecode(filedump))
return filedump
return base64.encodestring(filedump)
def split_magnets(self, filename):
log.debug("Attempting to open %s for splitting magnets.", filename)
@ -238,7 +241,7 @@ class Core(CorePluginBase):
# without them is valid, and applies all its settings.
for option, value in watchdir.iteritems():
if OPTIONS_AVAILABLE.get(option):
if watchdir.get(option+'_toggle', True):
if watchdir.get(option+'_toggle', True) or option == "owner":
opts[option] = value
# Check for .magnet files containing multiple magnet links and
@ -296,16 +299,11 @@ class Core(CorePluginBase):
continue
# The torrent looks good, so lets add it to the session.
if magnet == False:
torrent_id = component.get("TorrentManager").add(
filedump=filedump, filename=filename, options=opts,
owner=watchdir.get("owner", "localclient")
)
elif magnet == True:
torrent_id = component.get("TorrentManager").add(
magnet=filedump, options=opts,
owner=watchdir.get("owner", "localclient")
)
if magnet:
torrent_id = component.get("Core").add_torrent_magnet(filedump, opts)
else:
torrent_id = component.get("Core").add_torrent_file(filename, filedump, opts)
# If the torrent added successfully, set the extra options.
if torrent_id:
if 'Label' in component.get("CorePluginManager").get_enabled_plugins():
@ -321,7 +319,7 @@ class Core(CorePluginBase):
component.get("TorrentManager").queue_bottom(torrent_id)
else:
# torrent handle is invalid and so is the magnet link
if magnet == True:
if magnet:
log.debug("invalid magnet link")
os.rename(filepath, filepath + ".invalid")
continue