/#f])N\[Wa e>RIf$~= Q] E*[j?1'r|]Y~ , W(wMtDyaKx{( 4uc
+|Lw)R^L٩hipP~ r{ ܝ]ʇ6`_ "D(4ۧ)ȑdK!*B=翾 WZ 4VؒC )AAjLyc )&Un7=;*C&7!R^+MYG fGL4&#*'#2ehI .Bw̮bOq=,5ahPCGðIeTQO%59li DiR?Q)q&
++'* ހI; t^wt f;|w
2m9 %xaҎTԐvlnςm\fQlv3ttPT`4-)WV6Xve@A͠{645cO2k RtYtjK`']1s^+':u! 8- ëHg@ݶƕc7>D`09lqݙx\}NAZRg/[NDSw)a-&Ĉ41cU#EH (~ Gkd<]F覮 s̑*5&v2Ug6dCUle{B c^}bhAMs:B Jna覐 tҥU6, ER ?!z5r06/ rY.~Ejfza&AAV$mQf}Ѩ�`%8χ$|>IM`ׁD+ 20#J TwϲK$ңrncڋg;E %avȁWȊ
+re>S V,+Y2d:H _S Y.gam s_#Q?.nN#~~_ʯăwUyHlR6~'"4((m>]}&F:=W.43}U@L3r?S
+6Ǭ ;ՙ_
K[L48Ne'~椀b|+=Z6zT/@
*b(Ø[o4֡LG
بRό1# .wp|7;YSR̵Zgɷ
CM܀=EL@y ` Kg{ &daRXiң!c fٞff̌@nǎ)M& tpnаZ ED@BȺTS|:1#@7=bE~
.! >e'jF+U dFg{: _[ۃa0觨6/L(6P(;%d,&UsY~ 8R-^ /o : ^, <%z/ʁH^~CG] HM%zpX =,hc%IܡU:q@ʨtz 'rFVN1$۶44j 8ƺ5JWu >lj] O@2(&+݄%VwO7*DF$ Ō.M)kE
g0Ӱ4RHE%mԝ
+V3g/͟ߕ&s`f)ԅ 7`
gETe/6Q":K- S
FSX@ri
bu':`Jv_v$ d办PcO3ZL .%B%P$ `USs*7GbW(p !/4 =.Fzg?Z[Zo5֞"K-T8rpP
PXۋ+!Qg?@U X8 RWEzV>
+6 iRxO3.: j,bFT:+*
+ri5Tt B $+
+ iňxd;T:tX ?g_q
S'|r虁Ը/"pQ%̀ \; zI~ gVa"dONm _.;Êܠ3w cNQ@~
+J"Qa2_xG_*[>|%[1B+:NZHՃ#I vj iR#Qam'6 Sh] L#h.`'cу-7UKFI$ +w 0 e0buyc$ K'#qe(s4bfE)ȰD1cz:ʸoRpsP Oa~ .pr8*ubY/AYtK0k
+6}=99"{C 2bU5@=CzVBy;?ӡ>ΦddJGB4BFVT4.db<pR1Dg*GM Yt+9&\aSԷ+7 keBSZMd5(>P&`r3C
BgZy*
+?f_4d}5{^zd 5-5ަ}+)ӗՈ}O`#"<V]s_ߖs lϰ>H vYs3
Q UˤTwLm #/)˓'jT#b#ylVYf$gޭ+%N "NȳAzg
LCX%s3 nɛQQz4\VgE'!$R^,5e7N^pՂ_˿FGe~TVǕ oPhW俾I Oڥ@v)L#Erg[Bv!"H4\>[(ehrSmO1982
+vf7N|3|g|DxSmW-w}Z'z ^*>^W/h/磆 6RO#@NJS8<72TZ ȋhN~
%4ø旰D4_%CO x;kGXȸ>k\D
)| ǡ)y4?0Wj8GLBʱaB
+rbwY 추&LN*D N"<4*SN|Ʃt֢,lt<!}Yo;XHM;TiUkjGgb {*ZDS6עwH F8N&hvOV?'
+&=`u; r63I/3%y@O@3=7],&'M.Z\) г&U*jB2BJU2 @)> ^RsZl`G 13! n!UO5
+"j ,iiU薖 7=%p4Խ u~HShAA͒ VMrV,oBX
+L^5rL⠌~gfN3!iY|֨k4D]MF BaeF{MV3&u6SQCc<l~ƭnnKGhܲ+Fʃ JbܐDLӃB@W^/ag Գa[(c>.M;J
RFX,0 F
*f rHSBI6:!j]j]<>oF]ͬЛ~R2[B WLl̚LW(g>u1 z*vb8(AXW o"u*̫[& k &(4]ERƝŎmyϭQP MMknW =(aSa 7Z 0 X
jbE4z_4[x'=HJ\D*b#e" iII&QX}{q{PLƽV1Z8nABݾP` _L n=V=mi9t[w'dڌ]|wt lԤ#lEwh1t
*W "0& BWGU-w,B];.2d7 gM}? ֻ2L((Vo8i9': 7d!?Xv{jm7JMNX$#d# W6a== sI'8ʒ@ l wvKywuxMO?x b'W dk0V4Zqn"ÑC@٢'[H+@%tNR!D;e[n:h@1BzPt80W˹3E%j3Ь® J؉Ɂ|)`>Pds %T+~: S`@fvbS0X\#~"*P製,AJvF<8PfC'qz
+T #ЇbCs88?Yuhf}h ɔ
+*( p -%7c5n<ȈM7]c B-pָ8əzKw\tąkk4MS ( (e<@ũ0Y/dZ Tw.]y
1I(
r$u_ɦc`|XDdǃu
"s3f ؞aL'O edPZ/GuAV
+H>: Dį jhPﾐ9rgh=p de /Dcq%gZwIa) ^@JkK !lXmAڛSF>e Li1> 9T}(D$ KES|ER<ƥXqvT<_ * #SB4Fu6g
+ O*H8CTEYnzv$O
+e
+S4?/ۭd@x)dW/T EL4
+)wÒ!~gT/aӒC %ǻ$q fTKFY6e_d_|U;.n-"Ĉ^c ./ YAj` ؽ#JOTj7 z,
+P bܦyG1ciZ{=EA*aպ|J)/!/rCE"E|
z@$+Yh`3w&u<_t{b 4C7s* IR.&O%xmgƷ} g5tk1TMp+G>T$kE*
TSC1& 4(F, tR5ܹ:KsF)RS9>TGm ?wM(% d6+U9' G&C@0Uڳ+9E[45Bhs 0,GSM l;nx$R; D*ɂ]"#DRrL,*J,aC$hjΖ\ r*hxAJI!Agx*HX1fƓ#f!wˏg)pN#@T+
+,BQlqDFI6r{A))gXb#iTF`0!U_z-Ҁlk͓]ό@5E^' hdaBz=Bid|7Ib=|䆤HB14ϭcC4Q?K'ŃD%Ł=jPW"Y)5E (ሆ[/?"}Fb@:8#h=Mk"ƴꙉ="{xRf
z9etNT ԧF,oxŔ(ۄɉ= +ut Ta1әi ¿*y>
#/nI0ORg!9:/\FuEz1|TqOڷ!aĿȍm:zP RЊDƳ1-7.D6hPD uq#xPA#?
[לe" NBjwq#^/VDIxzũ`#(`23B!DAGpBaU>EJ-,U44 6Ѕ+i-Uy@:Y#:VLƁתp=,
+bm09 *U4vpHvԜ;g9T
f^%Mc2EyW^^:/ M:G8p(}aNT-P %^%\IPr1аЁmgqŌiݜN o j2BNP4BwRk|3/AЈaSY`D5:lͰiVY*q ZHU- Zɔ+F<͘~'j
+SRbw5X;{ ~Ptk
|MhmVULݘ5xJV=?\3\5t"e㼙Dt)]^4 "@k-G ,Nx2V82!`K
|(Ƭtވ%2 9pB'~jnL֬Y-Sfth@_m]m3/ c[^augѺ3r_5%"[XP3k_e1*F Y n;n
+_#42; txfݞg#@dEdKN6Ꝉ `)/qa_-ז
+HrX4"YHHPYo#'?]XEE3p?iB
+vRgs3bU\*2
+F5.gҪ@ &Z ^ 7 ǨFETxJ5da?qCƵ4tάr \"a[ v%[dZo@ ߾`"s@Ʌm#*
-N5~=f,+
0 B)`;Kd
+b. ( !ĕnBtaVuRQ dxH,tI@C9
+25 FRd2@BJ =yjb)d^_Vp6[3 1Џ/k8mmq<#Xԣ'U.T ,Pq3M֊<[xcb'|LΒ(`XC)%G=QY%Ajy$p+FhϢD<5Dߩ}:e&"(z*5Oe=yԦEkQNT0Tj!f!80(+\F FrPmBmF CE5#OLi$%]R67MY5B
+(7 1. %ؒר=0uZ Aef&=و'zb*`HbC JP: rU
rb{POKJˀ C |5i,㠃JaI\4/8L?@A7)M8^[?7Z)~Yglm ;̮
5ŸcߗX8yiԹ9_ È_)yEqļ{5( ~Q0P2i2r(D
2"C\ٷ[f 3PR gɇ
+,"G1/t-;3eΆ!,~ ^
+96/ڌ*}JEkz6Y``]Gh'ʒɶ=잨r {~-A%%gR Adf x
+}O}Ȳv}G [y( ZA
+ӶlwRۛl[GYS +yPq Qc
8%tӄB@tQ V m
+cy[=:=Y:T͘h+lQy IF,_FfbgDțzRݩp1ko] |[ljbi93]Wrd>0[+ c9Y*mW=| cQ[~#Ja :1r X$ ,Gѳxx;1\={?ak^ V܈Y4? TczҎzX6Q{F>tM֧NA"9R
+ E߆Y3D b~FۗQ_UD<|oEb(9J; :Uu{)P6AQ@xׂhQϤ U>,,B p
+ҳ`̓./T8@c*$R3kryR2n abAh~ ؽԋ#W gi7>MlČB Nr
+nXLAjļ/K'㻂Ǖ
M0
+NDyD螕)q >?Xx Qz Wn zrKj H tc0
+Ψ8 #L7W\̎aņ8UT [ŝP6)@Y(/- r3Lx_j7V^_K?Oss[DqX]'ve~ʄC2m
>%Z}F%ֺ,FC{(i`O,u
lSpʒ7D^1:-~Cg J^!
+QMz|z=[lA4IK ) YQ= -xX-EG>,e~# E_Fq, g
+a8)I
yJ)[J!7 ;,]V@EE鲕ho)Q:챳JʼnYf˔shT /;lxbWM](Vg}sr=4ˉO-/ } LSLsr(JȞ9iML
*
{G&|cu xlS}4C e9ЉcH/1@IgS_s$RLWN@ͫi SXztP~N/YqU@a0H64ޠ#]xi.V~o/|qiB&ekś|N}gLhu^x2 R52 [е7B#a硠'P -sg L MW3= VOt+uINEgSQKe%$h s ,Ln+e$`tPnծ@}vb4
5n͂e'h]pw@*M*G蒯eWhHex{ q/I|B%{[ ФStW1-IksHŚ=-}1Z2+ïp
+(% S\3DP[>5^{
+ D^iGtTu%Ǎ i1l&,3[@]#tjg9K']b]\ ]e :\*Xn\@&W֓cb
+
+TDxr;
+R+nU䅩AJ/P3
+[1?4?/K1Ǭ;>N
ʍ,mQau)BHt8[ 0A
+\0I}2=P+fU#NA bJ@~hP*>!\)O ӀbQ`DUV7RBin[^Ӫ t,(r6ָ1[7PRB
jdT,ٞe>z =wR4 K+Ry;νy9(v{FP8!M4ܫTKJ@gEq< !Oٴҵ YQ"Qҋv*mT(Lé-Uq F ziLjWMK] þ
3IG@&KN;OE`83FmS~Źdi@c @M%U{@n'*/sS+.v\Ԗ# 5
#xzGԛwPi ghC0ud цQs6'HN2dfŸZ d%'.~=id{ B|
+ mjdpȣg4 Y0t A)VPsIiK?|'y%LdX(ŀjMHNǵf
9\ ,@(0)j( #@7S#ԿpxӁo*I3ஃ ų tk[np.CȈEy%=M"4
?09OاG Bv+Jut@"q|ь*餡||&Mcκa# ( |Ĺt0.ckMu>XDŨn?W% ZA:{Köbє 8 V < m1Nd'n1ҮH.@&2*@褀Q
+ ;<0f@kgEԟOonju8ϰ; Pbx~hI X.ѼlMN0x "0+z2llqw
њ1=ѵ}m *.VHT$h: d~(bA"KbAz䒱~=]Yßlt ? 3[ H e +A?RT+H- -n;o^ͯ#܀x{5;r'R8Vݴhv_}RL̳`$aѶSw6M&L jԍpQzDb &͋b{ັuJy%)Ǖ e+نfec:s2K8%9i}}1 J:#=% 2nG ;1X?% Gh"8"h+:ߩGq21AWKo!B Kz:h[5.hN<}K[/*DqP22Ƕb#a0{ =hFЅ?jf1Yev +PT#I j*cϰB0@N|
XmӃy 5;VLvP&a8 L@2ЙfzMqhcr2̙JꙪg% 0Ly:Od#cycYI5V%#ZM[憻-9em"PH f V%з Qn3r 8@#^/6_xq;#x^5aѴb
+eܸ^БnK,j1v?w{&Nɟ3e,(ruA \NL}RS:{ X'^#!n;" a\(NiP=]AS3gv&J>fǂSD)B<|rg>**GQ<\͏a# ;C˒aAc{Wl|Y/7=DoF6S0~0P@Tzt7z2d>ބQJ:R(^tٜ`mv2z"{ېO H@tFpG9F R*rZ蹨?R[Y b: >6#tq5,ah KXؤgGLmIXuX ۟_S@A/|@A&ahX{.IjGe$ph/c>,S VOu(WrL==Lt(5YH I @>YW!5f ifIJ0# zAPQ>G.l )ԅ^Y@;Sr i~UM5N:PbL81kt+ꥠ,8Yz a H(R4H, 5)+\Kˆ$U[) N%9k4n?耱Q sgmv^j°cR2^jy
g{h8l!Ia J`S[,}ݑHM_"^=ozۋe{(:3PRԗ~=Vw]B lK|qRTVA@ P䘽]`,+qҵ-AA T& 9:} @DSv_hv!L]bE]6 X5$ T|j<1S($_Gi1"ZaM&@6 0$&2
+-fE8#}> Z|B!݀t jRLujP jLR8<3o@5WQば)=R
^.`,)'BC=P#~WW{k+;B -yrnj8o[9d]PAԷ qRQL
+;~\%B R,[;?y9¨ZHYUϠ\ L܄f{#Ppe/vi@waY}ѐQXEuEu>a4ήW.J ȕTn{z?H@;0Kgؙt@ e$MznE}/
+=H#fDQ+UصpP]1e1=CDUZ
jGhUYf:T6fha<x
+p%i q.BxHB֧Y+J!i R. P SB8~wi$ emnŀGhWud>YPaRY at/ M9CxUh8x[|A9B ϋpx{\:nYtnn(
< 2V4ʊ Sfs c#u=I7VK!& 82K| L;_ 2>R&}Jj]j\⮠mg '%>i ^({v ~v #T' \R(I4R+F3;8H %z& qH gORAp<Pd2VW FwT&
+j:«-u@ϻARJ+ "| C J膽r4nX(R~錅)Fl=HXekę + Z?@ JbvS,[x^ hG{U%L>}ZgH,.a&4'نfq
+nЬ} ri})f ѹ
+:BM+?6C~ $= ' #QeS5Đ^oF"p )\80E&N1ڳ,5,}ȠķTL;ԃij) .!>u `Š f@K[kб;K ٱxXX\;h!O{)> *? .@-jAVi.ekpD\%Ki}ʚҴrT}'XAԙ ~ 5:,볥U it\A:H p8*l yּO*m"-M?nūÃ ubwߵKe+oB g[[ѽfs@-e [k DE-y
+b SM9G[pKH+B(rЬ_7cL4|9`͡k=
+ +IO ʹl=Eb́`9<dEP#䙍+=а
+]\~^SN #(*-`nPLJO3Dt`63hvc b`+4~P`jm b4d$ ff3u-T=c]h#Mtx )_"P"[x ,
Xb 9lhFVta45fGI߯0G1皩 Q
+`PB u6V!%s? '=<'`C9^34DC0;M1)BoQ'8X\zBlkV㌌@m%_-8R#w S=0RG~
by 9.H!g_0{ބGL[[1E ā̡
+ayѺ?78!3=a,^.*;߈4
{h,<
+C]H7zEOx:xKkJT!qB `\?ixS;鴶xu^EbfBŷ~et"Ax dDi\V']3 YNک(\" oҬZ E.PC#<#0g*gY9}(w@axsSN|Ǚ:Swh}# gqhR`}ؙe
\?籠 s(A wn!IW:b)* ɖWy':pr&ԋc=;ڷ˯~!%;,l1%3|U$Q8̸"
qRh[y!DeO#VCmtEB( wbol~8ud}mTpn^tn/{g^Oy 9!5-/D C]f<>B="2UEOv@sCCr!PvHa"G8NŠvOZC&5 d *Jk iCRK6|4)C C7̳V/a۬ `:{yKGwМvuD "Pbx7 t
Ox ͙*(MdM+=c F⾈ *.8~Vgf"bCqc8"㤢[eX:Gy`%)eQ7 G3p [w (>1PYcpA 76~%(^QЏ 'S(%4UJܣy ;
xBةoԚnʖ0 ut^>wˎDbhV+-.n|ƫ Ms3B 4 Bd@.D=eG?띬ggXUjf"TQjD;Fl6M#5G Lj`FIQti!@(=L)pPZ
N
+,oV-çt}P=FTr0cK38! U2F9~+ [:9Wz eSxo%l
+0 c/3, (Ӝ IL"BY{H:kZrـ*-CPK9w+>"kT |AbȆ7
f}؛}Xv?o$|Go;Zvqug L40ºVvcTf9B* j윚;
+Ep !mÁZ{#E̚L; | 3:4?1:2VY(S~.s!(Ϡx1+D@Vn'R0dusJ+5xr #V6f LF4>fwhEH9`;,x_48@WOk@ߺ: dDR6\
+ oj4 Dʸ7E@p@|@jSՈZ$ n,t;^ U$OjE( %X̡f#^ZMQ@`HKɁ J C*jNx
+^zhαQ oaN6kT@/;_
mQ&bXJ7{ѤĒBaBY}He'VFMGR1QRďa
+|-TѱT071?ؤΨ SyOM*ujQ 28 B1Dt/} N
"t'<|H
!h]Pʑ0!كX@ u nFV!ڏu|{VY(y =wg[TaEh6. i`1>k/s*Y^T-@葹d;B: WWL Zؓex%u=Լ>u5WHi{ ~ǟrzFF-d+ZY?fk GΤ^%6>ԑRZ ~^.Q38,4# 2|WU^-ԨNNӾ hv/4CwQ^1yvB5ICי&lPԹ hxg5zև}ƓoPdtU+:gB2
+EKQ'͍Au] MIJw"s2J:|Ȉ3X<*@@ӥgz =-OCC":褢nJvdc VtҐwZVϋ("kRnDYNFjhgh'成Dbf$z- ʚ'= ,+QHlLYjdy+i$ZJ6׃nD6%< O0
L16=11OШCƕ@Bi]Ꝉ^}g PlN}~3VşC8 q[LZ_^&U/,ߺfv`ح#֏u33j ֮%W+/ Hy\Wޅ<Mqid}a(!4lZm . )H :˳{e#ZCh m p[6: ogY0Z,0+F#/[q E銓cՏ~ h6_C(mA%l ˤkX
+~K ^iUy
+l\ A$JА_Fĩ 2˕:7} BK[s/fUuD6ӻ:NE:V'1b'
+EN TL6K&
+dVS q!
#,N w C/Ќ|ψ ]ۑ$ %Z_p2?/hX;HJ=\G
+O{쫺-G!Z"4ik!6 @6^m@ F% [~ydjIi"$ϵEAa% R
%1TFe;t+w|!7
' Ěz1\ rn1hgq< J&wvFuvW准GX{ 杗hN :kPFLADz0BK%Z-d\-Jᨀ?l{
+<< sA.n,гrQƓG!x |6eUS?kܣ l0[wjKAPz:@_nao+:
y¶|m`}dQ.y7[At_ͤ@z~
+ew,64C4SNB7"Wɇ>0/DW|@i}$qI*fGaҎϥg(bYlbiߍJ&ju!:LSJy) ̷:BaHL`%R2LsRygdTPs) *<_ [+奥EAGZa{ lʈ!`֟A /c} e-C g-TY(I}6vwF&Iޡ_A{ &х+F@Rq D'"~r|:O
ݢNs[.x!gMZJ7D8C!sJ=apȀUV(I%"}'8 W2/[UOq 8S9$(!DWe
+}US /zu].ʎu)b -ѕid`a Yx{3眑;y{d%z+_q]jrc,Q
+oO:&]v&RPE`y*RG 5& -ch)04>AS/qz+.Tǩ(t6 Az{%Y83ȕ LD i`5TЩF![ۊy[Q
+Bq46C Em 0 `_-$T>X|cJF ,5ꔌ?Բ/ j J\|A[Z$KEx1JfɄ7SASFYX3BRG7EE*ʂ=PDz%+5V̆IE6&N pu\M\lF Z95kpQo!um- cɠ+%D匉[
+ .hs%IT~}HK)30Q[ >5u<TԎ K)r *]*D"w5a铕 a1E{~z. <虿*p}v8mMhfr2RѤhg !NtrEvNf%!Gp,(f/!y*D:`R^,kys0 T{u+?25Uӷq1{ $f! "FR\IYQ.D Jb'] U51]`tJ/t ,YKa3wiy/mi8/Rw#\Yg
+Uߜ30l| s0?]y[}=|Azoqcep_0$
DB,snu 8@RvD$"U & @+!hэ%s?rX1@B$$ LBf+QsuJ2$>V] ԃel=L@@d%:L[L2ñȨZ"E9 zL\)(tL/
+1 Rى.Z0-bH HqI`/?9 =9 $H c'Qؚg~m[ aD 4|(^3jYv͘i)G!6܄`JPs-9(qy w\K-DF E,E'٬6}qe0.'a`@!eF $KC( LsZ&l j[ Fs J8+*06LȇcG0h(2#81H t}f
+Ȅh2 !\I X/`$zd onޟ?t4"
+rj#^ʢQ8m:IsPiDd
967A`r&_ ]|x[-*G1%ЀD*P4On+ۖɬ0#t>p zÎ0Hxy`EVU`( v Pd!i4Tn$%p<Yak"2$ Pe^(EgGFiJ!k&ystd\x}QSh (RuM;
j$H1?ʃ|e@w(g.]zC \jV>6#8XвH7~2UA b GxOS@caa
+J0
=hw9y,f
+NjAox!9 G+Bv
+6 cB9CFZN! D&!Jp<%XKbH/b7ѥ0\ HQ.Kߐ hBMujo_d6jЃ\!Wr,̡R ޘ'd{x!rHڂ͠_7L a6ɛ-+0CL&T8Ia9$ 2 VD]DBKZOM})YLxDw3&7Y`Y`LORdym tjAߐ#6Ey"%
+iWMg z̡Mt/ᦼ&ay9 2 SʉCfӁoX< LjzI(2'$Գ7&S[}Aj+$# R&8q VZ &$F U6ab0}d(,s U0,?A*4 b\bEȧ$,_p9,P^ T) 2 &ʊǗp! 4CKRm'0ʒYL ^ 5G -- "_+IQy -ݸ^oDA #x=$Kd[&!dJ
+?'#
|hPt_6hB[AEpII>VJ4[ +*E\%@^:nd1VK0 JUP}t#, r|s,$=qĨppcpYYbF=Ġ%q
0`0B|#+&O"G^m(ב@A'xJ xy">P!qB@Mpp|$͐`
;e I #[HJWDĎ$#E\3#aЄAbgƗ
+'"&9ˑl9ѐ]eaIxA9 "
+5pKbԀP hѠ4 -rE "q u&9!3I)>)1HzC 5=-NÈPm O7h, r8 IAQ #$WLba.Jn θvIOR&4')0:`f[0zؐ) 'q" e& (HI 7*F%#AquϨ\E!L^.eBWH } kB_UB \DZB x6|h#0@aX00\ ]@DW1v[jZh1lB (M gץaj>",}+L\(h](CEFDV#1eh#Sni@創
+:4l\ej`e? %ւ$ )!{
HXdƦ,4JQ/%j ƢHaFO7#Z&`)"ȓ
¼P:`+kVARPS(l }o1l ,@yKrl2,>%
+*u"
xL ж[ qҰ M>(RF6ì(c~@Ly0$ GQ5P䫻I |z_L(~ +5as 'HIV er|= X~
FU@tB"&l{!;d@jo$$(d!X006a l`Sb&B* MD
A$ DI?
+:d )LQ'^"Us8hj!d O p I' ,Ȱm¶UYvȸc>+^?;+e 3Ah P@;
+ (7b,/FD; הWBXZb t&T s<ԋx ܓ WL]H )I*hxpK( WEtQM@\ß/4. #yм-sVpУJfO2AI ,D8 YL`
nՇI>h$I* !P@"[!Fe)C.I6A E@%V"3#RlR"k E\^"w\.Q8 FQMgt0j'mwɄ)w ȓȲ lk`װ? z|\PyX¬g8
,$I![' Ht)aV"A'e& \³HK<}ckOmB \0P"m $Z$ϡ&ZmbWx` 8E.Bw
e~ATGQ`2^ 9AYfZ;F%Q+` 0.[q-DC$j
+-BP6 "̶QnmӰ<$@)Kۂ0: ^a)G2͆B eC1K8xj6]O,Af T{ cҌE(6e%+N0Ԗ|[{gٖL@~<PP!%dOY~ )G c&K& eX]QptRN kqsS842.锎1ál)B XMTW+<0[惤 ,&;Bdv|ßJ\`' E(lRJƌ# *$-/pTeRMJ #"y!"桄 iZJ99uB%=5 .Lzu,ʀ!jCE :Q|_i6fP"b 6[5 gL0V }q PD ?y>|*W?<VSb⑄Qlp*w(=H0" Z@$#Xh<1۠E
" >OY$9|~dՍeC >ؘ K1FYȓ@QhfRlS}ML9.M0Chqg^I22:0=#U
+h,|P7M\8h|kN_E%kC gB܉-*eɤ#,^堀u&~˹4aN
sz fPt k@Qt9 i=h`;熍 @a$;90fe 냐"4I<+
+ 0Db8jv0oR6 J``ʁ(9zqH}$+g-[߄`\Ȅ A=,==亹!mb[VHb%; =LsCr
+5l( 71۞Rk_!w3R;!u~v8;`h\@NbD@K!ijIQf5}m(sKѥ Bb)ZbX83@=LLDO*wjC, 8%wCMW g ͜/DCv0zzM4[v f`Rd;m_ )Pb
+,ҫz@DÆ%p$+TΪ,棔 :KUy[F( ء:t6) ]!{ z܈4 `/H`F4!`6S]|`ٴw1w W1gaDl Pa銵}qG98{I'Zq#a@j~AtL-V MEU֖` jQ w51;re 4|9z r?
+(H`*ȧ;R(Ҫ%
V b n+u7?`KӉ'_:"C)/mAv!E# Ñ!f,o̍mDm"z>KL&' N@r R mPGH\|ўCA aRtR=f鸉9]>DYL=U@*~lTzTIuPzd9%? GAvn . 27B"H*R1H0QUC qF#ӒEBgopIA/ŴPM_6M˂ 8p%V,Z8uȔ 3خǀ%|L%=NJtHzV/J@ "o]H N uGo Ae5b Y `mKj#iYAtbJ>PxH;o )PthAkN5= }8AP ba#,!qCE _8I5Fv~ 5ɯ\LTf ӝ.@ & JBm̳˼ + 溉@G
+>DhU1 .bfH,Uiq5GF8H̤+ iŷb;C@Lr]
:c#>fWD+a2$;DH?V c} >kfcEz<~0= /de%yiǛ@4@u&bW?j{L+u/ #=)S?\q4pN%dC2/ #dۺ#NITnIva |b`ݤFm epR
$% cx
+xeas _ q?$Zv\@X#
:"fxXbp(vk bx-dB°= 2ZQqr@,_I \gxkba yZ?gG@`~#Q;E1鑬%hXK\ϰQ>e-B*iff|s eN;=cȥK.[ az} W /Bw bļhJAd@fAsW!](-KZOkC4V =)x}P\b#z:ta֓,|\Qbã/A%5Źd".hD 3Um2dɹ1"rC Opr }!s `h``
\[ C fA^9ϕ
+d̑IA/~!%,dM@j?## 6%XO $, i2LJ#L#u[ K8
HJI%ZPXu˘!hM~`9ݔ 5Mr\$XADO`B o,L
p"y E"!ŁEl"`Gf 68J *^? & F%ǂ"#@ILS XrxS_j%= B` 0'fO(6*>oa )AY V3B(a`B<0@
9k,PFz}w Jsd.-t$E<~sE:{q"S53Bcvx $ lC _XH T
+.(mAbP{,Fm;z _ $;
+d@ע-P& qe@!TD=H#,u, s i>(
+i ( aV&,X1`j#K&cBz%ɷ>stream
+ Y(4!ٺ,"gxX$DC HHp;TM
+/B!\}f7P :~c1y M Tb-tSlY5sPXާC` [Z }G`@[H(Jl}Bɑ }
v`))# njK&
6cl$Pa1 G6&IN,r֬"gqfR
+D,
+@$Rtc N"ﰺ"U am`|b(,ԕ/eXT5C?V ķ )A!hdqI!?qKɺ -qf _H lΦeҞ
+ "` [[0DRf '7o ̴H5`ZЇ ` m8ё$h`]YZ^pB"c5iؠm3e:a`,
+[=:|8d5 ݺ<2#22pm
+ć1> ;0xRn yL6xxvRxh 5=21
+AF+
k>)Y z[Ddm-"~pIw Seod mKQR)zQT
+JX@@'|A@u ՃW&"yla '#$ـZ 2%>UmF ȟR [Y8Mm6K4pRAݳPpZF3Qh4bw#_(zcI0`]BĂ&l$8q 9mH %d\FE6e Vy6
+zM5d ^Y7#fC~* Se aģ;J20&@Y`_}h -i
([:yr{-ִd\8q
#]I?AڸОŬ!;̜D+r M]Iu "QOK jyr!Bx H҂>!I ` 4 l`s[
+U G XȬ0\* ?W@
+ *3~lAq$Jx
{R>VLsR7^& +S3
+b mPj:(V/4s%RB7M!,L ILۃ/LA|V$B}($ȖJyL@Ӂ r x. O+s"A.}f.<$
+u%xDx,#{}2V% B ʛ@;F5ŹZ @r \ҭi,L-(M)H]R0"sd- qdW= lRIF-P8t{Kw{%S.Ⱦd=t@ .-nx8 2Ì,_7n> 4!H
+"C" 5 A̵>TYT2*
#iE1M %
+;ɛ6:<.@Ǘ"я5A6S,B
+3Ej9h; L adr`Ey6yl$I l:ˡXEDNL]E% WtbH =y
+ Ѷ^ ^}I=&;VtW1D( Ppؠv b/ʃ Ey k:א2% c+`tqU[Cy5
+F>ތ' ,Op!^T§LHiGp`%@J+5`ùJ}yD)Ϡ 4tH4sNsA)+|{(CrA 3TS! ӌ b|Ț!4B>*8 i=F (D3 ,-oFɊF|XL0!w[ D _Sd~2~'tpWE#_2Z >WJLc`d,lT tAK~SIa:|IM #|b;,Ov
ZJ:`МE& U}:O$vo#\Q҅[@q9(6xЀ f+HeB{2 sP*ySD?qs\bq kjLRogϒ @m!k^1+0hv-aUjL"9贘C" p3OxF$@}3^)1{,ĉ Vb_z}E[Fg0i;U' ?nsgĠsiAbZB K7 <`/@-^WD "_.j ȁ<0i@td\ ) &cV|ޢ2 m)Gtg%IŠpP )0ʪ2'DLM
+hN$&2\O 'EL0)5A#ci`
+ | >!dg
q ]# p ԣ] 0
+2X4@Y;Ɠ׀5҄-111 cQWFAtMQn Xjy׀$rwiX&ʨ
+Df"C
+^?OJR-DXBF6Ci$`+$W#2 ܒP_U;/A
Hf|p B&6xP8dv/`0ᑒj;D6%ly7%gҠ*oTȓ ^ "P @r65,R'8r@`}9! V1ń 6j&-.d & J(`fna ljilF
H [ 2 ȵAs lE$ M@
+7+y֑%A0DZM wALd
+I^ZjEK6FDp3c|ȞBw)c %QIsol
+>Q?K?Q? TDҲ[-6 H GmbC2=bzȰΑ>@Mm Zyڢ/@"!lmsp§7aPA!8-FH!tMbd#gPlg8_@ck Q*xy&ɺ 5@WByIM'Vͅ%<& ۇ2!UsBU, 6H}X8%A Q`'=8-Id41S9Yqcio "
+c%^O0(6Y-h&4i,Fy&уtUt"gwˤ|`<:/?I\Hu;q55¾' yܯR_1+J1* Ă K+ĹK-gq89Р /_Xh +ZqIZGTڛ)_zʟɭ=WƽZ>.7n^us/w{^{ QD]\5g\0w >߬*o>=m>_,}6.jg&6?3LdMaey'F^ S*~e~oO_gfF'+SWP3eΏ<2|/Z︗̷ sC>{Da4 r +^ĵ?88fb{Lƚ1&ɼ#!]| KaU%O442/?%HO)sYXz1v.ޖ} Vazq9!G_O:]ar+|C!,Sf 쿶A`Be)K#Яi(H!
:V 7qO`Yw0w };c {x1ߑڎ9
+\92J .Ly 2q~
^ϽLk^4{ee`TpQ('#u~2m%b;6KV>ɫͥ 4>yj|x
+Wr4.d1Hƹ\\}T)Y0ZR\s7+h?ŒWn(-Ti8!4?{ ^Z|pV b @{:[؝V˟w#t0^Uv5FL<LW\g+ V ϯϗǹ}sg6?UC~){ :eͶw YR
+dsg{\kKʕFr*uw v},ni~MӌɃ\=^N!w]֣Ⱥ?\~^ON_mrVǫ\/>kr%hNu٦n֩J5Z=k]
X9VF^
+z1 f8]Swhӡq6GiR7O{k Z7Fӡu:NOԽi
u-{\=*ަ`},T]-lYI:6St:ew(,ߋZwC>+ z+/t]7[ F^ K%Pnf+8 }< S(9X Ub[lD*dJb\o)+fXWR+]YW `_|T=ǠCS_nOةޓg\>RYUj4M+ 6Kӧq4NwEgR,7S5'캑3:m1w04a&@z?qNsS۹b7keb)bwL4;IN DR Y'}<rjiHgryiGDn~@s7Qq d+;L/}"tAKS6 7-VZTJ 8`K{~ иojwZPAi
+1CAӿ4？aR &n=EQ1 7BHEu=$Ɯr;sr\ڍKq>r~-?ۋWMvI`
)fkPN4>MSJ~ձTWK|| m[׃&Nsv Bh2ɟ̅ UǏ=w?0}Ք8N~
+EAo oD 4af
DI1[,@n.v' R8Wyfܨd*alb*-Կ+;NϺۻ~M:+FT ZLC,4ؼ_}hhKϽ柣i
+UXsfsF%EM};{6(ҸFR\tP$b ];2hq~utYuL!.Lc!z<1o
^U
+l;;N*Bpnvjdz@V+uEou
,Jm!?o np;d!һSK$}ж_],^e:Myux%cQc뤏֏Y-r&jiHp pX/_0 )Q^oih> |ۚKa0d??i F^ FaC} 4)r+i'mP$HЕڡVwSw\7*fKɎn~ Z^VN!Y.\د J?{pxt
!ｿ iέ*2;qyN ;\\( U+1W sZ-<3t7ݍCw8t7vu~}s `{4.x. {aY oI.jHi "d 1nD ojךP-{I] n~u7yaӀLӬv..ޡ'{I9;hZqh Cuhջj
0PT*Z.鴺ui.o r[AZ HYUFG!`KJ$Z
+<|͏1bﰤiA)?Gj._l {"`&dc?
+&qoz\{ T7٠-ΡoLK&Jm츪_LK, >X)n & ?Ɣf
{ڻ{ vް +.y.ۆvzιgi -)JSeCn 뙽 v}-䥗Vtue `@ 7=VAgClu}]sw8r !Hz?iOk\i6rwKӎ)S571_@(őu+un`\8>
<<Ք
șz8N>
qGr ?<#yC܁Ro&闾 ^qzXHa? 7BA
8=8yHq84Hr8e\S SԤ}ߍR
+R(ͺ=g wS_.f=(x3C+6~ڻABNj9A'?$4E%^C&qmX ~#wbPigzp^tu\garV p&Xk%W\w 7!E@3jr0U
茄0nCJj?Z6t >?y>9_*dͳ Ì27E~Uol~MYB]yhRw!rд|!>*ۿU~wۥ3y{*qfvV?lʹ٪v2#.J >^R8jc&ًm'3':Pֵt62Ubkt`r?ܣ~\^K/\ '
vk孲{Z>Kr\̘׳9`/9&I ?Y7cx?^jz⁖Iݟ/K`I}d]k
$CLdf^
+:M9Hf13AlYg-Lcpłdqkwl!+]?| =
>ñ>ٞEW>rILӎ,H5vjRׇr2 ? v̳qζZ 7R3"qX<ib0teִSu^<(M/n& z1r9 ۹ZIߩsᎻf*\4+lV4NfiU+6n6 Tڪiur"oۮ4v|E |l'Ε2ܴZvNx|O-(g_zeWwQ煢m R^-_E ]՛`Gk;2 Wv J RF,m=;39Ah~v??#'TV躮p:^Zr fhřYqPߒIyY*5~_>ELm^|Gv:m3ձ?ocyrZ A+?%M@ruWٟ):zk_0kW "iߏз#eف5{z .\7Bۊ2m[nzeE:r^R3 w- kIvښC$;rXotxU~&MNKnx
f\)eO?d!st%B'
nZ[WKM:&s^oB1DWrQBO^8
:Ƹ6bZO߹ /[MZEp'HM&~۷駪47}5}~B,2^\F *tDÊKvZ4O6Cۦr% Ej+qҲ"|ˡKL^Y \n(C5@ysVfvnZ +p\u
+"-ps}O@\ϊBC;aVlJ|+]G9] avEA kP LNprt /Kҫ5Y֫5C [Աȯ ]cD</8?a3E"J 6 E خv qrai$P:317qզx`
˶(y;6F1y᭑/OǾDVz(DܟeޘtrwyoE4) 'Rvr}
,K 8l :]c>F(-kFֹ#NV*C,RGFdpGO=H}u7@G_3 J?r8 & ˍe,3=m+im -s^=ތw+G3|۲ԫ
+0& Dz hYQ&: ~Xoy-Zᦇٶe%k=Qd+/;k7uZ1W
]Zzze' k-6t=q=|ПJONir:RG];?=c֥㢒1vBpEw\)n4bć zh֧I0 _e#>m럞'P +7֞oLo櫫|db3VMEp$/v23 lk YbˢY{nPZuKX46ؾ>a"яrf9{`#,}K{瑥 kZ u\ ZB2T/7^ x Kg}M&Aeɗ TJ'XNrc)=?| y_;mP}|}5ԝnnr
+c\>7
N7+6oSuX.n^FJn0\߈Ζ+^J$.ɤ\~ j mig2}BތE~
t>` Ղ_]rݨ][~
X bqe+g&(
+0IƼDZA} 7B+ 4 X`*wn7ӜOKOF]wO}1ֵ+kMTݐ5k6A5U+ Ž{.^tcJS_@fh 0q7rˌO5֚ 5֔43Z:fs壳QٮTϪ yQ\WJZFejM;FmJA
+M+\gR1 ȞjfίeNވk $)+\# ϟTŎ$h kP5:wV,d]{Rֆv嬡Wz rlnk8TsոszVjՄ4oZH
+Y[ͦ*]̕껭1U c]q{ًjd FX*6g洭
M^cV"ȕ۷R *mۯYٹZ J;qTo
H;Pگ'o;^KP/Sϯhky3q)7ZCzTy?2])J;gqjX h < .s=M%=|dnf`'.Uv6۠v/Ru ' 6B4kpfGM{ E-Z#.ȴw
9x:.:kTre
+S3]Zn߱"-dvϪUzV? a&r;ի1}X zY]tTv+n*ӕvFyW^KE4_
|KZm)Y"% K9l. -Ab31~S}kҏkkKyUJ>WJhbG'K[3նOVJd%'\QQ5+3{x5 p+{Wk846*R+ J. SWv&Ցd-q\yն#6UǍOvrX,ŭyux^x]6mW`wr!|]3a\735.*v]K۶I+[{ywPR_r/Шk?ƕfruk'.OgȕsC=, n=k䚧biGymm}緥Uw]TfD
{v)Wx=;]k @eB0Et)Mc=LXֶV.k>۟ 7B/ȳշ
g"-=C] V 7l :4qR.?9R:Ɖf\-dCMXpo s/Zd=;kRnw .ۏjbhU}09 ,Ԏ֨Nw梶DU/ھD8/m_ iAWo.iϲ6N]|٭,s, pݴ
+2E3 ;熣]j<ԺwH%P@X0 'uSK-o^VMw:,/ÖQ0w;4s>xb^d cfi$&kY ׅ3r/Og}\i ǵscpiKўhӷ7j\B3 \hlz}e\S𬜿~F_ՙrl^xnQ)Zԍi',J] #,-WrdC @ż>X^ ;2.kxXn;_d) ̜j'LI _l}ظ֖\ܭ-oc{:0{|0]UgDW337>aT|}q2 "K~d=/7KoLZ\ Fӂ,)BGmO"dv=Ե
vO&7=߰= DW6fS4R[˶Emkmop<ߟP wߙ֖.N>N{C*q1Lf C{MZ9^/ A]92+r_ yalx`o N|֮\*tg:.[rəR4 6VX/mQYK7yl@C0B\ݨh?L+%Di7pL̹7W
+P5^ pR^{G#ŅS,Ⱥ$}N; Qz8ÉWw($_V6p~ j6jQR, VNŦnۅ*V=4>w\Uk}\6u}uk.krPtpgQ- {E/
.w[Id>`$Hmsn^].(eG౹&͟4E'Dα x*Xgx=jw@ 皉 'dڢvJA+úqm~l[JGe2kz 1 {xO-wԣKˮzII]K]tWִ~%O_S$2-ILj7C6@Z
+ҷU̲pUS?L.i dE.R lv,~}4,[ɍ - n;sl퍕 w<}W6>n;;^_]?䗥lݑlvm/oG?&k?\S;57 |:* ^FՅ1xO_6{.ɯ=ǯsu -i> |ҩ &FpC# zwf Z쬎l:|yXߛů|UoifgVve1}ï&CNy AJo"nwjx?{z|g<\:q֟sfVz'>- yaggѷ L͏f5g^S^<߽ ǧ9їhLC3Nˇmީ XOC\?zgI1i< SYipErI|ܜQ /,ώ|o i>d ?~}QiYMe [.~.dW=>~̮mUG/빱擩}y0_mWWg_Go+ 1 ߾
+_>fywv;q%Ȟ[ϲ}VfVoeg#ٵhuacd|at|d't}ˈqƩ~̈p܃ǑwsG}Y< Y YVYlkd^G^5^>ΗFFw#чskHhHu;\cw_#;]٨rޅ35 >~ti]ketɣ/ѽGߍN UGFs۹h|{:~U?fx ߱^|e_މ>E5{gqIݽ̙1ƻsΛw>ξ{0Ƌ;'_gwՙ#cSgw?\yoO= <` < xhrl7y:nvsXk e{z? rݓ̍?V Ɵ'cW/7ޞ?r`]xQqmn|D㍻kw'O@}(;1s#ģacbyeĆ{ sDi' /F&.ũ`}oK홓o&T/&oл7m{o&& ZΫ뉗[7GGKogĺ~RZYU%ՁZطm?;e?,oͬZowɥݲ㻓_E+g;Xx|o{ OP}y,{;Aiލ>~MVp~~6x>
+ʽ^a&|Y5| mOF[OȎ_lG 㯫ї߽|`e$דޣ%;/J9wquenin}no\s51=|p80~|GO->z|0h3wGGK oxj:dzzڧ'['KOj\tvku|};1}Z8=g?:wr ˅wGo ;^BtEժ-|^X ]S13y{n|`ҝg`k|kffӛꗍw+w| G+ɫF}5`Ѫ7 ~^]cV?7VMM֞YыgK۵go ?;W:ZW k_3{xtǯ/&>_43 inW/w?UJg7~ʾ?\ ڟyjymBS_ZN`YwAA$dA HBH0g~sa"&7Mc̹biݝY2-ߧ{oOqyk>f.kUku۾l"w|r hkc}pzl ;5j>; w. s[{~>2'˰ǟgo<|WOo4rM?c-\ מÞbo=l )ݺMfjL ~1H?ߓ &&&
+{7j u=5ކhIoi5
+(x 5"by 3F Z@Y -fJ@Ls9=3sz^n&o";уѦcnL880\,Z |s4tcpr/ "J,৫oQ8g3
Sa61ڤo7Gmj$ 9c/k
^*{>P봰Yտ6䫳no;d?:q?qM3hgD(7%6o$`9& 7;
+
+O|Ihׂ( G0 Aw6"6Z ):_ [ 8e
+|ioLx } ߳յa
+}0
w0rsS랻evj~v-`G_ۈ R(,=L$4OvǤRߤ $tq% %dV z&=3' V_s߅3&t&e>* _jvʵ/ރs,Q32 cF5?V,iW/97%έ\QzsRjZ,aLL E>/w\ܮ,^U` ]}Wi18$S{ mN)r qeGVsRm3u%'j.3^-}KoWE>ӹE"t=2\XMbb^|ʹ.0;9uf 9y$r gaߐ_ l KJ(Ig I5mݟ3bc, JףQ?S0{\fTJ}'@,wpS)
+۩M9} h.̙ 6E ߅MD283>e&_
N&U5sujaH?gpUP,vScyR~qXwP gkhZ؞
+]'xh
+ Iڎ(WOz>q|_%s+dRoB!*,|܉w}M_#m^ᝮew
+ 8:O{ťl-WqlO Pk dwٽh<7|gIߞl7{-~T4l[z 4[/<o_2{7zx
|/orb#ޱT;'a( ~_eL`yG, ? i1?x ܶRLkMwaJi!$ W}$U: qAoU~>+${@qhJ[
:ȗht~:+*c7 Stc
+G*Ã+YM} "kh܉>ctp7>+4qߘ l -|$Ofp''n*F:[zd/wϲuEȊ/Pxv4թ0[_{4'1h0(|ԊmBR Gw*!d@Sl wRʌF_7\wG`$
W;5S7^#
+iTs ?e J Af>O&YjVDzmG
k:D7k'ZB{pK~,H3Ũ>":9l&Rw{OIyՒ>wnxQK&}\1IL_''gi,\ݭFʓF7[{;)$#Xg~,{@s:E) {X\|i45< f}W
+ '^EӇƤѵwi >WI.(~Doٮj,7,xjyPWw ;jyI -i%^:(ar3Wevs?'TTQ:Fm+)^VήM k.NN+uDB#7L[ Rn% j/_윫ƕ^\i94f7_8&F'm:YRVGgUVmm 4eiYׇxUٔ- \6
iՑ:6$et1f$k@@Fy-Ht|R@(&>@!)8CoO M` !LvJI=٧.}Em aa>dhr249!>a5 ,9!QuJQ> ipBx+ qf4F'{ݯdkb Y2P9Fx`8~e/K٨^ׯ6wfoudys+/ӻ+ձH BLsB-ޡw\A\-@hx9-|\kſ⌳֓w*sd0*NN ]# Fh KM ]pTbBVx=q.|G
++6E0}'Ô^VRYB pdD˨pY!K Xm2TWy4c/! <*:yR;ZzkBAPL;ý
+m1iE
U&Z]*0vQEI%zs/.7fW48$$zl ~Da7{u^-m=JM[T54"i{ry俞hhheLzgQp/? MaV5c=a@ڿ?ڔs$QԹYmOP3[b~/rpdn2Y)A P }d+P 0bcH27)?[ l R?T9p*q]WS O)
>okblSYK[)FZ\6WM#A1D./K ^" }dLp&1U_6idZH\AYuaϫD`o-$3IW
I:VGW. G~/h,9@q1>L&>d(agOʤ g&u_2R-C?=d[wXBgxQ%>]7pZ?2?:Xb>Lcid?af3?w{]-q<֫G9>;PfK*}EpmL^b7-7WҎIJc\f3AWncow@ۮѭ1cM.<>izB:u t5EnIۭ[ J~ tGږ(&ͤ.~Ȣ /ݍ'Yeq{x6ΤJMH/G(hFeeuU5FUQg.l 3ǘ ,bu^O3*{b=+ן2i([.41
+AV=eC&=\/89q[7g.kgJ<4sO
+nC(0R8/ .'mzxz.e4o_IdEF߅Њtw蠔o ipC0uO>NO\"*[ڪޅԓa) CpٝQE?a5*Dx ]6I:M/ JjҀJH8
H2e#uUڶT:BǿY|T."Kd A y'sy"' @f'dB欐:01oZ
JpL ۅH#C,;'ܘjU 1ؖrٔ iY64a٫m J@[-@e*?]<
{CܱMq2[0 cc_Pz;ەݽ&gk$֠s_}|;FL6[4Ort~5ؠpfh`> 纑&{/M 7A()t'$PO2S8n_M
+'P SOxLq@C}۫~mɹU=v/4ff|2POXh彞:mMKo/r?갓3YxT l}7&R'>aE1RԾ6lς5\08dV*'X q>3oNO^
+-cє1MR=2D_J1y2Nݺ'yQ7\Ŀ$@+ sU>MJL_VT,E X[R23Lk6Qho
+n]<`qQOi[j ڪ֠T&L!X$Kilo^JXz8?n
'(ڴ6Aͨ۩§Iu7ԷUJ^oB/3H\Z,kt ?whIu߹KWQP__ 5x<^FW#p@aȘ*s W 7$MK N yCZ Qڭ)pfg1xDc[9 41|͞>% X|nJ.R#vFT/l
+-U
+ d`(qKF.
+/݇mַ
+R'3`
+|R[qDPw;It7[6)Kcԟp Xr/bf5>b"6x3;vJ(l(ɉ:]x|a0/P$5h:. K-7`N|;~#ލ`< G绁'x+F#j'' [ ܴʘnݥYkKɠyAFn4]43lzAP1d(}brfջX`j{
+xx7oͻX}t>^smV>+MtoVTkGl3:Yo|M>:/Żt
+? ^_?`Uc|ͼR[ Op|S8C-8 ݸ/L]}cQkɯ4u>}|svq s i4ͿѣVJF`',~b_? Q}ܫl_ 6AwZ.3i\*ƟQ
O28-U#w[ =?RCt=|#YO%/:7~e
+X9ƛa׃+Vbk↵9z۽u
+hһ
+,Al:ξnX+a`+4{#U ͈G7z7 :zzq=ؿv7}e=譇ic#a,vB* %+ ghG
PAwh6lnV, 7C#-f-v*FlXxCchjck*jʛ0HiF kCnPMrfl-6ȷͭ3uɯApLDXŇ,KywfBvKNEV֓&ޖ"aS'3h *Olڳ
8Ζ5&tܭŵ
+ގtO]r
m^
+nk[
RBա%YQk%>1k%"TK[l6P` ( =sfrmG%Q,kxNv ή3'gM l $gӘ#ӾFb 1w0##8z0HL"Ή [ͪ~!^Q&Q0aʛ2Hճq̀ ]cp \
q6/?W5Uy 9Iy6/zf ԵY@Fμ.1\rR+2I#w@%tH=X^ F| 3G[֎蓱M y8 E)ɔ/t`wR 9N\L"X&DžY-4L=}2KMIcέs^3ItB}$TG*#]!
#,) uhfO{.7=nϓ5<֚kIȣUGK\j
r3<%V/i.g^^~jBhKMnTsIR{q˨ `ʧyf{:c\zۏ]֢+7O3UrtI0:V~ J}ɍ,-B;kKnqVl-`]P ER ABce[B'UHqo o l\dZ!݉3BWjNtZon
~sn-^w~PcySRԷ=(vX݁YE ,Bn6plVnEnFӼusel9EG# "κ>rVt zY 5wgA]+]8zi`##R} d̀BQ|@ VU8l _847u;^Q[}>>Gm%(D\5(̃B
+f6>6Zˊ߭s0K56k h E3v> Y7Md; 8v
+qx8 >|٫X7$c3ԐLF }MC9h_>$]-sO/mn'Bhc 6 ST( J f;v3̔5^ONܥڪ.Kk6252,hm8>)CkIи:&}Uh.~(P^[ [8ovJ\9S$X\ xXďXLrGU{lfmv>^>uxv>^
﹆v>^
k||f=||3Ky\K;w/lr||ֲ{l%{g+5z}${8 >>x6&Y;,mLymne ˽z
+oI u/Rռra7Zm;pռ*/e>:VP@f] 6&BƊoIty"{n.#Ζc{yעMzKj0 Ls&h*1qkSH\mi ƶ3[wD6Q#C+y|<ZzZ qLۮc2϶n#!f=7<;} jݓz @~Q (zhE&f}DYh ;)Kͦ-_d߶JI4
+6
|QKF|k>&kX B1ͼfRQ
#Bٛ
ڎg[&8~Ó
BuO|f9|43Ş'+go 1C\[&{ak~U7QКqJ
Pwќx7- Df[cnvq^CsE[T3<]gN]Vs
+T>5uU 1˥Be\xߵ^-~3.E ( H C9l|w~μ9 \Sgeo[wgLgc1,ԭ3obXyh y$(\GwgMuA[3O|,יVy<}ny} gƼt
+vUzyc+iہ_TRtI U_A y۫
+ =A@>7_Yq*K Yѱ,<.R%I;zJ (f]xT
+4_2ضhc#B R!hL7F JGƟ@su}aGB;c4q7loTvm}[O,5/d-{hB,
T7d[ ]?.ݺd${&ٻ49 褳.EזV<:;n-6婳u5m,%6= )OuΏWls=ޔ~XSj=N< d0boGyﭥVՖ|% 5mtBx6o7ʇ^9/2r}i7
+!=bdb ["宆9z\.z423 W@g@D.9y}}O&}Ob<3G }Il#V?5F[;ݑY~-]RKmĖyU<=z5J^~ 5W{I
k{go
+LXmmw_ CC;\g+V { Us9̫[gߘsZX7f)/s
+^XAW(7tuKnYڎ' ۿ)Z@u۟ R{-_̽Rx16>=gm^};ci~ZS}έ.Sa9&ܜ4\KQ.qro.z+qclލZziNWbΩ"ACvk_ܟ{ ;)iߓ^>*6}Sd *-9 \cc}^=g3%c|zRzJf*!WoszHw 6\ϩoN%2}N67rcSWl紆ܬo>'PK79ژ}#\gq!-F579um# :Fz
} +lsjA3kj:559ܮobcFd5YW_ht Zɼ[ kx;( ,{\fy.9A.r sOK̻Q~H5pێ_3sƤ+`OH1kX9cҕ
˷`S{l2 N!v6[?h-; g#Ld9l-كi
+Ћ UmBrIH_mWu˪vC\A rϙ- ݈>rکk" {U?,gu˗,zSCNݘ wZܸP`kij6pzC9=.=q{]ouZuZ]-1i69JF'#+qOTO@%cN?6w- CP goxzCe >^>٘Yi] SBjڂ~NyoKom/]1ݜY-Bu =Y߇7_|#>G: uƀ Z±d r>jlHvy]sqTyOyw߆~U۰w[U_?wW]=oU1պh^KӆWki0tsV6>OgosK<괻u*7wy~O~[ZZvk(NɯE+@ g=g
+ջ}S7Ւ g/Uc4+4K<|r=O#ͬB>_1YߞG͏u_`^o:D{j=]BTa~n9
+2 <
>85ݚEns=]ӎ6}Rުfćóypjuڍw0_10LIv }7ձseabT rOAl1bv=gt6x*yUCt8G墌
l]<ē.;Y v{#u k+U NXr_oz`-xw買n g 9<*smª!Hύ[K En]@Oj썈/Ga{mam:a Tij[ɶ+pFjtlK2''%tq K ? .>M]SEeTbx<Sq9{ *Ǻ
Fr?2 Ϊ:;]=1G+S*ruܛS7t,ps.$Up+Cm[c3]5v.>fh
{=h9#mVZzzmI׀9l d 9FyۗinOIHe K^o#Eg+e7CI'{ٞ\mci+@:uƆeOţWrrtfaYDϦ [ڟȥe}
+
{sy9j= zI=j+@{>|A&Zhsv@DXohKK߈W[#zܖDFr- 桗mIGKkIۏ7+$GJ-~I[#Dҋ$zx[x-pf
+m =yl
+ǿB+4tڿBBPab_~X{n:wBs
{սW+ÙV<>pj;C
ooZCcrx끇) zO;tJ,uwze}O;о
+#=O;4.<\l 5jCٚN;KW=p\
+ Z xD12 :5G[ù -᧭x5 x9v8G쁇Kp2 :5G#z7z~N:P xS= xi֒{Y-qBe xh.ٞ=Іf
+q?
+
+Ctx;><\%@ x vf62K7tࡷuCW ρzqW?PXEÁZK xݪpࡋ1WO;ti x}ڡy#{YCWuZr<:$=qLz~XY|ڡk>m פH>m z7lU˴ v1 v.o (Ycy𭖒'htL_ tޔhs1.VaY%lFݗE
+ȁwe9 :&+F)4kN"9Qog+F9x:JS]*o.GcMz[&Y.\ &-CXNσ}m+bQpkJǒ 5E[1"/) z/;-=?xe {Eʥ0g0?t?젲m;Viy_^+A9"]`Dvd1S ПLF 3{t;$M%\Tdpħac '~50kQ b~!n*v 0uF~9\r&? C%¡ χu`ŋN fJ gT
ɢNQቐJ!3 WVcNWB
xNG3 `Df:ӷ k"AM#4@ϢNp &o: z}BH+&Arzi` 7~ I a\TC%}!weX!S7)vD GL=1oP -uOWM*r+ ~/ko >F a6Si 0ا Z2橹0S9 VoljLgx'2sB(shZ)_Ga
Yן r$O嘌;W86 f9 s6~D$mw$92e"5Z<}/4*(חW\
q=RZ >& h|MEլx/, M's!#7JCMEL9 # b^K ^}O !m
809> c \[ A!jKJLA͇yNكkze ]+5 RC@YR4$I c&F !pYiUҬHr5JP=nNG e>{T\~Gpz vP+SJ]kyJ/H'x*, : ?_ lm->/qoNƼL_3?z&$℆L*
+.3 wY#8@qw xNVQ߫xO&cޘ6G|Ҭ6GA}v19٧nwRW)7PdQ240{ yäˋi|'qƈ\n .gN+%kG\(&tFg n?cQSo}O6Sl-|,T7єQHͱnwEc>r}},|Pi{j>8aj =jL[1T *~}PA ͝@.998qkи&VqO Vï%m]{ i_+0Sxia7?-<:)_ V&998$ݻ,ej?]V@+iU> ўHwWMsmDC#iz(nii"
+0jD ^(ޅ"DRړ.y5}|AUh\Ӆ^YUcPcPKū@z¯WAc@d¯WAfc09:16{5R ހw[PBTM kp$\!lۮv~FxRrW_0bEě['$j!'H/F/[Q
+Pd_ SW 3rL>f ixlY~ܤ )!l{v`6j*6hWq0z
f5 1LxDQgV)ğdۣƤR\Qbr5IST 甪I)=WN3OVh34fi Q%^ ⓖMT +mu݅= ?dIo{am0~dNlT㬔S ^F(o' v~J?%ߒo6VvH+|KHi0k3eŶ j
~
&_tϚ.&g
v
+4b[Re4ljtHXxl m4M˧2`VЎƋj[)!Yj7XkU[s )Hx>uJe5ʑb$a+NkjۜE.>X{ eEWIBL tM53r`nHi4MJi)=ovF}ްR,>47e 5Q^@o%Xdʹ7c >jcnm.' ?:7rnWgzS(oҌ<|jk h,ͳNxǧn$z>ѿ6Sqa3=݈7> T.Ma946Amf?7;_ק̱,0Ȳn/,r2%$H"04g$^`^byydFﾉ
s66^\P 'Vc?R?_p BhtM{յɨ 5u}tR`gV*
? {;}ftnӱu!ѫ<,4NJ[ef?ߝt?Wf{O`oÅ% e}\_zd=9U:ϯGIY,o%1=Fwk5icWvSj;֠[80=[i?yߪQ} >|'wo
+){LCu -M0DZ(J@W~PS NdYQ"^ 3< Y%Ff01G*63?P3Rs F٧D w͠ѮA! W3oj#g\b
+2 ?4'Ֆ5K>]B&t VၕhQ$sjN5j8c)`,g-( EH+Eԯ
+NM_+f-d"-'hPJ(
U.\"*8K$4+mB|y\ D~U3g71VM
+lNDAgBg._gV Q(fXYh N?폐 UG>πg"/%\ x%|@Zwb,"KA(3q,$ >3e70Px|ЅG?Vwm@`Yө:L
+
+JeRQ,%d Ey'(W`J9Ny8O[}~,!W|yol1n1N6o3㶸Iڿ+p!;a c86F ɹ϶ƃdi~vs Ӯ<:Kg>D%(`r`D#piUfUOߞw+Ox1_}dnMUgчj͈W^sՋzW/:{E'O_ o\sN^q7:y%#X_U Zx_ y[9- 5/Tl T?3D\P.:
+ LĠcʼnx|[ $ (rD$#2O'dZiEc!TVĭ7g@F)w, WJ'4pBJ( "x$$R$Sr4ϫNLfP D}BP2nt I'CĠEV&S̀fjG y' dY^&Ą
+P,)Se 69MK8 )UG K3*;'dA /1HJ;/+Ã[f`04 لh*qЄe'ap g@Fu ^q~hȺ3gh:!%p S "Dx5nJ }QNHp2 [fe.xRK U" IӰ9U. M R{Gr1qP䍦97! hVV0'E%L\s5`:)u5.5)
+ Ur2ip=%yMqUL hR*bI>x~H7sBt@U
=#x.yno9jYTLYZ0od&z_Mte?هDOW7A*E@ yUj*X -e@(tc̃w;~ۼz_m MlwaM]Z H9lGw˲vyWF m?};Jy3>
+b"S,c,$ >jM@,X Lcq#8"n`cp)hhq h;$n@>Zp" 6@t
+fT3ȃ!Ead &0(M l|qieʣЁG)SY Jg0R @&L`L A RzSx gYG@DyhX4Ba 0q<"*pG`LF 7
+x L gqS3ʌ CJ .C4>8LbI,Q"0W wQ`YK dԀtC 0f| l }qN ! <# 0 rF\ Xt $#Yd^Q%^)HwH0a %R,ѯ σAc ǁW:Z`01}j`SqG_\Ey1td , XieIJd,jT@&fY!s1ĉ#1@ty BBDbqF
+ZD&0a Y` 1ƅ Гs$2 b0!p D]d6Dqb> ٝ (2)? a/MKitU`*m
+DOF|;F:EL}b9XXRLŢ{pA2hŁyAíY` ,9@& h$
+(ư w
+$bDt`C]`Y<S ,YⵑfRt{n3p D &j `JrTQt?xcl z2FnZ;ڷEL ̌g <n6Ԟ^Dt1e;<zd&gPgP6lQ͜U-cnd
+b}M@u*o4~&k+"HBqyem:C. g3:0P- ΏhضGh71
L99 FFIbeN_a7XxC=08+3Հol
+YI#lYH{qAq>[|3? >*ﶧR x F㛊B$*:
+q&rKXg>Qpr&b;.ӏD04;t/iXYr 8ycD"
6d-y9q0lleNdiv(
+=ƞ;(ӆR*/=S7myޤ8fo\=. 2jS@''$؆
+襶gٽ>/mA"9lF^nGg+\j}NG9c9>y|ô ` pDO27I3g24FYaG-~iDpI>0&
+UF):H\WF$c j݅-BIKJ2<"8vX7m*~YzY2RvQ ^ْ '
+6+
FUd)l464[Vm\6#FK#VILʭ6unTQ֡YЫe&Ըp%@ JG IEG~GmUjNW4A `{ k ؏*wɚQ'
<-dbvAM^DǕrvg~ zz B$ XKCIWe%ŶJ % \(\2y?@%+$'9rU*B O#`(Pur`W *A\3J%[jB+NK5HJ.8d,,ZC[%*Ѓ"Xu
/{ʄ۱WzNXߗ7
+%Co[p؈4\V3SԘ 7w5Q``!6rm9{摆WP&.veW>nC@d kxaX" " \n}nU]-bBtD{xjPJC 9ײl
t1 NQ(TUj9γأer,%C?ZSH'fTn
&_)m+mb3kS @2"sY셴Yp32H[LjOx H VuS%) = b3I}2[AGҧ56Jof3১K5SXo+y K,ϺUQ<oR
'QM'%XC,no ٖh] 19#gm :D/etI9{;ƶfch"&j",q 5;!M!!jӭFetO>nRYm17qM@GJVU* 6b$kIExuXymUSZg /%$җDH_K"}I/%$җDH_K"}I/%$җDH_K"$&75= Bdg@Rf4Z/C\K}I/I%$ї$D_I_J/.%`̗0_K| /%`/̏)+&L퇿/%?}WM>W][^Ym6AlKԊZcC*i K||U/{q3x'oRX/_l7^^~Zˋ7A?=z%_^G}qo^ w˷J{wJ>3ӳ?Wxݻ?/17;|wˇ?/?K WwտW
+endstream
endobj
8 0 obj
<>
endobj
5 0 obj
<>
endobj
6 0 obj
<>
endobj
9 0 obj
<>
endobj
7 0 obj
<>
endobj
44 0 obj
<>
endobj
41 0 obj
<>
endobj
42 0 obj
<>
endobj
45 0 obj
<>
endobj
43 0 obj
<>
endobj
71 0 obj
[/View/Design]
endobj
72 0 obj
<>>>
endobj
69 0 obj
[/View/Design]
endobj
70 0 obj
<>>>
endobj
67 0 obj
[/View/Design]
endobj
68 0 obj
<>>>
endobj
65 0 obj
[/View/Design]
endobj
66 0 obj
<>>>
endobj
63 0 obj
[/View/Design]
endobj
64 0 obj
<>>>
endobj
33 0 obj
[/View/Design]
endobj
34 0 obj
<>>>
endobj
31 0 obj
[/View/Design]
endobj
32 0 obj
<>>>
endobj
29 0 obj
[/View/Design]
endobj
30 0 obj
<>>>
endobj
27 0 obj
[/View/Design]
endobj
28 0 obj
<>>>
endobj
25 0 obj
[/View/Design]
endobj
26 0 obj
<>>>
endobj
84 0 obj
[81 0 R 83 0 R 80 0 R 79 0 R 82 0 R]
endobj
116 0 obj
<>
endobj
xref
+0 117
+0000000004 65535 f
+0000000016 00000 n
+0000000338 00000 n
+0000023967 00000 n
+0000000010 00000 f
+0000167839 00000 n
+0000167906 00000 n
+0000168045 00000 n
+0000167759 00000 n
+0000167975 00000 n
+0000000012 00000 f
+0000024019 00000 n
+0000000013 00000 f
+0000000014 00000 f
+0000000015 00000 f
+0000000016 00000 f
+0000000017 00000 f
+0000000018 00000 f
+0000000019 00000 f
+0000000020 00000 f
+0000000021 00000 f
+0000000022 00000 f
+0000000023 00000 f
+0000000024 00000 f
+0000000035 00000 f
+0000169514 00000 n
+0000169545 00000 n
+0000169398 00000 n
+0000169429 00000 n
+0000169282 00000 n
+0000169313 00000 n
+0000169166 00000 n
+0000169197 00000 n
+0000169050 00000 n
+0000169081 00000 n
+0000000036 00000 f
+0000000037 00000 f
+0000000038 00000 f
+0000000039 00000 f
+0000000040 00000 f
+0000000000 00000 f
+0000168193 00000 n
+0000168261 00000 n
+0000168402 00000 n
+0000168112 00000 n
+0000168331 00000 n
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000168934 00000 n
+0000168965 00000 n
+0000168818 00000 n
+0000168849 00000 n
+0000168702 00000 n
+0000168733 00000 n
+0000168586 00000 n
+0000168617 00000 n
+0000168470 00000 n
+0000168501 00000 n
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000034465 00000 n
+0000034535 00000 n
+0000034680 00000 n
+0000034382 00000 n
+0000034607 00000 n
+0000169630 00000 n
+0000024522 00000 n
+0000035453 00000 n
+0000031280 00000 n
+0000031167 00000 n
+0000035340 00000 n
+0000034027 00000 n
+0000029343 00000 n
+0000030593 00000 n
+0000027399 00000 n
+0000028781 00000 n
+0000028829 00000 n
+0000033964 00000 n
+0000031104 00000 n
+0000031315 00000 n
+0000034170 00000 n
+0000034266 00000 n
+0000035222 00000 n
+0000035254 00000 n
+0000035104 00000 n
+0000035136 00000 n
+0000034986 00000 n
+0000035018 00000 n
+0000034868 00000 n
+0000034900 00000 n
+0000034750 00000 n
+0000034782 00000 n
+0000035528 00000 n
+0000035729 00000 n
+0000037119 00000 n
+0000054558 00000 n
+0000120148 00000 n
+0000169683 00000 n
+trailer
+<<395C71B32FDF194E9215422F8EB1B4FB>]>>
+startxref
+169896
+%%EOF
diff --git a/src/Ombi.Api.Emby/EmbyApi.cs b/src/Ombi.Api.Emby/EmbyApi.cs
index e9e5f0fca..5d941b083 100644
--- a/src/Ombi.Api.Emby/EmbyApi.cs
+++ b/src/Ombi.Api.Emby/EmbyApi.cs
@@ -56,7 +56,7 @@ namespace Ombi.Api.Emby
return obj;
}
- public async Task LogIn(string username, string password, string apiKey, string baseUri)
+ public async Task LogIn(string username, string password, string apiKey, string baseUri, string clientIpAddress)
{
var request = new Request("emby/users/authenticatebyname", baseUri, HttpMethod.Post);
var body = new
@@ -71,6 +71,11 @@ namespace Ombi.Api.Emby
$"MediaBrowser Client=\"Ombi\", Device=\"Ombi\", DeviceId=\"v3\", Version=\"v3\"");
AddHeaders(request, apiKey);
+ if (!string.IsNullOrEmpty(clientIpAddress))
+ {
+ request.AddHeader("X-Forwarded-For", clientIpAddress);
+ }
+
var obj = await Api.Request(request);
return obj;
}
@@ -248,5 +253,49 @@ namespace Ombi.Api.Emby
req.AddContentHeader("Content-Type", "application/json");
req.AddHeader("Device", "Ombi");
}
+
+ public async Task> GetMoviesPlayed(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri) =>
+ await GetPlayed("Movie", apiKey, userId, baseUri, startIndex, count, parentIdFilder, "ProviderIds");
+
+ public async Task> GetTvPlayed(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri) =>
+ await GetPlayed("Episode", apiKey, userId, baseUri, startIndex, count, parentIdFilder);
+
+ private async Task> GetPlayed(
+ string type,
+ string apiKey,
+ string userId,
+ string baseUri,
+ int startIndex,
+ int count,
+ string parentIdFilder = default,
+ string fields = default)
+ {
+ var request = new Request($"emby/items", baseUri, HttpMethod.Get);
+
+ request.AddQueryString("Recursive", true.ToString());
+ request.AddQueryString("IncludeItemTypes", type);
+ if (!string.IsNullOrEmpty(fields))
+ {
+ request.AddQueryString("Fields", fields);
+ }
+ request.AddQueryString("UserId", userId);
+ request.AddQueryString("isPlayed", true.ToString());
+
+ // paginate and display recently played items first
+ request.AddQueryString("sortBy", "DatePlayed");
+ request.AddQueryString("SortOrder", "Descending");
+ request.AddQueryString("startIndex", startIndex.ToString());
+ request.AddQueryString("limit", count.ToString());
+
+ if (!string.IsNullOrEmpty(parentIdFilder))
+ {
+ request.AddQueryString("ParentId", parentIdFilder);
+ }
+
+ AddHeaders(request, apiKey);
+
+ var obj = await Api.Request>(request);
+ return obj;
+ }
}
}
diff --git a/src/Ombi.Api.Emby/IBaseEmbyApi.cs b/src/Ombi.Api.Emby/IBaseEmbyApi.cs
index 248c0a88f..e2ebc513c 100644
--- a/src/Ombi.Api.Emby/IBaseEmbyApi.cs
+++ b/src/Ombi.Api.Emby/IBaseEmbyApi.cs
@@ -11,7 +11,7 @@ namespace Ombi.Api.Emby
{
Task GetSystemInformation(string apiKey, string baseUrl);
Task> GetUsers(string baseUri, string apiKey);
- Task LogIn(string username, string password, string apiKey, string baseUri);
+ Task LogIn(string username, string password, string apiKey, string baseUri, string clientIpAddress);
Task> GetAllMovies(string apiKey, string parentIdFilder, int startIndex, int count, string userId,
string baseUri);
@@ -32,5 +32,8 @@ namespace Ombi.Api.Emby
Task> RecentlyAddedMovies(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri);
Task> RecentlyAddedEpisodes(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri);
Task> RecentlyAddedShows(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri);
+
+ Task> GetMoviesPlayed(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri);
+ Task> GetTvPlayed(string apiKey, string parentIdFilder, int startIndex, int count, string userId, string baseUri);
}
}
\ No newline at end of file
diff --git a/src/Ombi.Api.Emby/Models/Media/Movie/EmbyMovie.cs b/src/Ombi.Api.Emby/Models/Media/Movie/EmbyMovie.cs
index e127f75f6..3e8f5407e 100644
--- a/src/Ombi.Api.Emby/Models/Media/Movie/EmbyMovie.cs
+++ b/src/Ombi.Api.Emby/Models/Media/Movie/EmbyMovie.cs
@@ -5,30 +5,8 @@ namespace Ombi.Api.Emby.Models.Movie
public class EmbyMovie
{
public string Name { get; set; }
- public string ServerId { get; set; }
public string Id { get; set; }
- public string Container { get; set; }
- public DateTime PremiereDate { get; set; }
- public object[] ProductionLocations { get; set; }
- public string OfficialRating { get; set; }
- public float CommunityRating { get; set; }
- public long RunTimeTicks { get; set; }
- public string PlayAccess { get; set; }
- public int ProductionYear { get; set; }
- public bool IsPlaceHolder { get; set; }
- public bool IsHD { get; set; }
- public bool IsFolder { get; set; }
public string Type { get; set; }
- public int LocalTrailerCount { get; set; }
- public EmbyUserdata UserData { get; set; }
- public string VideoType { get; set; }
- public EmbyImagetags ImageTags { get; set; }
- public string[] BackdropImageTags { get; set; }
- public string LocationType { get; set; }
- public string MediaType { get; set; }
- public bool HasSubtitles { get; set; }
- public int CriticRating { get; set; }
- public string Overview { get; set; }
public EmbyProviderids ProviderIds { get; set; }
public EmbyMediastream[] MediaStreams { get; set; }
}
diff --git a/src/Ombi.Api.Jellyfin/Models/Media/Movie/JellyfinMovie.cs b/src/Ombi.Api.Jellyfin/Models/Media/Movie/JellyfinMovie.cs
index a83e1f087..7368c194e 100644
--- a/src/Ombi.Api.Jellyfin/Models/Media/Movie/JellyfinMovie.cs
+++ b/src/Ombi.Api.Jellyfin/Models/Media/Movie/JellyfinMovie.cs
@@ -5,30 +5,8 @@ namespace Ombi.Api.Jellyfin.Models.Movie
public class JellyfinMovie
{
public string Name { get; set; }
- public string ServerId { get; set; }
public string Id { get; set; }
- public string Container { get; set; }
- public DateTime PremiereDate { get; set; }
- public object[] ProductionLocations { get; set; }
- public string OfficialRating { get; set; }
- public float CommunityRating { get; set; }
- public long RunTimeTicks { get; set; }
- public string PlayAccess { get; set; }
- public int ProductionYear { get; set; }
- public bool IsPlaceHolder { get; set; }
- public bool IsHD { get; set; }
- public bool IsFolder { get; set; }
public string Type { get; set; }
- public int LocalTrailerCount { get; set; }
- public JellyfinUserdata UserData { get; set; }
- public string VideoType { get; set; }
- public JellyfinImagetags ImageTags { get; set; }
- public string[] BackdropImageTags { get; set; }
- public string LocationType { get; set; }
- public string MediaType { get; set; }
- public bool HasSubtitles { get; set; }
- public int CriticRating { get; set; }
- public string Overview { get; set; }
public JellyfinProviderids ProviderIds { get; set; }
public JellyfinMediastream[] MediaStreams { get; set; }
}
diff --git a/src/Ombi.Api.Radarr/IRadarrV3Api.cs b/src/Ombi.Api.Radarr/IRadarrV3Api.cs
index 072e8ef51..0b91b4925 100644
--- a/src/Ombi.Api.Radarr/IRadarrV3Api.cs
+++ b/src/Ombi.Api.Radarr/IRadarrV3Api.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
using System.Threading.Tasks;
using Ombi.Api.Radarr.Models;
using Ombi.Api.Radarr.Models.V3;
@@ -14,7 +15,8 @@ namespace Ombi.Api.Radarr
Task GetMovie(int id, string apiKey, string baseUrl);
Task UpdateMovie(MovieResponse movie, string apiKey, string baseUrl);
Task MovieSearch(int[] movieIds, string apiKey, string baseUrl);
- Task AddMovie(int tmdbId, string title, int year, int qualityId, string rootPath,string apiKey, string baseUrl, bool searchNow, string minimumAvailability);
+ Task AddMovie(int tmdbId, string title, int year, int qualityId, string rootPath,string apiKey, string baseUrl, bool searchNow, string minimumAvailability, List tags);
Task> GetTags(string apiKey, string baseUrl);
+ Task CreateTag(string apiKey, string baseUrl, string tagName);
}
}
\ No newline at end of file
diff --git a/src/Ombi.Api.Radarr/Models/V2/RadarrAddMovie.cs b/src/Ombi.Api.Radarr/Models/V2/RadarrAddMovie.cs
index 09e985f43..9efea8ee1 100644
--- a/src/Ombi.Api.Radarr/Models/V2/RadarrAddMovie.cs
+++ b/src/Ombi.Api.Radarr/Models/V2/RadarrAddMovie.cs
@@ -29,5 +29,6 @@ namespace Ombi.Api.Radarr.Models
public int year { get; set; }
public string minimumAvailability { get; set; }
public long sizeOnDisk { get; set; }
+ public int[] tags { get; set; }
}
}
\ No newline at end of file
diff --git a/src/Ombi.Api.Radarr/RadarrV3Api.cs b/src/Ombi.Api.Radarr/RadarrV3Api.cs
index 9e7e0f4c2..76656be65 100644
--- a/src/Ombi.Api.Radarr/RadarrV3Api.cs
+++ b/src/Ombi.Api.Radarr/RadarrV3Api.cs
@@ -72,7 +72,7 @@ namespace Ombi.Api.Radarr
return await Api.Request(request);
}
- public async Task AddMovie(int tmdbId, string title, int year, int qualityId, string rootPath, string apiKey, string baseUrl, bool searchNow, string minimumAvailability)
+ public async Task AddMovie(int tmdbId, string title, int year, int qualityId, string rootPath, string apiKey, string baseUrl, bool searchNow, string minimumAvailability, List tags)
{
var request = new Request("/api/v3/movie", baseUrl, HttpMethod.Post);
@@ -86,7 +86,8 @@ namespace Ombi.Api.Radarr
monitored = true,
year = year,
minimumAvailability = minimumAvailability,
- sizeOnDisk = 0
+ sizeOnDisk = 0,
+ tags = tags.Any() ? tags.ToArray() : Enumerable.Empty().ToArray()
};
if (searchNow)
@@ -156,5 +157,14 @@ namespace Ombi.Api.Radarr
{
request.AddHeader("X-Api-Key", key);
}
+
+ public Task CreateTag(string apiKey, string baseUrl, string tagName)
+ {
+ var request = new Request($"/api/v3/tag", baseUrl, HttpMethod.Post);
+ request.AddHeader("X-Api-Key", apiKey);
+ request.AddJsonBody(new { Label = tagName });
+
+ return Api.Request(request);
+ }
}
}
diff --git a/src/Ombi.Api.Sonarr/Models/SystemStatus.cs b/src/Ombi.Api.Sonarr/Models/SystemStatus.cs
index 778570a4c..a78429328 100644
--- a/src/Ombi.Api.Sonarr/Models/SystemStatus.cs
+++ b/src/Ombi.Api.Sonarr/Models/SystemStatus.cs
@@ -3,23 +3,6 @@ namespace Ombi.Api.Sonarr
public class SystemStatus
{
public string version { get; set; }
- public string buildTime { get; set; }
- public bool isDebug { get; set; }
- public bool isProduction { get; set; }
- public bool isAdmin { get; set; }
- public bool isUserInteractive { get; set; }
- public string startupPath { get; set; }
- public string appData { get; set; }
- public string osVersion { get; set; }
- public bool isMonoRuntime { get; set; }
- public bool isMono { get; set; }
- public bool isLinux { get; set; }
- public bool isOsx { get; set; }
- public bool isWindows { get; set; }
- public string branch { get; set; }
- public string authentication { get; set; }
- public string sqliteVersion { get; set; }
public string urlBase { get; set; }
- public string runtimeVersion { get; set; }
}
}
\ No newline at end of file
diff --git a/src/Ombi.Core.Tests/Engine/MovieRequestEngineTests.cs b/src/Ombi.Core.Tests/Engine/MovieRequestEngineTests.cs
index 8418cddbc..c55d76e8f 100644
--- a/src/Ombi.Core.Tests/Engine/MovieRequestEngineTests.cs
+++ b/src/Ombi.Core.Tests/Engine/MovieRequestEngineTests.cs
@@ -52,6 +52,7 @@ namespace Ombi.Core.Tests.Engine
_subject = _mocker.CreateInstance();
var list = DbHelper.GetQueryableMockDbSet(new RequestSubscription());
_mocker.Setup, IQueryable>(x => x.GetAll()).Returns(new List().AsQueryable().BuildMock());
+ _mocker.Setup>(x => x.GetAll()).Returns(new List().AsQueryable().BuildMock());
}
[Test]
diff --git a/src/Ombi.Core.Tests/Engine/V2/MovieRequestEngineTests.cs b/src/Ombi.Core.Tests/Engine/V2/MovieRequestEngineTests.cs
index 16b7cb811..c483d81ba 100644
--- a/src/Ombi.Core.Tests/Engine/V2/MovieRequestEngineTests.cs
+++ b/src/Ombi.Core.Tests/Engine/V2/MovieRequestEngineTests.cs
@@ -46,8 +46,9 @@ namespace Ombi.Core.Tests.Engine.V2
var requestSubs = new Mock>();
var mediaCache = new Mock();
var featureService = new Mock();
+ var userPlayedMovieRepository = new Mock();
_engine = new MovieRequestEngine(movieApi.Object, requestService.Object, user.Object, notificationHelper.Object, rules.Object, movieSender.Object,
- logger.Object, userManager.Object, requestLogRepo.Object, cache.Object, ombiSettings.Object, requestSubs.Object, mediaCache.Object, featureService.Object);
+ logger.Object, userManager.Object, requestLogRepo.Object, cache.Object, ombiSettings.Object, requestSubs.Object, mediaCache.Object, featureService.Object, userPlayedMovieRepository.Object);
}
[Test]
diff --git a/src/Ombi.Core.Tests/Services/RecentlyRequestedServiceTests.cs b/src/Ombi.Core.Tests/Services/RecentlyRequestedServiceTests.cs
index 018ee99e9..dc748e0d9 100644
--- a/src/Ombi.Core.Tests/Services/RecentlyRequestedServiceTests.cs
+++ b/src/Ombi.Core.Tests/Services/RecentlyRequestedServiceTests.cs
@@ -173,6 +173,7 @@ namespace Ombi.Core.Tests.Services
[Test]
+ [Ignore("Flaky")]
public async Task GetRecentlyRequested_HideUsernames()
{
_mocker.Setup, Task>(x => x.GetSettingsAsync())
@@ -182,20 +183,25 @@ namespace Ombi.Core.Tests.Services
var releaseDate = new DateTime(2019, 01, 01);
var requestDate = DateTime.Now;
- var movies = _fixture.CreateMany(10);
+ var movies = _fixture.CreateMany(10).ToList();
var albums = _fixture.CreateMany(10);
var chilRequests = _fixture.CreateMany(10);
+ movies.Add(_fixture.Build().With(x => x.RequestedUserId, "a").With(x => x.Title, "unit").Create());
_mocker.Setup>(x => x.GetAll()).Returns(movies.AsQueryable().BuildMock());
_mocker.Setup>(x => x.GetAll()).Returns(albums.AsQueryable().BuildMock());
_mocker.Setup>(x => x.GetChild()).Returns(chilRequests.AsQueryable().BuildMock());
- _mocker.Setup>(x => x.GetUser()).ReturnsAsync(new OmbiUser { UserName = "test", Alias = "alias", UserType = UserType.LocalUser });
+ _mocker.Setup>(x => x.GetUser()).ReturnsAsync(new OmbiUser { UserName = "test", Id = "a", Alias = "alias", UserType = UserType.LocalUser });
_mocker.Setup(x => x.Username).Returns("test");
_mocker.Setup>(x => x.IsInRoleAsync(It.IsAny(), It.IsAny())).ReturnsAsync(false);
var result = await _subject.GetRecentlyRequested(CancellationToken.None);
- CollectionAssert.IsEmpty(result.Where(x => !string.IsNullOrEmpty(x.Username) && !string.IsNullOrEmpty(x.UserId)));
+ Assert.Multiple(() =>
+ {
+ Assert.That(result.Count, Is.EqualTo(1));
+ Assert.That(result.First().Title, Is.EqualTo("unit"));
+ });
}
}
}
diff --git a/src/Ombi.Core/Authentication/OmbiUserManager.cs b/src/Ombi.Core/Authentication/OmbiUserManager.cs
index 124ff1aeb..e80469a00 100644
--- a/src/Ombi.Core/Authentication/OmbiUserManager.cs
+++ b/src/Ombi.Core/Authentication/OmbiUserManager.cs
@@ -69,6 +69,8 @@ namespace Ombi.Core.Authentication
private readonly ISettingsService _embySettings;
private readonly ISettingsService _jellyfinSettings;
private readonly ISettingsService _authSettings;
+ private string _clientIpAddress;
+ public string ClientIpAddress { get => _clientIpAddress; set => _clientIpAddress = value; }
public override async Task CheckPasswordAsync(OmbiUser user, string password)
{
@@ -88,7 +90,7 @@ namespace Ombi.Core.Authentication
}
if (user.UserType == UserType.EmbyUser || user.UserType == UserType.EmbyConnectUser)
{
- return await CheckEmbyPasswordAsync(user, password);
+ return await CheckEmbyPasswordAsync(user, password, ClientIpAddress);
}
if (user.UserType == UserType.JellyfinUser)
{
@@ -168,7 +170,7 @@ namespace Ombi.Core.Authentication
///
///
///
- private async Task CheckEmbyPasswordAsync(OmbiUser user, string password)
+ private async Task CheckEmbyPasswordAsync(OmbiUser user, string password, string clientIpAddress="")
{
var embySettings = await _embySettings.GetSettingsAsync();
var client = _embyApi.CreateClient(embySettings);
@@ -196,7 +198,7 @@ namespace Ombi.Core.Authentication
{
try
{
- var result = await client.LogIn(user.UserName, password, server.ApiKey, server.FullUri);
+ var result = await client.LogIn(user.UserName, password, server.ApiKey, server.FullUri, clientIpAddress);
if (result != null)
{
return true;
diff --git a/src/Ombi.Core/Engine/MovieRequestEngine.cs b/src/Ombi.Core/Engine/MovieRequestEngine.cs
index 109460ff9..4d3cd2cf9 100644
--- a/src/Ombi.Core/Engine/MovieRequestEngine.cs
+++ b/src/Ombi.Core/Engine/MovieRequestEngine.cs
@@ -33,7 +33,8 @@ namespace Ombi.Core.Engine
INotificationHelper helper, IRuleEvaluator r, IMovieSender sender, ILogger log,
OmbiUserManager manager, IRepository rl, ICacheService cache,
ISettingsService ombiSettings, IRepository sub, IMediaCacheService mediaCacheService,
- IFeatureService featureService)
+ IFeatureService featureService,
+ IUserPlayedMovieRepository userPlayedMovieRepository)
: base(user, requestService, r, manager, cache, ombiSettings, sub)
{
MovieApi = movieApi;
@@ -43,6 +44,7 @@ namespace Ombi.Core.Engine
_requestLog = rl;
_mediaCacheService = mediaCacheService;
_featureService = featureService;
+ _userPlayedMovieRepository = userPlayedMovieRepository;
}
private IMovieDbApi MovieApi { get; }
@@ -52,6 +54,7 @@ namespace Ombi.Core.Engine
private readonly IRepository _requestLog;
private readonly IMediaCacheService _mediaCacheService;
private readonly IFeatureService _featureService;
+ protected readonly IUserPlayedMovieRepository _userPlayedMovieRepository;
///
/// Requests the movie.
@@ -77,7 +80,8 @@ namespace Ombi.Core.Engine
var userDetails = await GetUser();
var canRequestOnBehalf = model.RequestOnBehalf.HasValue();
- var isAdmin = await UserManager.IsInRoleAsync(userDetails, OmbiRoles.PowerUser)
+ var isAdmin = Username.Equals("API", StringComparison.CurrentCultureIgnoreCase)
+ || await UserManager.IsInRoleAsync(userDetails, OmbiRoles.PowerUser)
|| await UserManager.IsInRoleAsync(userDetails, OmbiRoles.Admin);
if (canRequestOnBehalf && !isAdmin)
{
@@ -252,7 +256,7 @@ namespace Ombi.Core.Engine
var requests = await (OrderMovies(allRequests, orderFilter.OrderType)).Skip(position).Take(count)
.ToListAsync();
- await CheckForSubscription(shouldHide.UserId, requests);
+ await FillAdditionalFields(shouldHide, requests);
return new RequestsViewModel
{
Collection = requests,
@@ -296,7 +300,7 @@ namespace Ombi.Core.Engine
var total = requests.Count();
requests = requests.Skip(position).Take(count).ToList();
- await CheckForSubscription(shouldHide.UserId, requests);
+ await FillAdditionalFields(shouldHide, requests);
return new RequestsViewModel
{
Collection = requests,
@@ -381,7 +385,7 @@ namespace Ombi.Core.Engine
// TODO fix this so we execute this on the server
requests = requests.Skip(position).Take(count).ToList();
- await CheckForSubscription(shouldHide.UserId, requests);
+ await FillAdditionalFields(shouldHide, requests);
return new RequestsViewModel
{
Collection = requests,
@@ -424,7 +428,7 @@ namespace Ombi.Core.Engine
var total = requests.Count();
requests = requests.Skip(position).Take(count).ToList();
- await CheckForSubscription(shouldHide.UserId, requests);
+ await FillAdditionalFields(shouldHide, requests);
return new RequestsViewModel
{
Collection = requests,
@@ -506,18 +510,25 @@ namespace Ombi.Core.Engine
allRequests = await MovieRepository.GetWithUser().ToListAsync();
}
- await CheckForSubscription(shouldHide.UserId, allRequests);
+ await FillAdditionalFields(shouldHide, allRequests);
return allRequests;
}
public async Task GetRequest(int requestId)
{
+ var shouldHide = await HideFromOtherUsers();
+ // TODO: this query should return the request only if the user is allowed to see it (see shouldHide implementations)
var request = await MovieRepository.GetWithUser().Where(x => x.Id == requestId).FirstOrDefaultAsync();
- await CheckForSubscription((await GetUser()).Id, new List { request });
+ await FillAdditionalFields(shouldHide, new List { request });
return request;
}
+ private async Task FillAdditionalFields(HideResult shouldHide, List requests)
+ {
+ await CheckForSubscription(shouldHide.UserId, requests);
+ await CheckForPlayed(shouldHide, requests);
+ }
private async Task CheckForSubscription(string UserId, List movieRequests)
{
@@ -543,6 +554,23 @@ namespace Ombi.Core.Engine
}
}
}
+
+ private async Task CheckForPlayed(HideResult shouldHide, List movieRequests)
+ {
+ var theMovieDbIds = movieRequests.Select(x => x.TheMovieDbId);
+ var plays = await _userPlayedMovieRepository.GetAll().Where(x =>
+ theMovieDbIds.Contains(x.TheMovieDbId))
+ .ToListAsync();
+ foreach (var request in movieRequests)
+ {
+ request.WatchedByRequestedUser = plays.Exists(x => x.TheMovieDbId == request.TheMovieDbId && x.UserId == request.RequestedUserId);
+
+ if (!shouldHide.Hide)
+ {
+ request.PlayedByUsersCount = plays.Count(x => x.TheMovieDbId == request.TheMovieDbId);
+ }
+ }
+ }
///
/// Searches the movie request.
@@ -563,7 +591,7 @@ namespace Ombi.Core.Engine
}
var results = allRequests.Where(x => x.Title.Contains(search, CompareOptions.IgnoreCase)).ToList();
- await CheckForSubscription(shouldHide.UserId, results);
+ await FillAdditionalFields(shouldHide, results);
return results;
}
diff --git a/src/Ombi.Core/Engine/TvRequestEngine.cs b/src/Ombi.Core/Engine/TvRequestEngine.cs
index 8ccc6d17e..16866d0dd 100644
--- a/src/Ombi.Core/Engine/TvRequestEngine.cs
+++ b/src/Ombi.Core/Engine/TvRequestEngine.cs
@@ -35,7 +35,8 @@ namespace Ombi.Core.Engine
public TvRequestEngine(ITvMazeApi tvApi, IMovieDbApi movApi, IRequestServiceMain requestService, ICurrentUser user,
INotificationHelper helper, IRuleEvaluator rule, OmbiUserManager manager, ILogger logger,
ITvSender sender, IRepository rl, ISettingsService settings, ICacheService cache,
- IRepository sub, IMediaCacheService mediaCacheService) : base(user, requestService, rule, manager, cache, settings, sub)
+ IRepository sub, IMediaCacheService mediaCacheService,
+ IUserPlayedEpisodeRepository userPlayedEpisodeRepository) : base(user, requestService, rule, manager, cache, settings, sub)
{
TvApi = tvApi;
MovieDbApi = movApi;
@@ -44,6 +45,7 @@ namespace Ombi.Core.Engine
TvSender = sender;
_requestLog = rl;
_mediaCacheService = mediaCacheService;
+ _userPlayedEpisodeRepository = userPlayedEpisodeRepository;
}
private INotificationHelper NotificationHelper { get; }
@@ -54,6 +56,7 @@ namespace Ombi.Core.Engine
private readonly ILogger _logger;
private readonly IRepository _requestLog;
private readonly IMediaCacheService _mediaCacheService;
+ private readonly IUserPlayedEpisodeRepository _userPlayedEpisodeRepository;
public async Task RequestTvShow(TvRequestViewModel tv)
{
@@ -161,7 +164,7 @@ namespace Ombi.Core.Engine
var user = await GetUser();
var canRequestOnBehalf = tv.RequestOnBehalf.HasValue();
- var isAdmin = await UserManager.IsInRoleAsync(user, OmbiRoles.PowerUser) || await UserManager.IsInRoleAsync(user, OmbiRoles.Admin);
+ var isAdmin = Username.Equals("API", StringComparison.CurrentCultureIgnoreCase) || await UserManager.IsInRoleAsync(user, OmbiRoles.PowerUser) || await UserManager.IsInRoleAsync(user, OmbiRoles.Admin);
if (tv.RequestOnBehalf.HasValue() && !isAdmin)
{
return new RequestEngineResult
@@ -292,7 +295,7 @@ namespace Ombi.Core.Engine
.Skip(position).Take(count).ToListAsync();
}
- await CheckForSubscription(shouldHide, allRequests);
+ await FillAdditionalFields(shouldHide, allRequests);
return new RequestsViewModel
{
@@ -328,7 +331,7 @@ namespace Ombi.Core.Engine
return new RequestsViewModel();
}
- await CheckForSubscription(shouldHide, allRequests);
+ await FillAdditionalFields(shouldHide, allRequests);
return new RequestsViewModel
{
@@ -351,7 +354,7 @@ namespace Ombi.Core.Engine
allRequests = await TvRepository.Get().ToListAsync();
}
- await CheckForSubscription(shouldHide, allRequests);
+ await FillAdditionalFields(shouldHide, allRequests);
return allRequests;
}
@@ -396,7 +399,7 @@ namespace Ombi.Core.Engine
? allRequests.OrderBy(x => prop.GetValue(x)).ToList()
: allRequests.OrderByDescending(x => prop.GetValue(x)).ToList();
- await CheckForSubscription(shouldHide, allRequests);
+ await FillAdditionalFields(shouldHide, allRequests);
// Make sure we do not show duplicate child requests
allRequests = allRequests.DistinctBy(x => x.ParentRequest.Title).ToList();
@@ -469,7 +472,7 @@ namespace Ombi.Core.Engine
? allRequests.OrderBy(x => prop.GetValue(x)).ToList()
: allRequests.OrderByDescending(x => prop.GetValue(x)).ToList();
- await CheckForSubscription(shouldHide, allRequests);
+ await FillAdditionalFields(shouldHide, allRequests);
// Make sure we do not show duplicate child requests
allRequests = allRequests.DistinctBy(x => x.ParentRequest.Title).ToList();
@@ -523,7 +526,7 @@ namespace Ombi.Core.Engine
allRequests = sortOrder.Equals("asc", StringComparison.InvariantCultureIgnoreCase)
? allRequests.OrderBy(x => prop.GetValue(x)).ToList()
: allRequests.OrderByDescending(x => prop.GetValue(x)).ToList();
- await CheckForSubscription(shouldHide, allRequests);
+ await FillAdditionalFields(shouldHide, allRequests);
// Make sure we do not show duplicate child requests
allRequests = allRequests.DistinctBy(x => x.ParentRequest.Title).ToList();
@@ -551,7 +554,7 @@ namespace Ombi.Core.Engine
allRequests = await TvRepository.GetLite().ToListAsync();
}
- await CheckForSubscription(shouldHide, allRequests);
+ await FillAdditionalFields(shouldHide, allRequests);
return allRequests;
}
@@ -570,7 +573,7 @@ namespace Ombi.Core.Engine
request = await TvRepository.Get().Where(x => x.Id == requestId).FirstOrDefaultAsync();
}
- await CheckForSubscription(shouldHide, new List{request});
+ await FillAdditionalFields(shouldHide, new List{request});
return request;
}
@@ -624,7 +627,7 @@ namespace Ombi.Core.Engine
allRequests = await TvRepository.GetChild().Include(x => x.SeasonRequests).Where(x => x.ParentRequestId == tvId).ToListAsync();
}
- await CheckForSubscription(shouldHide, allRequests);
+ await FillAdditionalFields(shouldHide, allRequests);
return allRequests;
}
@@ -643,7 +646,7 @@ namespace Ombi.Core.Engine
}
var results = await allRequests.Where(x => x.Title.Contains(search, CompareOptions.IgnoreCase)).ToListAsync();
- await CheckForSubscription(shouldHide, results);
+ await FillAdditionalFields(shouldHide, results);
return results;
}
@@ -864,14 +867,20 @@ namespace Ombi.Core.Engine
}
}
- private async Task CheckForSubscription(HideResult shouldHide, List x)
+ private async Task FillAdditionalFields(HideResult shouldHide, List x)
{
foreach (var tvRequest in x)
{
- await CheckForSubscription(shouldHide, tvRequest.ChildRequests);
+ await FillAdditionalFields(shouldHide, tvRequest.ChildRequests);
}
}
+ private async Task FillAdditionalFields(HideResult shouldHide, List childRequests)
+ {
+ await CheckForSubscription(shouldHide, childRequests);
+ CheckForPlayed(shouldHide, childRequests);
+ }
+
private async Task CheckForSubscription(HideResult shouldHide, List childRequests)
{
var sub = _subscriptionRepository.GetAll();
@@ -896,6 +905,52 @@ namespace Ombi.Core.Engine
}
}
+ private class EpisodeKey
+ {
+ public int SeasonNumber;
+ public int EpisodeNumber;
+ }
+
+ private void CheckForPlayed(HideResult shouldHide, List childRequests)
+ {
+ var theMovieDbIds = childRequests.Select(x => x.Id);
+ foreach (var request in childRequests)
+ {
+ var requestedEpisodes = GetEpisodesKeys(request);
+
+ var playedEpisodes = _userPlayedEpisodeRepository
+ .GetAll()
+ .Where(x => x.TheMovieDbId == request.Id && x.UserId == request.RequestedUserId)
+ .AsEnumerable()
+ .Join(requestedEpisodes,
+ played => new { played.SeasonNumber, played.EpisodeNumber },
+ requested => new { requested.SeasonNumber, requested.EpisodeNumber },
+ (played, requested) => new { played });
+
+ var playedCount = playedEpisodes.Count();
+ var toWatchCount = requestedEpisodes.Count();
+ request.RequestedUserPlayedProgress = 100 * playedCount / toWatchCount;
+
+ }
+ }
+
+ private List GetEpisodesKeys(ChildRequests request)
+ {
+ List result = new List();
+ foreach(var season in request.SeasonRequests)
+ {
+ foreach(var episode in season.Episodes)
+ {
+ result.Add(new EpisodeKey
+ {
+ SeasonNumber = season.SeasonNumber,
+ EpisodeNumber = episode.EpisodeNumber
+ });
+ }
+ }
+ return result;
+ }
+
private async Task AddExistingRequest(ChildRequests newRequest, TvRequests existingRequest, string requestOnBehalf, int rootFolder, int qualityProfile)
{
// Add the child
diff --git a/src/Ombi.Core/Models/Requests/RecentlyRequestedModel.cs b/src/Ombi.Core/Models/Requests/RecentlyRequestedModel.cs
index 4296c2cc1..daab65e71 100644
--- a/src/Ombi.Core/Models/Requests/RecentlyRequestedModel.cs
+++ b/src/Ombi.Core/Models/Requests/RecentlyRequestedModel.cs
@@ -16,6 +16,7 @@ namespace Ombi.Core.Models.Requests
public string Overview { get; set; }
public DateTime ReleaseDate { get; set; }
public bool Approved { get; set; }
+ public bool Denied { get; set; }
public string MediaId { get; set; }
public string PosterPath { get; set; }
diff --git a/src/Ombi.Core/Models/TesterResultModel.cs b/src/Ombi.Core/Models/TesterResultModel.cs
index 563fa5cb2..945e0e261 100644
--- a/src/Ombi.Core/Models/TesterResultModel.cs
+++ b/src/Ombi.Core/Models/TesterResultModel.cs
@@ -5,5 +5,6 @@
public bool IsValid { get; set; }
public string Version { get; set; }
public string ExpectedSubDir { get; set; }
+ public string AdditionalInformation { get; set; }
}
}
diff --git a/src/Ombi.Core/Senders/MovieSender.cs b/src/Ombi.Core/Senders/MovieSender.cs
index 36d40bdad..f6907e2f5 100644
--- a/src/Ombi.Core/Senders/MovieSender.cs
+++ b/src/Ombi.Core/Senders/MovieSender.cs
@@ -15,6 +15,8 @@ using Ombi.Store.Entities;
using Ombi.Store.Repository;
using System.Collections.Generic;
using Ombi.Api.Radarr.Models;
+using Microsoft.Extensions.Options;
+using Ombi.Api.Sonarr;
namespace Ombi.Core.Senders
{
@@ -67,7 +69,7 @@ namespace Ombi.Core.Senders
}
if (radarrSettings.Enabled)
{
- return await SendToRadarr(model, is4K, radarrSettings);
+ return await SendToRadarr(model, radarrSettings);
}
var dogSettings = await _dogNzbSettings.GetSettingsAsync();
@@ -131,7 +133,7 @@ namespace Ombi.Core.Senders
return await _dogNzbApi.AddMovie(settings.ApiKey, id);
}
- private async Task SendToRadarr(MovieRequests model, bool is4K, RadarrSettings settings)
+ private async Task SendToRadarr(MovieRequests model, RadarrSettings settings)
{
var qualityToUse = int.Parse(settings.DefaultQualityProfile);
@@ -154,6 +156,17 @@ namespace Ombi.Core.Senders
}
}
+ var tags = new List();
+ if (settings.Tag.HasValue)
+ {
+ tags.Add(settings.Tag.Value);
+ }
+ if (settings.SendUserTags)
+ {
+ var userTag = await GetOrCreateTag(model, settings);
+ tags.Add(userTag.id);
+ }
+
// Overrides on the request take priority
if (model.QualityOverride > 0)
{
@@ -174,7 +187,7 @@ namespace Ombi.Core.Senders
{
var result = await _radarrV3Api.AddMovie(model.TheMovieDbId, model.Title, model.ReleaseDate.Year,
qualityToUse, rootFolderPath, settings.ApiKey, settings.FullUri, !settings.AddOnly,
- settings.MinimumAvailability);
+ settings.MinimumAvailability, tags);
if (!string.IsNullOrEmpty(result.Error?.message))
{
@@ -212,5 +225,17 @@ namespace Ombi.Core.Senders
var selectedPath = paths.FirstOrDefault(x => x.id == overrideId);
return selectedPath?.path ?? string.Empty;
}
+
+ private async Task GetOrCreateTag(MovieRequests model, RadarrSettings s)
+ {
+ var tagName = model.RequestedUser.UserName;
+ // Does tag exist?
+
+ var allTags = await _radarrV3Api.GetTags(s.ApiKey, s.FullUri);
+ var existingTag = allTags.FirstOrDefault(x => x.label.Equals(tagName, StringComparison.InvariantCultureIgnoreCase));
+ existingTag ??= await _radarrV3Api.CreateTag(s.ApiKey, s.FullUri, tagName);
+
+ return existingTag;
+ }
}
}
\ No newline at end of file
diff --git a/src/Ombi.Core/Senders/MusicSender.cs b/src/Ombi.Core/Senders/MusicSender.cs
index 260b008fe..57bf4ab68 100644
--- a/src/Ombi.Core/Senders/MusicSender.cs
+++ b/src/Ombi.Core/Senders/MusicSender.cs
@@ -100,7 +100,7 @@ namespace Ombi.Core.Senders
addOptions = new Addoptions
{
monitored = true,
- monitor = MonitorTypes.None,
+ monitor = MonitorTypes.Existing,
searchForMissingAlbums = false,
AlbumsToMonitor = new[] {model.ForeignAlbumId}
},
@@ -199,4 +199,4 @@ namespace Ombi.Core.Senders
return new SenderResult { Message = "Could not set album to monitored", Sent = false, Success = false };
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Ombi.Core/Services/RecentlyRequestedService.cs b/src/Ombi.Core/Services/RecentlyRequestedService.cs
index 1c67472d4..26d873c4d 100644
--- a/src/Ombi.Core/Services/RecentlyRequestedService.cs
+++ b/src/Ombi.Core/Services/RecentlyRequestedService.cs
@@ -73,6 +73,10 @@ namespace Ombi.Core.Services
var lang = await DefaultLanguageCode();
foreach (var item in await recentMovieRequests.ToListAsync(cancellationToken))
{
+ if (hideUsers.Hide && item.RequestedUserId != hideUsers.UserId)
+ {
+ continue;
+ }
var images = await _cache.GetOrAddAsync($"{CacheKeys.TmdbImages}movie{item.TheMovieDbId}", () => _movieDbApi.GetMovieImages(item.TheMovieDbId.ToString(), cancellationToken), DateTimeOffset.Now.AddDays(1));
model.Add(new RecentlyRequestedModel
{
@@ -84,8 +88,9 @@ namespace Ombi.Core.Services
Title = item.Title,
Type = RequestType.Movie,
Approved = item.Approved,
- UserId = hideUsers.Hide ? string.Empty : item.RequestedUserId,
- Username = hideUsers.Hide ? string.Empty : item.RequestedUser.UserAlias,
+ Denied = item.Denied ?? false,
+ UserId = item.RequestedUserId,
+ Username = item.RequestedUser.UserAlias,
MediaId = item.TheMovieDbId.ToString(),
PosterPath = images?.posters?.Where(x => lang.Equals(x?.iso_639_1, StringComparison.InvariantCultureIgnoreCase))?.OrderByDescending(x => x.vote_count)?.Select(x => x.file_path)?.FirstOrDefault(),
Background = images?.backdrops?.Where(x => lang.Equals(x?.iso_639_1, StringComparison.InvariantCultureIgnoreCase))?.OrderByDescending(x => x.vote_count)?.Select(x => x.file_path)?.FirstOrDefault(),
@@ -94,24 +99,33 @@ namespace Ombi.Core.Services
foreach (var item in await recentMusicRequests.ToListAsync(cancellationToken))
{
+ if (hideUsers.Hide && item.RequestedUserId != hideUsers.UserId)
+ {
+ continue;
+ }
model.Add(new RecentlyRequestedModel
{
RequestId = item.Id,
Available = item.Available,
Overview = item.ArtistName,
Approved = item.Approved,
+ Denied = item.Denied ?? false,
ReleaseDate = item.ReleaseDate,
RequestDate = item.RequestedDate,
Title = item.Title,
Type = RequestType.Album,
- UserId = hideUsers.Hide ? string.Empty : item.RequestedUserId,
- Username = hideUsers.Hide ? string.Empty : item.RequestedUser.UserAlias,
+ UserId = item.RequestedUserId,
+ Username = item.RequestedUser.UserAlias,
MediaId = item.ForeignAlbumId,
});
}
foreach (var item in await recentTvRequests.ToListAsync(cancellationToken))
{
+ if (hideUsers.Hide && item.RequestedUserId != hideUsers.UserId)
+ {
+ continue;
+ }
var providerId = item.ParentRequest.ExternalProviderId.ToString();
var images = await _cache.GetOrAddAsync($"{CacheKeys.TmdbImages}tv{providerId}", () => _movieDbApi.GetTvImages(providerId.ToString(), cancellationToken), DateTimeOffset.Now.AddDays(1));
@@ -123,12 +137,13 @@ namespace Ombi.Core.Services
Overview = item.ParentRequest.Overview,
ReleaseDate = item.ParentRequest.ReleaseDate,
Approved = item.Approved,
+ Denied = item.Denied ?? false,
RequestDate = item.RequestedDate,
TvPartiallyAvailable = partialAvailability,
Title = item.ParentRequest.Title,
Type = RequestType.TvShow,
- UserId = hideUsers.Hide ? string.Empty : item.RequestedUserId,
- Username = hideUsers.Hide ? string.Empty : item.RequestedUser.UserAlias,
+ UserId = item.RequestedUserId,
+ Username = item.RequestedUser.UserAlias,
MediaId = providerId.ToString(),
PosterPath = images?.posters?.Where(x => lang.Equals(x?.iso_639_1, StringComparison.InvariantCultureIgnoreCase))?.OrderByDescending(x => x.vote_count)?.Select(x => x.file_path)?.FirstOrDefault(),
Background = images?.backdrops?.Where(x => lang.Equals(x?.iso_639_1, StringComparison.InvariantCultureIgnoreCase))?.OrderByDescending(x => x.vote_count)?.Select(x => x.file_path)?.FirstOrDefault(),
diff --git a/src/Ombi.DependencyInjection/IocExtensions.cs b/src/Ombi.DependencyInjection/IocExtensions.cs
index 09d99d4b7..8a5509963 100644
--- a/src/Ombi.DependencyInjection/IocExtensions.cs
+++ b/src/Ombi.DependencyInjection/IocExtensions.cs
@@ -197,6 +197,8 @@ namespace Ombi.DependencyInjection
services.AddScoped();
services.AddScoped();
services.AddScoped();
+ services.AddScoped();
+ services.AddScoped();
services.AddScoped();
services.AddScoped();
@@ -244,6 +246,7 @@ namespace Ombi.DependencyInjection
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
diff --git a/src/Ombi.HealthChecks/Checks/OmbiPingHealthCheck.cs b/src/Ombi.HealthChecks/Checks/OmbiPingHealthCheck.cs
deleted file mode 100644
index 726d02078..000000000
--- a/src/Ombi.HealthChecks/Checks/OmbiPingHealthCheck.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using HealthChecks.Network;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System;
-using System.Collections.Generic;
-using System.Net.NetworkInformation;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Ombi.HealthChecks.Checks
-{
- public class OmbiPingHealthCheck
- : IHealthCheck
- {
- private readonly OmbiPingHealthCheckOptions _options;
- public OmbiPingHealthCheck(OmbiPingHealthCheckOptions options)
- {
- _options = options ?? throw new ArgumentNullException(nameof(options));
- }
- public async Task CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
- {
- var configuredHosts = _options.ConfiguredHosts.Values;
-
- try
- {
- foreach (var (host, timeout, status) in configuredHosts)
- {
- using (var ping = new Ping())
- {
- var pingReply = await ping.SendPingAsync(host, timeout);
-
- if (pingReply.Status != IPStatus.Success)
- {
- return new HealthCheckResult(status, description: $"Ping check for host {host} is failed with status reply:{pingReply.Status}");
- }
- }
- }
-
- return HealthCheckResult.Healthy();
- }
- catch (Exception ex)
- {
- return new HealthCheckResult(context.Registration.FailureStatus, exception: ex);
- }
- }
- }
-}
diff --git a/src/Ombi.HealthChecks/Checks/OmbiPingHealthCheckOptions.cs b/src/Ombi.HealthChecks/Checks/OmbiPingHealthCheckOptions.cs
deleted file mode 100644
index f89c71a52..000000000
--- a/src/Ombi.HealthChecks/Checks/OmbiPingHealthCheckOptions.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System.Collections.Generic;
-
-namespace Ombi.HealthChecks.Checks
-{
- public class OmbiPingHealthCheckOptions
- {
- internal Dictionary ConfiguredHosts { get; } = new Dictionary();
-
- public OmbiPingHealthCheckOptions AddHost(string host, int timeout, HealthStatus status)
- {
- ConfiguredHosts.Add(host, (host, timeout, status));
- return this;
- }
- }
-}
diff --git a/src/Ombi.HealthChecks/Checks/PlexHealthCheck.cs b/src/Ombi.HealthChecks/Checks/PlexHealthCheck.cs
index 182c1b2f8..bc90c4756 100644
--- a/src/Ombi.HealthChecks/Checks/PlexHealthCheck.cs
+++ b/src/Ombi.HealthChecks/Checks/PlexHealthCheck.cs
@@ -27,7 +27,7 @@ namespace Ombi.HealthChecks.Checks
var settings = await settingsProvider.GetSettingsAsync();
if (settings == null)
{
- return HealthCheckResult.Healthy("Plex is not confiured.");
+ return HealthCheckResult.Healthy("Plex is not configured.");
}
var taskResult = new List>();
diff --git a/src/Ombi.HealthChecks/HealthCheckExtensions.cs b/src/Ombi.HealthChecks/HealthCheckExtensions.cs
index 2f80378ff..21b9d5dde 100644
--- a/src/Ombi.HealthChecks/HealthCheckExtensions.cs
+++ b/src/Ombi.HealthChecks/HealthCheckExtensions.cs
@@ -18,39 +18,8 @@ namespace Ombi.HealthChecks
builder.AddCheck("Radarr", tags: new string[] { "DVR" });
builder.AddCheck("CouchPotato", tags: new string[] { "DVR" });
builder.AddCheck("SickRage", tags: new string[] { "DVR" });
- builder.AddOmbiPingHealthCheck(options =>
- {
- options.AddHost("www.google.co.uk", 5000, HealthStatus.Unhealthy);
- options.AddHost("www.google.com", 3000, HealthStatus.Degraded);
- }, "External Ping", tags: new string[] { "System" });
return builder;
}
-
- ///
- /// Add a health check for network ping.
- ///
- /// The .
- /// The action to configure the ping parameters.
- /// The health check name. Optional. If null the type name 'ping' will be used for the name.
- ///
- /// The that should be reported when the health check fails. Optional. If null then
- /// the default status of will be reported.
- ///
- /// A list of tags that can be used to filter sets of health checks. Optional.
- /// An optional System.TimeSpan representing the timeout of the check.
- /// The .
- public static IHealthChecksBuilder AddOmbiPingHealthCheck(this IHealthChecksBuilder builder, Action setup, string name = default, HealthStatus? failureStatus = default, IEnumerable tags = default, TimeSpan? timeout = default)
- {
- var options = new OmbiPingHealthCheckOptions();
- setup?.Invoke(options);
-
- return builder.Add(new HealthCheckRegistration(
- name,
- sp => new OmbiPingHealthCheck(options),
- failureStatus,
- tags,
- timeout));
- }
}
}
diff --git a/src/Ombi.I18n/Resources/Texts.hu.resx b/src/Ombi.I18n/Resources/Texts.hu.resx
index 4e7cebcfd..bd9f1a19e 100644
--- a/src/Ombi.I18n/Resources/Texts.hu.resx
+++ b/src/Ombi.I18n/Resources/Texts.hu.resx
@@ -118,13 +118,13 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- New Albums
+ Új album
- New Movies
+ Új film
- New TV
+ Új sorozat
Műfaj:
@@ -139,18 +139,18 @@
Epizódok:
- Powered by
+ Biztosítja a(z)
- Unsubscribe
+ Leiratkozás
Album
- Movie
+ Film
- TV Show
+ Sorozat
\ No newline at end of file
diff --git a/src/Ombi.I18n/Resources/Texts.nl.resx b/src/Ombi.I18n/Resources/Texts.nl.resx
index e785eb494..873d68ac2 100644
--- a/src/Ombi.I18n/Resources/Texts.nl.resx
+++ b/src/Ombi.I18n/Resources/Texts.nl.resx
@@ -148,9 +148,9 @@
Album
- Movie
+ Film
- TV Show
+ TV-serie
\ No newline at end of file
diff --git a/src/Ombi.I18n/Resources/Texts.no.resx b/src/Ombi.I18n/Resources/Texts.no.resx
index bf0daa456..b3fd2fe8e 100644
--- a/src/Ombi.I18n/Resources/Texts.no.resx
+++ b/src/Ombi.I18n/Resources/Texts.no.resx
@@ -118,16 +118,16 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- New Albums
+ Nye Album
- New Movies
+ Nye filmer
- New TV
+ Nye TV-serier
- Genres:
+ Sjangere:
Type:
@@ -136,21 +136,21 @@
Sesong:
- Episodes:
+ Episoder:
- Powered by
+ Drevet av
- Unsubscribe
+ Avslutt abonnement
Album
- Movie
+ Film
- TV Show
+ TV-serie
\ No newline at end of file
diff --git a/src/Ombi.Notifications/Agents/DiscordNotification.cs b/src/Ombi.Notifications/Agents/DiscordNotification.cs
index ae344116f..a1619de69 100644
--- a/src/Ombi.Notifications/Agents/DiscordNotification.cs
+++ b/src/Ombi.Notifications/Agents/DiscordNotification.cs
@@ -107,7 +107,7 @@ namespace Ombi.Notifications.Agents
var discordBody = new DiscordWebhookBody
{
content = model.Message,
- username = settings.Username,
+ username = settings.Username ?? "Ombi",
};
var fields = new List();
diff --git a/src/Ombi.Notifications/NotificationMessageCurlys.cs b/src/Ombi.Notifications/NotificationMessageCurlys.cs
index f079c03a3..c1fecb00c 100644
--- a/src/Ombi.Notifications/NotificationMessageCurlys.cs
+++ b/src/Ombi.Notifications/NotificationMessageCurlys.cs
@@ -153,6 +153,7 @@ namespace Ombi.Notifications
RequestedUser = req?.RequestedUser?.UserName;
RequestedDate = req?.RequestedDate.ToString("D");
DetailsUrl = GetDetailsUrl(s, req);
+ RequestedByAlias = req?.RequestedByAlias;
if (Type.IsNullOrEmpty())
{
@@ -276,6 +277,7 @@ namespace Ombi.Notifications
// User Defined
public string RequestId { get; set; }
public string RequestedUser { get; set; }
+ public string RequestedByAlias { get; set; }
public string UserName { get; set; }
public string IssueUser => UserName;
public string Alias { get; set; }
@@ -339,6 +341,7 @@ namespace Ombi.Notifications
{ nameof(IssueUser), IssueUser },
{ nameof(UserName), UserName },
{ nameof(Alias), Alias },
+ { nameof(RequestedByAlias), RequestedByAlias },
{ nameof(UserPreference), UserPreference },
{ nameof(DenyReason), DenyReason },
{ nameof(AvailableDate), AvailableDate },
diff --git a/src/Ombi.Schedule.Tests/PlexWatchlistImportTests.cs b/src/Ombi.Schedule.Tests/PlexWatchlistImportTests.cs
index 9537710a3..c1550e52c 100644
--- a/src/Ombi.Schedule.Tests/PlexWatchlistImportTests.cs
+++ b/src/Ombi.Schedule.Tests/PlexWatchlistImportTests.cs
@@ -4,6 +4,8 @@ using Moq.AutoMock;
using NUnit.Framework;
using Ombi.Api.Plex;
using Ombi.Api.Plex.Models;
+using Ombi.Api.TheMovieDb;
+using Ombi.Api.TheMovieDb.Models;
using Ombi.Core.Engine;
using Ombi.Core.Engine.Interfaces;
using Ombi.Core.Models.Requests;
@@ -55,7 +57,7 @@ namespace Ombi.Schedule.Tests
[Test]
public async Task TerminatesWhenWatchlistIsNotEnabled()
{
-
+
_mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = false });
await _subject.Execute(null);
_mocker.Verify(x => x.RequestMovie(It.IsAny()), Times.Never);
@@ -145,7 +147,7 @@ namespace Ombi.Schedule.Tests
[Test]
public async Task NoPlexUsersWithToken()
{
-
+
_mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true });
var um = MockHelper.MockUserManager(new List
- 
@@ -92,13 +85,6 @@ Here are some of the features Ombi has:
Twan Ariens
- 
@@ -112,8 +98,7 @@ Here are some of the features Ombi has:
@@ -127,7 +112,8 @@ Here are some of the features Ombi has:
@@ -155,8 +141,7 @@ Here are some of the features Ombi has:
@@ -170,7 +155,8 @@ Here are some of the features Ombi has:
@@ -198,8 +184,7 @@ Here are some of the features Ombi has:
@@ -213,7 +198,8 @@ Here are some of the features Ombi has:
@@ -241,8 +227,7 @@ Here are some of the features Ombi has:
@@ -256,7 +241,8 @@ Here are some of the features Ombi has:
@@ -284,8 +270,7 @@ Here are some of the features Ombi has:
@@ -299,7 +284,8 @@ Here are some of the features Ombi has:
@@ -314,6 +300,13 @@ Here are some of the features Ombi has:
Ombi-bot
+ 
@@ -327,15 +320,15 @@ Here are some of the features Ombi has:
@@ -370,15 +363,15 @@ Here are some of the features Ombi has:
@@ -413,14 +406,21 @@ Here are some of the features Ombi has:
+ 
+ 
@@ -535,15 +542,15 @@ Here are some of the features Ombi has:
@@ -578,15 +585,15 @@ Here are some of the features Ombi has:
@@ -608,13 +615,21 @@ Here are some of the features Ombi has:
Kyle Lucy
+ 
@@ -628,8 +643,7 @@ Here are some of the features Ombi has:
@@ -657,7 +671,8 @@ Here are some of the features Ombi has:
@@ -671,8 +686,7 @@ Here are some of the features Ombi has:
@@ -680,13 +694,6 @@ Here are some of the features Ombi has:
Qiming Chen
- 
@@ -707,15 +714,15 @@ Here are some of the features Ombi has:
@@ -750,15 +757,15 @@ Here are some of the features Ombi has:
@@ -793,15 +800,15 @@ Here are some of the features Ombi has:
@@ -836,6 +843,14 @@ Here are some of the features Ombi has:
+ 
diff --git a/assets/Ombi-icon.ai b/assets/Ombi-icon.ai
new file mode 100644
index 000000000..da64fd25f
--- /dev/null
+++ b/assets/Ombi-icon.ai
@@ -0,0 +1,1233 @@
+%PDF-1.5
%
+1 0 obj
<>/OCGs[8 0 R 5 0 R 6 0 R 9 0 R 7 0 R 44 0 R 41 0 R 42 0 R 45 0 R 43 0 R 82 0 R 79 0 R 80 0 R 83 0 R 81 0 R]>>/Pages 3 0 R/Type/Catalog>>
endobj
2 0 obj
<>stream
+
+