mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-04 15:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Magnet link support in autoadd plugin

Browse source 
Check the watch folders for .magnet files which contain valid magnet links
and add them.
This commit is contained in:
Thomas Hipp 2012-02-22 17:44:00 +00:00 • committed by Calum Lind
commit bbeb11b1e7
1 changed files with 49 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

41
deluge/plugins/autoadd/autoadd/core.py
View file

@ -155,10 +155,13 @@ class Core(CorePluginBase):
self.config.save() self.config.save()
component.get("EventManager").emit(AutoaddOptionsChangedEvent()) component.get("EventManager").emit(AutoaddOptionsChangedEvent())
def load_torrent(self, filename): def load_torrent(self, filename, magnet):
try: try:
log.debug("Attempting to open %s for add.", filename) log.debug("Attempting to open %s for add.", filename)
if magnet == False:
_file = open(filename, "rb") _file = open(filename, "rb")
elif magnet == True:
_file = open(filename, "r")
filedump = _file.read() filedump = _file.read()
if not filedump: if not filedump:
raise RuntimeError, "Torrent is 0 bytes!" raise RuntimeError, "Torrent is 0 bytes!"
@ -168,7 +171,8 @@ class Core(CorePluginBase):
raise e raise e
# Get the info to see if any exceptions are raised # Get the info to see if any exceptions are raised
info = lt.torrent_info(lt.bdecode(filedump)) if magnet == False:
lt.torrent_info(lt.bdecode(filedump))
return filedump return filedump
@ -197,14 +201,25 @@ class Core(CorePluginBase):
if watchdir.get(option+'_toggle', True): if watchdir.get(option+'_toggle', True):
opts[option] = value opts[option] = value
for filename in os.listdir(watchdir["abspath"]): for filename in os.listdir(watchdir["abspath"]):
if filename.split(".")[-1] == "torrent":
try: try:
filepath = os.path.join(watchdir["abspath"], filename) filepath = os.path.join(watchdir["abspath"], filename)
except UnicodeDecodeError, e: except UnicodeDecodeError, e:
log.error("Unable to auto add torrent due to inproper filename encoding: %s", e) log.error("Unable to auto add torrent due to improper "
"filename encoding: %s", e)
continue
if os.path.isdir(filepath):
# Skip directories
continue
else:
ext = os.path.splitext(filename)[1]
if ext == ".torrent":
magnet = False
elif ext == ".magnet":
magnet = True
else:
continue continue
try: try:
filedump = self.load_torrent(filepath) filedump = self.load_torrent(filepath, magnet)
except (RuntimeError, Exception), e: except (RuntimeError, Exception), e:
# If the torrent is invalid, we keep track of it so that we # If the torrent is invalid, we keep track of it so that we
# can try again on the next pass. This is because some # can try again on the next pass. This is because some
@ -220,7 +235,12 @@ class Core(CorePluginBase):
continue continue
# The torrent looks good, so lets add it to the session. # The torrent looks good, so lets add it to the session.
torrent_id = component.get("TorrentManager").add(filedump=filedump, filename=filename, options=opts) if magnet == False:
torrent_id = component.get("TorrentManager").add(
filedump=filedump, filename=filename, options=opts)
elif magnet == True:
torrent_id = component.get("TorrentManager").add(
magnet=filedump, options=opts)
# If the torrent added successfully, set the extra options. # If the torrent added successfully, set the extra options.
if torrent_id: if torrent_id:
if 'Label' in component.get("CorePluginManager").get_enabled_plugins(): if 'Label' in component.get("CorePluginManager").get_enabled_plugins():
@ -234,7 +254,14 @@ class Core(CorePluginBase):
component.get("TorrentManager").queue_top(torrent_id) component.get("TorrentManager").queue_top(torrent_id)
else: else:
component.get("TorrentManager").queue_bottom(torrent_id) component.get("TorrentManager").queue_bottom(torrent_id)
# Rename or delete the torrent once added to deluge. else:
# torrent handle is invalid and so is the magnet link
if magnet == True:
log.debug("invalid magnet link")
os.rename(filepath, filepath + ".invalid")
continue
# Rename, copy or delete the torrent once added to deluge.
if watchdir.get('append_extension_toggle'): if watchdir.get('append_extension_toggle'):
if not watchdir.get('append_extension'): if not watchdir.get('append_extension'):
watchdir['append_extension'] = ".added" watchdir['append_extension'] = ".added"