From 5374d237a774abb2a34756c1ce7cec3611c3081d Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Sat, 24 Jul 2021 10:14:47 +0100
Subject: [PATCH] [AutoAdd|3295] Correctly fix auto-adding magnets

Properly fix adding magnets, first attempted in previous commit 2e466101fc20a

add_torrent_magnet does not return a deferred so wrap in maybeDeferred.

Fixed broken test due to new deluge website icon
---
 deluge/plugins/AutoAdd/deluge_autoadd/core.py |  11 +++++++++--
 deluge/tests/data/deluge.png                  | Bin 722 -> 1126 bytes
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/deluge/plugins/AutoAdd/deluge_autoadd/core.py b/deluge/plugins/AutoAdd/deluge_autoadd/core.py
index 668f461f8..9a2260610 100644
--- a/deluge/plugins/AutoAdd/deluge_autoadd/core.py
+++ b/deluge/plugins/AutoAdd/deluge_autoadd/core.py
@@ -21,7 +21,9 @@ import shutil
 from base64 import b64encode
 
 from twisted.internet import reactor
+from twisted.internet.defer import maybeDeferred
 from twisted.internet.task import LoopingCall, deferLater
+from twisted.python.failure import Failure
 
 import deluge.component as component
 import deluge.configmanager
@@ -325,6 +327,9 @@ class Core(CorePluginBase):
                     os.remove(filepath)
 
             def fail_torrent_add(err_msg, filepath, magnet):
+                if isinstance(err_msg, Failure):
+                    err_msg = err_msg.getErrorMessage()
+
                 # torrent handle is invalid and so is the magnet link
                 log.error(
                     'Cannot Autoadd %s: %s: %s',
@@ -337,8 +342,10 @@ class Core(CorePluginBase):
             try:
                 # The torrent looks good, so lets add it to the session.
                 if magnet:
-                    d = component.get('Core').add_torrent_magnet(
-                        filedump.strip(), options
+                    d = maybeDeferred(
+                        component.get('Core').add_torrent_magnet,
+                        filedump.strip(),
+                        options,
                     )
                 else:
                     d = component.get('Core').add_torrent_file_async(
diff --git a/deluge/tests/data/deluge.png b/deluge/tests/data/deluge.png
index e39cd0c7eebdf68688339b82aebdeecfe9f5fc9c..6787fa39a7a5ced846dc6c11174ea312923c396e 100644
GIT binary patch
literal 1126
zcmV-s1eyDZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000CnNkl<ZcmZOd
z1aP`c4C8d26v;3U0ML6iKuMMa!8ONN+qS*i*4nmh+xi&WYuk7@+qP}r<z?n{HQuT{
z@5Q(>q9XH0)eqMs#-e~P5MPCv)cBAKK;l9KFm%e{kdjx@$W}WsRMM&_g1#z)Lc?xS
zBarxGB5gG7A~c?Ui3AWni?k$12c5ryM#&(;C~F27_k9GW1D`<5z%1cHR&dGn2?LPm
zKLqqx`#f0XFBm;GyhQC_5tX&FAvo-|v`R?u4gwlZKI<SCXgKAZXvGI5dhQ7i#?-3_
zh_t4W_4f!c?f)2}Z0U9pYC>SiHBxsh{4WB!u72hoa)EAZo)a$oTR|`P3Dne=$KiU7
z3fG%>nus2XdXr8I5pS00ez2ndyVogus9=OS1@wD9c%%Ts-VY(toN5;#@AZouL#90z
z`U?S_Rz3+`Ry~a_oPug23Zc&Ulh9$=<6xFPyGKN)l}`y5{=v}d>>GQ(&1JB_iwLMW
z>IhUHQN%@SkIIKm^Djcn8K)q^m;_aZ<%4e5`}c^bJ??}M@gmjoe)l?M9u){TCPR!Z
z6OjfJliq@DSN?>pSN?zriEl!;C07Ce58{XBQ6RYq(CvO7!f<VIK&f-QWAB(&mZBBG
zI}Fn&!ra_Xn0)1l@1Wk;VmHD~DNu9lF{m}>D70R1=N=bY&%YyF_|z*GaCn9l6C`uO
z4On}Z$+ukk9qNoO;G#`tT*6&{>Lirz9Z32+)nFGi(qJ!!Psyf5RdM%~bt<er`2!0W
zzW+rkMvod1c!WmNF7TQPS~cC9)O#HP@k4T<!T7^O&S*313_GIP@s7s=I<I_MwBaRh
z1pLY;o+TYRFSzUwP-|o!o_v`elM`CbyCnqt<c$E1-3T1Au8XcX1k@anOHYKy<b5{3
zMm2<hKfRfOA8ApvEd!cQJ?_$ivs|p#rdK>l#MnXEVh9P}c=HrI%`<>QNMW<#+%F`6
za)66f8(9SAgZCz&YX-y(&H+9>EvZ7l<KDDj9}5_o%Zn}Bo^rU*5mS&8aqMy0r8~Jq
zL-!O!TQdZyIHC!=Ja2(s>B!HnPK7XZAQEj{RQNdy*mUtXXg}{fh?HzF<t((Aca!gj
z@k4mmZm4AcT3IKx^YS24uG2zs--{cR4)gLj4H=V@-{B{u;e^AC4s$O+_ode<H3c~d
z6d7>E>$9MoR%(um|3ILn>BR*NiJXcnj(sbH5ICreTONlfbBYUjlKB3&@|wgZzFk7K
z@<ee7jkKh>SzBXx4(|L2J(}X(K)`kKY3*1)?*#G;I@h_6hD6um_aMTY3YDEL_#3UC
z8kjrb0Hp^Oe8ZJ248>4VMqzuxgxvxh<!U!CC_KBM*jsW(I3gf+jHI_K=;ZO@=ndY7
seqZH^dbumTBN8eOP`l83gD<822i2V~dsssRBme*a07*qoM6N<$f@CKO)c^nh

literal 722
zcmV;@0xkWCP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x00(qQO+^RS2@e)E4N|w2*#H0nbV)=(R5*=&lS^n5Q51&%%$>}ncbZHx
z(_~CE3L3E%3zlkKR5$9vQm6~b&euv%i*DR>*M*26Sg=KRA|i?uH(iJeMMX+|K&ez(
z=)<(u+D_86X_A>tW+oXo7HpIBEbsZw$2sTT3v3hJJ^k(1dj^he$GB=GF5J2&v>n_(
z&AHuVY+}Cg(cNon)i|b>pus0S(QPKIl}RYFJ33U0t19T~ei-Nd%DE+tK-F0=_5R~G
z`d;6z#*(cEC$98`WjXZr+jxRk)m6CQz$A5$B(Xixa(4K~hZl+3g5F*xR*=W%rV}AQ
zbwd;gY|{XYEOG`IWry5B_nv;5`0`5IC}IDvKbnvR%2?lXxG{o|>;o520G7fs@>pG5
zfSM%1=&sOn0H><%z|Xrb^DIHQK}6G`ChUwxp@aem1Qi6LF_iOZu!K2z=H|2W6@q<T
zy|H{QU*{Egh@yaSM1dlCA^9l0ln1RB;1Ol4<P6A?aJ51pQrZdthGheegP`Pv?57aw
zIJj8?hH-(VB223c+qRBWj^HZm05HF}hNV;nRzZj0;XoJ$j^n^Cm0{W?n3fI4Dw23S
zPBsaWsyYe)t62@R3oCf{egx@s8b#BBUbJA_B`|P6*%F+hJ~cQvSlV=r*~Dk=KwIa<
zf??MGRx`+CHKbE1<kmB=Z3|_Gfo@n3NfDD@Ki>Z{J374e9nid1{IxsQ-09)nWI@ef
zYEH#+at+H%Nvx-nU`s{JOniScGW4JyKnke*OhGZ!*wWf@=??D^nsb`LQI8uQo^uLT
zDfe@7?B(pI$9({109e%o8^Hna0igf7GyvoQ<hFu;0haIXW3*i%vj6}907*qoM6N<$
Eg0oypRR910