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
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANMUx}GkMAr*{C3s?$v`S3h0
znJaSAK!D*wwW)*WG?s&=$0KfU+k5-kt!=rte@WcVzFlE)dt2`Pr>W0MOz*9-eSdU^
z(ITbK?pOJ*s~lU@pf3>LI`hhp3EU2koLCG>PCcA3Dg4rjFl)n*ORF@R_GvXc9nK3<
zp70}CDc9t!lF7WfP8I>X?ky_r>~r@wxt&xvq>;@g@x7L18S{LHGY51YI)xRS{L0BZ
z;e|cRmx$js5l{6cY|Zw#yiE|Cx^<JH#hYzgygWYeF-iH^y;cy<uy{Hr<0!jo)jLl9
zV^>ylbZl8R@#}XEgSY=B7UjGw6U=f-IB6PGuJcEqY1g{CXL3c2dD-)X_5MUV>VN0F
za%KAQhgH2?*JoGE>X7TIn(W6dm_O}B-G)W~cVE}6UXjpZ$@-<*u3`zp;d}gwm*!-N
zE585QE#th*R_qry<J>Si&e$;9UcEU@S;|}s&;6KuA@SzpglTrW-CdSX_2(4-cksfi
zH`3Mn&!%oT(9N;J@)bvjeBcq+?EX{jexLQ7PD?IVI5dMLwC!ng-u2(#J671fYZ3UU
zboEo+cdJx6Q4Vu8=N?_*iEP4??=|Iy|7%$r{;z?vGv8^uYB=M6{zvW40u^?0UU*w4
zf2bh0&|ziqp5*s4!lo?}J!s8yS^dzRJN`3jo_4-paPLNv`5|A;fZ{iXD@>nhY>6v)
zE+-y!e!p_ek1N{Z1r=?g!Yajwcq6K(pWGhvOZHWd-h)NHX)%Xl>tCr%c_-`f%lc}9
zxXGmi{WkxT%UnYXzfUdIT4VQ<nOkDte^)KHeks9<7PrfKA7*hynckg!rCOHpqjS;1
zgFg<toXaqN&11dj=EuI{Ojhe_qP9F#&1d;@N`0QHtd;(bHv$3KDRT2_X39+#jyktn
zmF3TqUWUHA95S2Mb+5Bvxgs;s+rQ=blUlR=Zl)~__IqbG%4Y^{(Pf_HZ~N|2)8?2p
z*O!IccpbUncr%HE^M1u=5u3Bd4bC2kn;+iMS7|6}=nj>RWO>&7U2Q=&+Y#P#jCQuV
zE1eEJzPBYoo?Bwp>2BTI^NMy{5DcCmT==H&)>7-8F3#UYT%wIxR$46L+-;NJ829qT
z`E`D+1|<qYxiKL>EV*x#d^FFne{a(<CCA{Y&XyVFli#<0bgsCbw<6_#RHXXW&z}^6
z)?Icgyx%Q7h41qx3tq{|lkY!NU-Gc!a1URxzQgyW*ELO9EjdLb3y!|tykJgPR$upj
zhXqSt9%be2oYSS<SF7D3V6mbnTCQEAxQn}T(vN@JKg~L#wlCIc>nE2&&fYCcc1A`g
zSMa_2!(lt?(OriFrJpk2M%ce+`NU&&eP@50%k@X!6%NhenmSkahxFR{QZuX{GAv~m
zt2sPXhv#TOkXvH)p_aQ$GEcM2^)+mEFSrq1<Zhv)P}Z|#yY`DGA0NHoz1LnB|Fo-W
pr}kcDAuYau-508x^_Tu*zdBdHI>MPng@J*A!PC{xWt~$(698l<3e^Ar

literal 722
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rm@;DWu&Co?cG
zu$OrHy0TyA<QFsL4cb2SCIbUgiKmNWh(&MhWbX{&K#{ipXXc(+Qa;Pa=yHmW376DH
zG45$uu_5NK4h5~?K6&oCS3q~(os#RV9SRW}T+5Y|x<t%lJGfn4y=om+hD5zMyye<0
zze`&(C(ZOpQ<F3o%bEN|=l#!f$1R`V<IWMjYy0=@^=h`h+~Yg4RQ2xcQr{wb$Nucj
zyD2$I`#xU0o1J~tV%f9>2i0va=Bllk>Z!5G+A5@bwbqMQbrR42p4zF}>u@#F;OoD~
z=D*_ZuRAtrExY=<FRiJTU%uV0XbQg?y5qqCmC^|+8*MKYmHjy0F5Y>o>0X>#*o5QH
zmkBG{mpY4Z<XmRx(J5k+NNvC4_<dg8tRJ7eZfhj|UvEEa0^6yG`^7s9n<l(r77t*U
zcF5>cL~KmMER};V)?FxOSib7rf%CidKI=H{aCEu6Q0+~R+rkzm4i-_CMTS#8XKrY*
ztbF!t^Jmef+St7tYxLrui&k_jYAA4NRH{_`sj+7Y`&#h_f~jks@SK=bu+>Q+=oS}4
zTPky3^MWU>Z<Y(Zve*&H)K=KIRLN&G&+Tn}A$<?DUNac%-_f=-ge}am{lP;A3AVn+
z2lS>U-cp@0jrX|LqzW59GtNn?thg9fNAhmw)~@(o$MUj7%Jp(n+?Isfss;rPH-+Xb
zvNN@?h`3eKd-F*8JBR4!N1GC_{SPxfkz%?eSo6s>;|;mosqKw<5dxlqljH60{WrF@
z+VfTR!k(}{Tdl9%dHL{eisRXYEWe{gMZBlIJ=ZLsoZ#(x#;2y<*yzgwc?Yf)e|#Jb
zuiUtFtMDb?d%;=7vknIKOUunG<_gpNUR?C%>6_)pYZ=lQBCfJXA7uQ%xZwXT6NV>@
ePqsDHGfsQ|E_q9=;${X01_n=8KbLh*2~7aATuW5|