From 7aecb9ac68ca363a5943c8aae65952db9a1e323d Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 19 Jul 2015 10:35:34 -0600 Subject: [PATCH 1/4] Readded SpeedCD to solution --- src/Jackett/Content/logos/speedcd.png | Bin 0 -> 34498 bytes src/Jackett/Indexers/SpeedCD.cs | 15 ++++++++++----- src/Jackett/Jackett.csproj | 4 ++++ 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 src/Jackett/Content/logos/speedcd.png diff --git a/src/Jackett/Content/logos/speedcd.png b/src/Jackett/Content/logos/speedcd.png new file mode 100644 index 0000000000000000000000000000000000000000..7dd781b46e83798dc8c0574dbfd5a3861f02c426 GIT binary patch literal 34498 zcmeFabx@qk*60m^;O@bLySoN=2(G~f*9q?K8X&j?39bni+}+*XAuzZEyJYWk&fbS} z-qc&)y;a{onJQ*x_3E`&_iuHtryq(LLf^_uAj09ofq{V`N=b?;J-rq@{qVs+Jw2Z` zo~%8+zyc*T?ZLp1I)DCv$I~L=fq}s(n2U(KeQRdxU~6w?3nZ2j5g`WJ*_xPJ8H0hj z%%>}xswnSa@n0>U3(JJ~e3Y?O!h|7K5)Svlh@qf)4T~Zj@;Yk{Q?U(IObimQH!}nx zD#|AUQ;`lK3~m;B^L2KVe@;kP|LvN4j^%XY)%MUs^^Cwy$ys{k2y`n9LV_f#BD)Vl zp)eups((*s_u3}I8(%mwAQ%cvrO|8qds1+)YcD=NT9Q`iW-xG<33wQ=R=LzxCj8(> z^`q!5Brr%3S>H-#!42B_os?K*pTZXbj^F%87D_XF3IaN}WXq!{=H3~bH8YwUrJu@cvZ7s|)_A)EXN(o7dV)A1_Yynfv#35ga?M%)*Ip-3VV!!F6J6sAI~DoJq4Z});bSVz1*hPM}t#qTbtQG)rS z?^i|sNrY;Vx<z0P$@2Q6mTDlxVEX)KR-CT>c1-tew$fGvxVb0g)c2)?FNE)=n!X zhVBmGFI;r6ae#p@Bqa#N-MAHMB@hjv7l4s3&X8!nVy&n7gj>r-vGbi+6A zKVK`aQz`XZNWa=b*<#y*GEQO@QyamBUrUkYtf}g!K??a(9J7hZ)L_RBKe$m@# z>?Vc>ysC7edu@qW9OUTB-bwLgXwJilrXlH`pdp;Us4$CLgjJeVy;AAyqlqB&M$-H1 zGzWRu9jg4qGq12^3=s7?HC`T@Y#p<)j%86oVuD7oWU*qg#6c5B*(dF4yA-?^zh5{9pyRYrF^)2EIEFji!z2H%Uryy22tl0oBX4sjAmV*3|ZU!W!I*i zANZb(_bT_+Kk_dm5Hz4F5y+qx5QcI1y4c^_@)0ohESxBcyz6))l4}rekhm5QQ#Zz! zGbJ7=jvQg$t+PS4Vcl)rokIad@tQ(LZeQ*wMM{`i=9{t9*G;WF&7+z|n?NmY&0Gytt#_5;rRk;Q(+#B!`KbAI z@^SLT8Pld66(==)HHEdWDz;{!7RqX@Ydj514Y5sYyUIF_;+o<->pdgy`JoYm=a7mC zvm(SvP9X2dF#E)0I;vBuueQ>+Jo{Lc&93 z{00~j1sGECx|e#JHl-ad-oIOO8^1_TtxRn{ELbQ%;y5xt3SRs)$o7dkLzC5hw4+yK zRdH)f5dKpy{`%o(1E}uXBe& z5t(&Dm_pHhrG8s&rLWC;zkeuweYKM`95ZZ=6!_L_cX|}sVA~+P!wZ2jFgQ>>NH7W* zqJcZcoXGAxwkTr1BKku#L3BCQlv#nhoL-upMxcnnf^VL)o~>T6o54hLa7rUxL&{19 zpPPZEjKjvNdFAf#EOPebX#=+l!YG}Wf5hU zQh744Qk;mbS@?OHnEhj8KD-w$dMy`MW4dp;ZQ?XgVjTGOq01(`mXRM7su>#SucpT8CM`pu{oDz~8MH%(gO&XYA2`!MpB@j<+R@fxYjT5R)aeN{ zwwp>UxWDqfcU^$nz`apv%yf(E1JO0~g{pmaO|%+Rnhj0NmOOz&B$MVBqSVB7wd~<%yK!lve z#;55jeWuc9KELNT5odZj5|JLC?&-yFv#7t2UE{t37+$eJwguIrIIN9}J%;b_Hu4VZ zoPKjS{kpJ)uKrCurJP64df#E6?;&nNp{F6OA*HNN$FlCot*P4Gv4K2gPVV;>CDacs_W`v1#8L6j`DtZpkdCL@~E^?p;7Pr&7sho$Wri>p!UP!ENIc& zqSZO`Y-~~D3M$ZlCJbaM1S5Mt0l2A2Rg_qw3n{oY-^$cWJhMF#dm_QOCK zHWs7T_0+-4@L1AVR^n-5T#L0w?)`r2!K?Cx?)GlN<~|ozX5DkO+ru{JMP~v~&I+=^ zrU$V%)uY+XmkZ_5{M)!!adD535J_iu09N`1Ffd*ia}^B-4LMmJfUPxyfsw7DF@uXW z@aZ7>bS@Qi0U7`-jU9*$jZMvM_(?zwEhNO|M*Jk|>~c(UKoMgzb4fQlV`Vpa6@Z&1 zfZK>fPymk4h3CnEwXuT%v5U2pjXjSGKgl0{d7j??Y-S`O{-cY7B|nMK&w#`la&L)6 zZ0(GR*%>(K0Zhzn#GKp=%36Fn0*4?8Ol6ASS_9wY*APw)8b zj7)fxM8*FR?n&Y&F>`PL@-Q+wJ3BKtvohG)nKCkSb8|B?u`sf*&_DH{w|BL1FmR!_ zu_yi0$v^#w8ruWx%z+N(wl>5+{TdkBIy&%^ko*kvug5>;WexmSARGICuzRA&=wbk5 zWM*Ju{BK4^fPdKl9qp|C7@84)(b&q^+Stay{>hH{zuE!+dHDaA`M-tym->GU{FD

yZe-@^XW(q6?CXw0Z&Y;Wsm2QU_MdYTI9f1AC7xyfJ2 z`8Q8LHUHz-ja|(D2eY4=Kh6GF3V&vZ?`f_)B6h|G4z_kGwzgIRf3C8>?w_7+pMI_? zVk&iW8zWn1dul$$=O%yU`!8?Cq6QAe0#BCg^h})e%q%L*tUN3nJnYQ$OdLE+On-Co zXU}Io@-myf^oeD33E{}>rK82qoi{Jrnr{1^dvOl<9} z4IBi_tqn|#8G$yYe2jlJ{;lV~Ruzwkt(C3a)3A&MSos+LTl0Uldb&@2`{!+{fW4B0 zFtL=F2nRDa2M0Y11M}bA{H@=A^&@HvaQwMFglquD_D@N*|68)3QvOE)5H>LV_tt+Z ztjq=eEI&rJ0COXrzXor>VPtG%WCEaP;W9F!XJ$5Lr{`kkLezpML*n{r8A}pUTi91&c*0yF5H}~EL;Fq4tg$jZbN!zLpEc2 z11?TBdQL+lCIFX#AqSV?6Wc#S{1-R>5lYhhXWm_(rQv68l#Sp2d+T3$|D%8d4eacV zf0ieHl7H5xe^vaauK#-Q{ZZz43;;h%zX0H8^)NQ#WBj+)zlQbP%=|yo`M*Q(r~kj1 z|Iaa;&5Uh+Rek<+^+&J&*@?ZaiG#C&ow1PV(|-Ej6vjWj{=3<8_y2vDJTdxXXIh#6 zUnIib!0G=k4gb4c_5V2y|5?EQ|4YM9;D1I3m>JlZ8XE~P{&NBUv*CZ2xj*yy?>pJqT$gjoUxPHy&nf5oXXFz@}{>JrdKF_qjaXka_ zYw|6Q!syaung+f$W#yveqQYdmxrBa$ z60=mNzJ81$eJI5j;IaB(;2+-P_=ZR4xqZ7 zqozx(l^<%cpKb#`y)7r)frHB@lk#I;odTd>2q}s}ruE>6q-a5QZ3rRyi8Vp{@~Ma6 zLt${iiP95H7}v0lc(`L1$}%|wU1ax+UI7_QcW*ZZD6d4|1c_(xciyeFX|E+R&I#3&1f%Z%`XAz9N}s>!t`AZ!b7E0Dk| zpSe4hFJ8fkaq$#WU0;Dz?S+RPChm^=9KgtV?gO$Xjw|D1W~%I5{}X1pzz3w*e*bYg0M8C&S7v3If1QG4L0f z3F8*IYe-Y16wNa(Alw--NYSbjccD(@=7tK!A#!yzQewj|Brr%If^LeCqOXSz**X#5b~VIZN(v)fxFJAIjarP%inI!`OXbK?|8Du3OX}T&UQV zQ;E?8dpgxOcwF+$)|f+KUu1_}1ASaCk2 zV4RMMG}fa= zl56%dK}Y}zG$!{*lZ$j@|mkM6?TQNE^|MFJuec`ll>g|M!!d9L| zA(f9PWCZmi7=_%iu78+3Lgoo#ASWqB8gS=hr{C2J!{gz#;EX~C-i1nkhY3x{@B(C9 z7AlAj`q}k+M@ote#u_9MC zT-@{3NaNe&!it@*H-=mEUH)jYCLWE5(Y4~t31*7fDe*xL@B!~mxKtx*eVCYE2G-Is z?wBF7u+Mg8k8{n^xL_!D;bw(QV*O!NN^n(pK*y{iV z-JmGLm?y-N!A`?1Ll2aIqeAT}2}fBhRjZW7GhhaOZf95A3iJ5_HC3QFz#o+$r23^> ziL1*JHDJLV?XaS_G90!cytAs~MR>T0Y_=<7d<^7SJ|V~+F46^EFq@ycrF){Byl6aV zdK{{|kSzOQ{!KRO)$S|^&u)^dNzVUWGN3)^6>Ja+Z0ey*COIi3_}DcLHN8Zj%p1fq zpdyTH^{8Pk+FKC0p?oQldL5PlKLo>-E=ta9S$=x{H^kl<_}Hi}BPd2K%T+Vg2pp7X z=P+hV zJg{PLy=~Mmgq2dtffc#!dgSs5smeUW6kyCAZ_9i{q>_!@ostG+gGkYG>(C$y5z9n? z@x4^Km^-J^-akTIX)D9lo75~=Jq}VITkdH4hLcyZrHs9we#bAr#_90A|a3{9WfMI{w?${hQWo$ z3(ZasPauEvc9=PyEN5=& zBME6~Gny*Ts^%-X)HBhRkFA*v>J*hMU+S&NW49<-=UH^js=GMcrHP?8%$+QcTiL=w zc2|t3ndqg=s#{JpzY?DW=BWtIk9M}XtCt`iY^FoMjDxw*jmO*B5Mm`A)@C9Qx^7B< zrdSnH5)t-0a1U!Y_(2$#3O4dKO+D>Q(#X0~oD5Zu^BcS$V^&~vaOrqOPVvN~kCwR$ z?!5ZR@&pkA3hH=gY+k9$8^27FHalEq(otIKkwy|Ob?V-4Z@}MDiu)%E0cord_-JYQ zZEO$}6Dus|!N)8+fDOo)$GXKLZ&OZti9}0L9=2h_mnQjgqLj{L)j3>53yk39>f$dK zQ&i^f_+rKf6I`TddU6ds+5w{Cyd z&VNK@gRu*z_$g&J^BFdurq)htDITxCa6!}%O-FW-<{##j&TmG0i(8TyaTYn=DmBh@ zR(mnPDQJk`u71f*|N4;c6)SAvjEpD(4 zjpIw<`rL%i9A8o&Mgy?2NwthBSC!7Pq$d&91WHQF8F83=!PFVaIAF8){6jen3*TuA z$sKOHz7Qdir*dVqY?WSR!0aLm;(I@q{6Y^SiL9+Fl`W~@0&yCrL=|qQT_{XOKU*Y^ zYOFR?En62W@;pA`gD<-!y%H!?9C`qU3HSW#S(^bv=q=e3IjID-Ti-KCo!6Uz01cN@ z;l6Za&I6LB*HD%PX^@Oqj6qq9!0y*tZjWDcYsQ0^;_p%uFyh{<@oCk+#U&9X-&VOm zTq~(t_(Ds{&UdF^F}m;}QT1G^TR{ufPKHuGbv{;62zL!fW(T!ot27FeNLstmKm`Lz7~a3{?I1JINS&4ijLNBF04W5dH~KU0Wh?`(S> zr&Nm$p~S~JKM@&pVOu+8&>m^l5D zQUerlm}|x-tuG1_=-G;F>SNUmhQfvl@Ed_<$8F5aTf=PMq{mQ?XdyYWudL-Xj2N}X zc+C@H9F$66D3+ZkP-Ae4tj5i^^di*2+mF3uU>IK~5ih@WQ7{Z-Lk;2(;j~+48(YQ5FG*xsaj-X|8{_yOxG)1ho?wl@Uc|7R_6+Sk zen&#}>u%oqNMIOoZZNH!mJz;sRO-chpb|wq3KecCa{lZam2fLH{9)cki;&KO&~2Sw zE48yIw8ll2dXh-9{@pTm!v?l&86}BOHXsN?V77P>+JyWI79)}(_O}HmKe1!a-~}oa z$U?YD3!6&UISYXuTh?Yrv-c_qPPF!tj%#^=F! zj^ZPE6^kbM?GiZCdZ4(Sm+6P-2#a7wdE=dOJGoO9W1uT;&wUJaY-~+}l9&d8z>&Ut zu$}PTG3+sev(#898X*M)^h)%>?`d$bh+-8!+AJAcuhEwvA;><9bt%)6UMERr+B$s= z5Dx52)fawkq?N>@rVu~(d5jk^Xv}gDvXWZO4~QEhxgjaH$F{V35=RyR$&|teys2Pm z>kMr}4Ej9%L8Hx8L?%!mj8mV-+{d9Q&2Y#djdZVu_zPwU3yGtldY>h(zm%{_Zw~}c z8Z}Yqt)ejn=_++uQ`Gp|coT9cQrwetvM*SJ-}I$BI@vkY#p5U$n!J)P;t{bP?q2vC zR!}#W7F8`+m%VG~t{f2_l; zf6dyzt_cu@CD_rlJj6FN3Tmg-G~e!r36u7xEUlA%z3OIZ6(R?Cu^cg-KZsDUK7kmK zS41kWF`E+9Sun}$tt_6#7n<}2`$b`-M=|nMLMYSQF1#)Wv=Vj4AZ@@UG73DT+~gtxI4`Q>B!(}%?Z7&_1y{y6tZI0sdC1?L1F+9=0mU|{I#uV zU=WAp1$yhwyD`(8=@`r2%0l5=(Dn#@nf}_?IJhJD=o&@93-xB8)g2TVIG5=mxxPMs zZQkA7JwQ&aQ-?6(g*ct))_5`Q3I);A1Zt?1ju}Jc6qZ0!>4)bAQHAlneK!xxC1JIS zB$t^W0`ehrc=%j-%A)a`Z9p^_7)`R%vSviIN%~zACrwYwixC{6!Ktr$D2nBL6z~4X zaXlvo#b6}yG8`mCci`GvD5=x|oTa=HaO-{DX1et1j%WvUr*o8pH!-vnQhVz=h z1U^LQ?f^RS3k)&cF8Jc(&}iM3`hE#&16j!-Rx*ywx_)aBj~o!4kc3OJBAx#J=u!xF zx&{LQ?}$DCtaYJhdApb3ib+L6;>GIai&DC+n{uyUbv;i^pPYuk#~sReXMEp6>SOxM zmsJ}xSfk)d`ZQkM+ALUV39EHGtKRp}z_k}Tt{ZUn4S93+BMdr6-GkD7Yys$L*xXHC z(aC-0NJNcsp_h>9PWkia?U?7#5H@s-b`SdtTN zSbo1YFUC{K&~W)Z8|W$)tm;}#wf_!S;J`LvWeo`IN>!&`{1EDtNG2sLSsl?YIXXM< z(jg_qyep}8{Y~{_SS30$!ZfrFmsg?N?E0KonQmiyb51bzS#TtKNm-fQ{-l&j{9eNG zh#eF}FmH}QR z=)BWjYdsRVtGn_FAcc;$175uzXCtpRcQk84P6PGNqwSQXZCp(B-2Ax8Fn+&>TUvry z=^daJdm1NrIpgxZ*?FxAPfk2$As9j>eqd(!{Y5uU>Xn@X`1m&Dr zp*;wLH&XscrraaZ`%=55GkE!o;o(QmW2(j>)6syG82PRl8l7d6D#N>mR_z^ylg026 z;NA~0iuolC?ooXq+#@#>SM~WDFngqt&_j4u(mnhLa&Z0dsz95oo z`K&``RZQR%-uZQ5^c@?~ZB|Qf^SfKAxO3?B1^$IA;0VFh$z~4GDy6{j`-e?ly|wTW z&y2_io-oRR`9<%Uj_(Vus|u0nSD<=`9fD}VYw(PROVgY78Lw#h;y~w&!ccRh!-n7` zUZlHZ<{wwOKL}TTbX)GKd}=@zY;9h0zDq85J=|AqKEEj+(_>z=?@_!woV|KH;JI45 zA-;F^2tjTE<=h=5ddHbIpGi1^g(&`zdWlAj9%CH-{j_^T7ebAolJ{k4xD*!mgcbWKec#%vq`{4qT^xA|C9Ac$MwO+V(c%bDD^(=c$xw}BRS=#CnMo;hXl z9ta}1yNG_kml+snbh+b}oiCEsr}4}UgXInqBo<%Vv@Tt{J4k$0g7ks%C1L3N(MCm0 zWB0)duY6V(ey4lS_eFeo-WrJGQ}W#%tqry%VWt5eFWkT$b{yD_#3kZc5I62rGNrdor~a-)AWlv$Mz6i8)%tiY+a~s?>JR@+Nk^QCdBMK ztR8U0YGK$c>4+QoTiY+p)d7hcTY6Ki9b2^DRW{m4o*yqZy2iBuTSaGBIGe1)#}ghK zEjbQ)xASV4XO{izBgo`l3@CcdADh#tkmSYGkpf1^0`@r6IKH`^N&^KR652l;-+Up~ zu>Hh0P{(Q;lSeJ4s9&;{;SK^A+QowORGJ^ufDvqlkEjUmj)eAx4$Qh6yG0!^ydJOC zejx5TpgS$qK{z^YN{IG`r-`^Do$f4Oq1GST9Meg(=k)`*HaGh?xz46j5rRA9Uc6=4 zj!d1Ydw+%%)`c_hkbcWyT+La|&!DjdNQq{=8nzJL&r?*d@O1Ls>r0NAvC(~WdZ7X( z+aJBPrQPVdjlX=6l$>JhWVk?)RUT)5UUQ{&zl_s(mB#0oqJ4l@H6fKZk4}15eC1_C zkkUTexP85Xp%9KFK7n$MWaBLh&4y#i91>|Vqk3I)DJ-Y|h#_lOhf_@{_@WW-8z%V< z(ki9C`5qQy%N+{@A}rK>n~(cZU7|lU(kkXdS7m$H0zTxc6WG`wj!0Lu+)FmBGWz!N zJG)ls1*AdNN=qp9>!e{!tOCLBXS+=xBhaO1yc!*LKTZ}E->1jBo$I;BBipkp@3qJ6 z?{oI49A%5==(cHwO*52I5NurD7ihG_#qj`k1|K{;yt`%4Jz>kWOiL$id1HjV4cUb} zjUC~SCU8sIm%@p)42^Ab;rS9+In;DAGBO^gagPalw^Mpsi*u|~Ael8PZ(Tj@jUVIm zTFURRY;{&Q>(CvwHgNE95THDc>_6=gJ;r$t!mr#jh$&iOQTegg*;&UpWOqq_=~Qn% znL^D~DpPe`QrC42)Vu4_Td(!rsjYK5oKFCfnJFp6@CJDvmm!pM+Gl<=dW+zX5+>FZ z9t+43!QWT1j;(OAOt-Y9UoUN6iQ1kK&lmSahR_SB)#dF=MNV5^&T*bNxG;03a5?|d z!+mwho#APpZYtm2Lj(>Yxx>F&KP>RE&?Lkg01DnnakZ~W##2LSiV@$^Wt1;uIz45V3czg*&IZw zY)$rYUSF)-(U+B5SFFK39If2kpjul3{JQq{aSxgt=L!7Rfho~2z_W|;cXjQcyS4nA zMfH}h)WotgZ$iG-G6G(SRj@bZGaJ+6aDNI(?t@wHFZIvH13N?BM-gzp5H%kgU}}&9;zg_y@jhG+ZXhC6p{O;mB$ozW1Ta zN{nVBls;Vrhd)}uzQMb|*?68%loRrHzjIy=WQT1M`jm6EH1L3p1YED4xye_6SKu#l za14))7&kvfMB=beNNpRZzmC*HZ&b%ZVqoGIl!|Hau>@ddpY@BH`t9}Y;S}HuyqyFa z7d&r6K8aLb*&0o!hKH}zY4V6a!(Pe5Jh4b2D=9CvI~gap(w2%nCRy0Q=K5v|!a{mG zJ6SuTr{95%@2Vf>TPMC2P9xGh>5`jJ|9%6?^5CF~f{%CGnN_gCv&v2SbCD3w{q!r@ z1mJE4!-1PW3FGXn2GN`X__E6e24`Yo(ws6AJNrP{4ZqMTUutYQqi$p8sav#&^T_Ig zrPcZE(-4B(Tnf35Yezn9wC5Iork9zPp5@?Y_q&lfq$4@MSOl97c8?w0Zy;q3K*B?QkcLN_D<|6IC>g&ohw?J%qLH;L-guQ2ee77|Z) zJDkUCY7P4?3w*4sO6=Dol}j$%9ZCQ_cZAy}ST(E4{!EOzEkb4dNcd*VytH@oEkD#7 z&)35p>e1tUa4osqw_gqIBw5J;d&+oely%zk#|s->?|Do|^tvYiPFWp`=SBgM zUtyJ>g141!8IKQ&T9-t&zAf2j+piFpq@eR}A0={wqb!(()6?O3ANpX2ECAUkXsCcU zv_cI#_5jyePakc|2mfumdHz1>huFH1&>;L z4&tHa8y5Hhnd3eMII*nng7xX4bqvclqbk{oHc>RCpE0vBBG20t4^d^8qxnuSqWO;* zGThe|_>QBTD}eff<;`9ZGBXSt$5mfB=47RdRh5zKC+w%hQ)fvt7ai0wbQ-(}tdO`a zkGNzLY9yqCWDvD5qAWRW*CTSKIHJ|;6ES=Zc zx0uuB!*E2xH%?{uSQORc5XJe@(LTeRd<1xjSQ9!%hRW-0$4Svc^I8N2XxrwO9$?oT zXbm?`lLN!$HSD%Lv^e>F58_S1idf?PUWdMh|SS1-%3ca1vu`tmOrvI zx@t*j!McMM{Ojwx8xY7vMLPDoEq3u#gssbSG#^yCD@{%8QldSMd#-z-z3J%Y({rfTYs``+X~o@BQQQM^>vP8jO?D(n{-#*ocrTzBCX2 z_<@^V_SN1CuVMRYMim@!C&yzr*!!INs1C#sK`(q7YJGNhm9ewpwY@S*JDrrCmYM$9 zCs)sE)uGil-8slilQcB9k)pK&nZK3sZsZaA;NEx=W?CM&*8cKg3-pK^UTgDVo~-6> zZ1gROqedLlTsp2yZZSb_YOM`3{^g$RQ>vG{7SF9#9V6$epk!!i5yAxGG<%6Inz1HX zn90vwgoVdaud2{SjG(o$vXB$y-x&iONzH~SeV1_*EpRF7kr&}lkqnHD181U%dUjsM zX{M?K1|KzjYB=JHpt&3OX1o4KGa=q1oVl-;-hA2jJ;t|03`WM^ z9$jwWZhWM&Hb0xn{{%Rhrr*X^+TO-TR~E@Lh1)h!3Tw9qg2wcVYFEhz${U=Iw#)pl zfJTpsN3(U|Ag=@0GM#VI&cb`LZu4;&M;KLpn_jvu-ds(-n zvh<-l1jMP((iM+4WA2FdwMsepddy-}(PoOX@x*>-m zDS2Kk=4#_y@vOQL`TAsjT~+t);l0{SPyu!$<;U#X52d!U?aKrW$-A;DVqqK57yIju zKfFS+7waC6^p_&6))Q@)bk>Jzhn36-@!w*^eC?lt^i_gwN;Xq_+X?1s0blm1N!Zq! zz_le)ums#xTEsquexAshiVy76r{Z)8GpflhqRIWrFfPE0d2@A51fSb3V52AcOhM4p zWgnJ_gM%oaafoblpR)m>AT?|>*;*~ z!YZeK@p7T2y4Px#DO*W>_(*G3HQ6wxl-&T)p+6x*6Cx0Hkm`tkK zlG0AVOH`|K;j0fF?S-*4F1i1TDdS_ffbHJ08E{Upj&WdEBKVRDvILU{<}2B@>AV zI&zClA=&xpM7g#-FD7ucDAs&>VXB$5)ZOH~+_&URxEb0*w9^I+qO^48L_Jf*=4&NE zm_huUg?2VtCL${*8+cunBq!ff@XGehy<}dZ&eo2=t!DH6_`o3k{`eun9KW|uVQ4ZG z0l6vy{zq&*k5G`u4libm?k4w0%Q;JN6QYwdPbLG~3sU^cMjYVPJ7gB#CTrzfA=hZz zbnXsTJ=Tg?)Q57gjU@Q`PKl{)iN&X!Gd-7uDcqeo`2K)1+?6QlV7Gm1Syd`DG*Hy68r{ zb86z5`X8z_l03HJ0ndHf+oP@7;_}lG0l@Vt zy8d{GDh3<&VB^$V=(@4Xx6L3la~8k_t5h$Rh``0( z$Z;Vfzg$8tSz)9nM1XYzMe_IVySJ87vcxgLT|RY%+-QKD%xDW9^-aF3Mf zfKVISyJcD@mR!~t138xwDYW+KW%v4YDMG%}*1W5C8NPU&Hb86hmjHVw+ZB;oe(rTi zshq;Ly4n$F2`k+`mT-{6?v>qXBMg5L*%9E~7_kp&pWh{)JzYS-xv397^Tp62MOzMa zg_CS}hEj(2gDauu`O`0m;1_d4jvuaCKB?=ur`zJ6dEDQ&$3;_nQCkS*Ga-L^kh|Wl z_!47I5o8Q zNI@^|Pv{|Ig07BiD`_oPiH?)}gC6iabv@R^u&`?4$g-G^GCXfxjvt`8F82rS21al) zJam|oSE0j}kZ3tquLQ`?q5F}&kD0e?>6z#}xFB9A&tah3$9+$p9SYnEPt$AeJ>7qK z`F*zImgqif0dBzd?!Y?|r)N-Tpt_p2R!-Z#Y_)pBwxZ@s+n_K?zdI5^X_|lDgh7OX zt7~$(=e=c`>w)YW{%I)P^LfXzmBv18TfNoOQdL<>;}HUDlUiQ44shO`E4!VC9MVJj z&%T zUd&{D2&~GiZH*F$x|)QjKl}xr?)!+TB`Yy@0xoo;)p(69iey?ijhLuVXvy*vOXA63 zXBf+YmsYq@!KEHOocABsJhR9ft$_Mn6UBl;lygTDNkCK?JbSA2ECNpo}0J-|9 zM>X|x>N-6w_aMrZ!!?Qux$E})z;dr8R(9@=4rD<|S{XwHhu7*acO=OTNRqdAFJYZz z4_8(DXeyO*9ogZAp*p}5%a>RC*U_#H7lwU3dE3Rg6k^Fpbj_56V#*GY(G4Cheq2{ywqGM? zdZ6)dV@EpjjA-ILn#Bl099|@0Z1#xIU13gi;Qn^|R%|Fz1aAj!xw)#hzu(owln#06 z-Yg!T4xr`nwDf!QydeO@Lx!GBH22FW*01K%u|h_P5Ty3AiF$*h;3=P0(K!66G;52!x*0akp*~t%AwiU{Jx>0hNoC{C@YV74nDY#tA6_S z%yklTU+7^=-}UGA^OYieMKUTZ)CS57pKr1~aV0HZis%r$9`(P=jedlzJZtay^g|S= zHCiO+a+8+IX`2;0v5)Hnnw6oojK%=4fm~m`1l z=x!^1!O92r8PL^xhO8yHZ(P*n`lY~wZm1o-@cA=|mq+6#&F(pVKl~w8aJA0C18di& z67|+%D3|*dFI}hI`8#osTzl>ty}q+&c(t8;muZK7fZu{|q4wA_AK9G54~{16dL^@_ z!yY4SXj+33M5`@ZM#Q-< zrll{+xsqkMik;q{*=vBx`|kT z0i&sLA$HhQltoVIaZ)HFYt(6J-Dpho3kRVr0{Nb&E9NL82bDvsc(bsnb}BCs*I?bi z@t!HMp6|#V>bW~`h4(0jRj^OVJFq%?L`%RZ2e>J~M$(F>6c?Ke93Celm#G|L>(ywl zV6Ry}?hc%AA4zPv6KlRa1dXLgeR<`v`vv){rGa`pF$?a@bkcTB`}$NWhFG$L4E|hP zKvIpfstl2##6#d*`u7#r0$i*%4g2c;#qJ?O=fVDHukxOY)LP)z?hJy3xu$!4fRDeG z>rj!K{&)7&nP#VZ9+@V>TPLE`LTAB1b`BMi2!7koYgXTfXFjhF5~zzGuR=@u_v>*7>8dF96tU7b6@e8!JcJUB^DcpxI3aSowbOht=F zTXLCzN_u`un9`bci)^=DJ;8SsyF>JleZ1%#KfTG;fCMt?D9^5oo##k4!ug_+`eF8? zEJ9&0TS{{19)q%ST$VCO1MScy@0yF_>of~KlFJW;ha|mQ&X$hIwGU0ulyB7LnoyLd z9h3)x`wyEP&nOZZ7+I`l5C=b7Oh}LpGq~8A*HX+@-@kE06yk){b!_Qo>*m|b!w0ox zj?8z{a427bcr<48_O|y&OTQj-CO0Q3HaAxJ^?$gj<3>yE-n5)!V>hCu0PtyhGvORZ zmh%q?K5pslxRv*0G|`V&;WSBrD?8Or4!kG9}YQ-nGSBbG{n8=VwN zVTfb5IG=!6*W5kD{Oh1&YYgc1p8itJEKAnvz;5-yzwx;Lm97iD+GEodae5$<<-PGS zlqK|M3fS$hy?!-p)X8L3u~_CQ?@vzIA3970Mw&g{x$I^LtX7)+)rzZO{UdE>ySsV9 z!^1t+&OYtbKCD*iECa0sC$m`NQRc*gCk$r#+Q&Z;E*-7T46+ z*x6S*{DC5fKZX`-uE_QHu;{w|;nI!2OsB5@X~`OUT`7OsI@S6V*koO=e4}w>iO}S> zkK_v@rD(Q0Oe^h71Ms@Sm|-kyPki~%-2V9DJAOx22g~IY)1wI;qy-G&4YrUjvIfx5 z$uF6Jl`E2xvc|2dG=N{?(r&HOHO!!GvWD6Te_kjniy&OlpECdWOCdFNokE{nck5>a zPkCDFm@B*GyWw!1ALog)%z{It$jcpByhvYdK^Z7ik`qM%2F9+*#o^&PO>U7h3XN^G z8IKJ4BYGW<6dJQD1}4in;&bc`&~fm3H~s1wTDlbGTq>&l>9j6Cl5M|o>@qLN@0XE8 zwt>lw=uu0SkP~5eT=6mjPtWmW9Vj`>N9Fk8YPbOAv8UrQD?8&;v{lZvLUfGH*Jw|r zh=BP-a2I!|#TC>y9#O2$a5~>tYgWyQbTr#D!07!6z5ElgWwp)irq(McOQv09myJ#8 z=G*&3Zud1BvErfj2c!ioyV!uFOup&Qa>6YoB*6 z8&(`Yy019f((S+yMD;g=)U2!&~b=bGd;kuC-YW64^GP zOkUv-E1qh19})NVzqmjwTl&^j8n22EHUBEk{$1Wq;86snoN({czrX>n|NMJ3%Op-v3ufl+6W4j|I~Q2GwvH-)whw`+ZBrb6=rDIad?zOMmGtTY zb!5Uw7Dom4?oEE1KTNvO;1s)%$Ty#zeq|VmPAsFv1Ca`%XVnlHdYdb zeOO=Wv%I{_&7~DKdINHGtmUf=8PM%^$T|sG8(LjxwLM9TFy4{6^6=L69&XUZiVcIX zq|P%m2wnrwpPn5uzb%ht$#VN9&vCx!^74SCo8h39ttL&J{!utje~@FXB~1-NC_>EA z3@OoogafQ9bSISg?Lx2D=jNgXpVs|41=NSphGphZjW;!xS%=m*>J{e=P7{(;nB5+d zK$dO@iDa=tAx4Li^K>jhQT1m#$mqdUEN{KG_`qj4kac@$C3rb zQVcw47ON2AtWS-6U6E@T&Q>@IO(a2UWaYRYF$NVAM9LN9>&y6JNYb*Q=~yhS zX|~3!89LpB$xBMCQVX%ie&SrjprKM2QN`sjw_}1Gd#9;7Ei||)BZ7?spUy2#u-eba z(jsK8n{dKHxqu7(GKU3&!H`zc3PYi^SqdESnTPgNhl$wD+)1{lWnQl!m+3Fw&+f19uiG*V}US(srK`KeO=2(q> z!+_Nj*krWJTm|q6L#HbIDfLjWt-6?0P0l1PacrDrtYuJmhJ~Zm&Pc3OBzBgjQu|vDZ0EDEnNyTIs`#X-Or%m@EdDz*2d1$ z9)k@tx0>S;{}ZOToOM-o)HVUWBnTCEXKfhs?7iX(&!F(5bC0x)A`m+T8!`qI{m^i~ z#AD#AiD^I2_9035`&#O+Y0S!ZmA$JosqJq)c6_8qmgS01bWL!zh+8 zM5RoA^~T}i?4gcnky(rN%1koJ-LrS|+V$5Nx<09~npbTY{FW0zm!l^ zXX@7IUdysv;r4kXjbge;z!xg?`a=XEOOn_(KHQJBhP+593LhdcC1#E7x63f>$OP!< zaEJ*hg3g8h0xH!h3hP%*B8gq^%vgKJW|ut)T3^bUSH_?=fuY1Phh=}+(YEqq1q~xD zz$%Ls-b_uwTN_7cJ5RswaX$92_r%#p&C${^13MN=c~v@@k3(h4X>{7?*IBpa^U@b>Dt*kR3# z!1a2fT(iS8G%FD(w_Hq|yY6H2D?gSST9-!ysIhg)unF~5gTav0+OYl=*4M}@mYq>< zGi`5k--9tqEQTKA=$mrhXWc5Xo&j3(lhs_iy6S?u1GkS_JS2u#oaQ9uSYu>toR5x> z2lXM5(XrJW^8T5i?DsMs?r#MPnXmW2H6Rn~eVKUxVT^n_@xw>kI zm)PLkOeB*`cV@{X!xtL8)>btJr#Z-BT$5^bPU8qYe5I+pIttBknlmhNhWU`3AshJ` z1HZvg2Mk<*8waQMGuPV2Q2p3I^G4^4#aM6{s zRC?^89e6#HeshSiF$j!$=&CUx2EEZA#J1fQ5f`ypo%B+N4?|qrShG39SvM=uX3Cv0 zHY5@2_~;z1`r0!#rFsi>JfcO*(Tqu&Q51ua-Gm)!uU^j%pgA_Co;^SEI*nOSVG>1{ z^=PY89S%ccEb0@6Lmx&UHWDSg_c&FYgDi1mEkb{%rr=N?Tdt}Bf>&x+u2q6~`AQlxMNP93eJMO!jDwnfXfEAO(Ev?^|Ld`wX3B-Cat2$rwr z%LgFuA6Wf{1W~$nBi9Da6b>UaFv(oq@P4m@jP!dNTNDv-tltPu&-XJ9KCP@W$wHYea5S;L3m8h0uBx}rHYb+gY9~iZy z#xQGz9Yx~s;7Bh5Dk+#cT~2Omr?u9erM632p+}JqqrS^LV}bE5_e;ef1_VvLMv zrEw!sj!Cb{Fd15R@9wm1Lxf`&Nuf>rj3EkEdsbm;UNK9Ip&m_qz2}(Og6_%Yc^^^H^LSOTTx9?YjYL6HzN($>RGBabybUd zSgZb^h$hm+Oi@1qCdYjip@uLt@NRP=U|9gDY@S`;B=Q4Zi+3ZYBuO_3di~a=9v`Mn zbr-IkrY*#T-cY8=c#KWqE6b5bv&?i8_BGW>l4f~CX}q+WbE9|=hcRFiAxRD1L!LVd zXK)21c0i|M^7+ukb!H)JDUWvBzZLSiyHtuCFUOKP$>s#$_oO~#tm zZ;?==6^_!1d&C%Q+6tY5q3P(vD{WJ-~eVERWQ zNm2Mbf@)d|LpkSuEFmHcxC$H4&qD%AyOoW=fEw$LJ6u|ie$kp~&~n(8HoSLjUT1SY zX|)%XmW%X)Y$2SZh13m=So18w2}?0)yW(1_10-9`o*Pv%Qf+VTK$*&5jg^NswUmff z&WBSM+QSff7A1*^5uK2w)3yU9+8%3S_PCe|muXX@AmlD*ZMeo-zKj>8C<;=OGS!); zn@*A@8CFbH8E7Tha*X?kb2&Cb&e|lFNQ4-^Y8W(?yI~k&Yb?%r3O8h^efoY#JMA!? zO=C2zrw_+4X8q69=B{dKZYZ1?8wbAGdkOav5+a6qLDtGh(eB<5G2+LIh@a9%vf>G(f5v? z8-_lh=@hAHSF_S-4l}6s&y2)Ofibd#LIsLOVm;Q;%ZNB{VX^9R5)sBmod=6mme161K}Of3vfN|G zXk_?r9OR`D%o>#uwX2o3&^T5)Zmf5d1135NE{;(NlYD(W^Sn&GDV;A2 zPCaXbWmbE)=uYlJU3h+KQYP#qJ}Jm`fGc8-q6mepJBW;S@TlA587$VOA?{xdzABSG zqF}iKY=*Z6?{dTmxe5bgXeAvwX@?>oMn}XV#@8%(1y`cBQwN&hTpFS&2_>Z-U= zIli3nlvWu>lhVM+q0UEa7hkMK>tZ4RY9yzq*}ADhqy7qk|8D@BM6wA0B OnSaveConfigurationRequested; + public event Action OnSaveConfigurationRequested; - public event Action OnResultParsingError; + public event Action OnResultParsingError; public string DisplayName { get { return "Speed.cd"; } } @@ -37,11 +40,13 @@ namespace Jackett.Indexers CookieContainer cookies; HttpClientHandler handler; HttpClient client; + Logger logger; public bool IsConfigured { get; private set; } - public SpeedCD() + public SpeedCD(Logger l) { + logger = l; IsConfigured = false; cookies = new CookieContainer(); handler = new HttpClientHandler @@ -94,7 +99,7 @@ namespace Jackett.Indexers public void LoadFromSavedConfiguration(JToken jsonConfig) { - cookies.FillFromJson(new Uri(BaseUrl), jsonConfig); + cookies.FillFromJson(new Uri(BaseUrl), jsonConfig, logger); IsConfigured = true; } diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj index ca06f9283..1750a01dc 100644 --- a/src/Jackett/Jackett.csproj +++ b/src/Jackett/Jackett.csproj @@ -139,6 +139,7 @@ + @@ -241,6 +242,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest From c81c6b1e681958e252a9fcd5d2ca59b361dbe86a Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 19 Jul 2015 10:35:56 -0600 Subject: [PATCH 2/4] Minor settings migration bug fix --- src/Jackett/Services/ConfigurationService.cs | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/Jackett/Services/ConfigurationService.cs b/src/Jackett/Services/ConfigurationService.cs index dd6b8a8d8..9515ba41e 100644 --- a/src/Jackett/Services/ConfigurationService.cs +++ b/src/Jackett/Services/ConfigurationService.cs @@ -25,7 +25,7 @@ namespace Jackett.Services string ApplicationFolder(); } - public class ConfigurationService: IConfigurationService + public class ConfigurationService : IConfigurationService { private ISerializeService serializeService; private Logger logger; @@ -61,13 +61,17 @@ namespace Jackett.Services foreach (var file in Directory.GetFiles(oldDir, "*", SearchOption.AllDirectories)) { var path = file.Replace(oldDir, ""); - var destFolder = GetAppDataFolder()+ path; + var destFolder = GetAppDataFolder() + path; if (!Directory.Exists(Path.GetDirectoryName(destFolder))) { Directory.CreateDirectory(Path.GetDirectoryName(destFolder)); } - File.Move(file, destFolder); + if (!File.Exists(destFolder)) + { + File.Move(file, destFolder); + } } + Directory.Delete(oldDir, true); } } catch (Exception ex) @@ -90,7 +94,7 @@ namespace Jackett.Services return serializeService.DeSerialise(File.ReadAllText(fullPath)); } - catch(Exception e) + catch (Exception e) { logger.Error(e, "Error reading config file " + fullPath); return default(T); @@ -147,12 +151,12 @@ namespace Jackett.Services /// public static string GetAppDataFolderStatic() { - return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Jackett"); + return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Jackett"); } public string GetIndexerConfigDir() { - return Path.Combine(GetAppDataFolder(), "Indexers"); + return Path.Combine(GetAppDataFolder(), "Indexers"); } public string GetConfigFile() @@ -173,13 +177,13 @@ namespace Jackett.Services if (File.Exists(path)) { jsonReply = JObject.Parse(File.ReadAllText(path)); - // Port = (int)jsonReply["port"]; - // ListenPublic = (bool)jsonReply["public"]; + // Port = (int)jsonReply["port"]; + // ListenPublic = (bool)jsonReply["public"]; } else { - // jsonReply["port"] = Port; - // jsonReply["public"] = ListenPublic; + // jsonReply["port"] = Port; + // jsonReply["public"] = ListenPublic; } return jsonReply; } From 91f80e054ca4b6b38ec0c97c29830df18d69aff1 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 19 Jul 2015 10:57:05 -0600 Subject: [PATCH 3/4] Added build.bat & installer.iss as solution items --- src/Jackett.sln | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Jackett.sln b/src/Jackett.sln index 7e7f1ea9b..bd24b6def 100644 --- a/src/Jackett.sln +++ b/src/Jackett.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.22823.1 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jackett", "Jackett\Jackett.csproj", "{E636D5F8-68B4-4903-B4ED-CCFD9C9E899F}" EndProject @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurlSharp", "CurlSharp\Curl EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BE7B0C8A-6144-47CD-821E-B09BA1B7BADE}" ProjectSection(SolutionItems) = preProject + ..\Build.bat = ..\Build.bat + ..\Installer.iss = ..\Installer.iss ..\LICENSE = ..\LICENSE ..\README.md = ..\README.md EndProjectSection From 705890d5ec2638068f2e328bc5a6ae669c134534 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 19 Jul 2015 10:57:33 -0600 Subject: [PATCH 4/4] Added change port argument to console app --- src/Jackett.Console/Program.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Jackett.Console/Program.cs b/src/Jackett.Console/Program.cs index 99a610f7c..ff544025c 100644 --- a/src/Jackett.Console/Program.cs +++ b/src/Jackett.Console/Program.cs @@ -22,14 +22,17 @@ namespace JackettConsole { switch (args[0].ToLowerInvariant()) { - case "/i": + case "/i": // install Engine.ServiceConfig.Install(); return; - case "/r": - Engine.Server.ReserveUrls(); + case "/r": // reserve port/url & install + Engine.Server.ReserveUrls(doInstall: true); return; - case "/u": - Engine.Server.ReserveUrls(false); + case "/c": // change port + Engine.Server.ReserveUrls(doInstall: false); + return; + case "/u": // uninstall + Engine.Server.ReserveUrls(doInstall: false); Engine.ServiceConfig.Uninstall(); return; } @@ -40,9 +43,9 @@ namespace JackettConsole Engine.RunTime.Spin(); Engine.Logger.Info("Server thread exit"); } - catch(Exception e) + catch (Exception e) { - Engine.Logger.Error(e, "Top level exception"); + Engine.Logger.Error(e, "Top level exception"); } } }