From fefa2e37dac1e58d80440273ae5748e07dc1ea2f Mon Sep 17 00:00:00 2001 From: John Andrews Date: Thu, 30 May 2024 08:24:15 +1200 Subject: [PATCH] FF-1579: Added support for variables to the `Additional Files` fields in Copy/Move --- BasicNodes/File/CopyFile.cs | 3 ++- BasicNodes/File/MoveFile.cs | 2 +- FileFlows.Plugin.dll | Bin 141312 -> 141312 bytes FileFlows.Plugin.pdb | Bin 34388 -> 34388 bytes 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BasicNodes/File/CopyFile.cs b/BasicNodes/File/CopyFile.cs index 635bf5aa..3d07a25e 100644 --- a/BasicNodes/File/CopyFile.cs +++ b/BasicNodes/File/CopyFile.cs @@ -153,8 +153,9 @@ public class CopyFile : Node { try { - foreach (var additional in AdditionalFiles) + foreach (var additionalOrig in AdditionalFiles) { + string additional = args.ReplaceVariables(additionalOrig, stripMissing: true); foreach(var addFile in args.FileService.GetFiles(srcDir, additional).ValueOrDefault ?? new string[] {}) { try diff --git a/BasicNodes/File/MoveFile.cs b/BasicNodes/File/MoveFile.cs index 6792d341..fe68a91b 100644 --- a/BasicNodes/File/MoveFile.cs +++ b/BasicNodes/File/MoveFile.cs @@ -165,7 +165,7 @@ public class MoveFile : Node args.Logger?.ILog("Looking for additional files in directory: " + srcDir); foreach (var additionalOrig in AdditionalFiles) { - string additional = additionalOrig; + string additional = args.ReplaceVariables(additionalOrig, stripMissing: true); if (Regex.IsMatch(additionalOrig, @"\.[a-z0-9A-Z]+$") == false) additional = "*" + additional; // add the leading start for the search diff --git a/FileFlows.Plugin.dll b/FileFlows.Plugin.dll index 74482133dd7e9bc7f7588958dde1a4c916858c0e..262d3da93d32959be49d8dd32dcdb4eb657c6109 100644 GIT binary patch delta 247 zcmZp;z|nAlV?qZ@b8hF)#-7$5#;rX}4qO6z8V^nQ(W2nnlyAGd7 zG)pl`GBYzsF*Z#yGBZmuw=^{~NHj7rPBk~NFiJJGv@kL-GD+M1LY8R)BTK&P=QY!7 z{P&xwP%Is!YvH0IK^++yDRo delta 247 zcmZp;z|nAlV?qZ@hUkYCjXkYBj9Yt{9JmBLe+tj~A9v4j($afdixbt7x8LDndMc!z zVrF1wnQE3~2qerc%*;(K%ngk#lah@r49zW44J=J84U-H_%(lOfWtzaq67Xu{_31V8 zOaTH9XRPVCQ@Y82OZ4`KQ@*hOn|?>0$zA~}Iv*wqR3DzOx=?Yi=IQx?3R3&FTPrYq zW${g6Fk>(PVoQcpAeqEq2xXZwSOEFv45mQZ94KlG6i;GEW-tQs4S^ySK=lSdF%uv* Q1nV5n2vsWyGCI!^%o#A7y3BiiFUxQ$n&M zgd`cEWkvaUU+4Sv{r&lQyq>T59zCgB&_iAysUKJ_Skw}vbB zM_ys1f`+%CsVc2x3Hu9M>?6KB=F7D_ye@RV7?BxMglDue&8699>hBwAalGkfj@wVqa=R#Rl`HE# z>wZ$9&HLG($DHC@Of9<0j3a#Z5BtZyg?G3qgy@6@ZrHm+a#z?beNNnSktZsXMh*S8nK#{BVn1|l92+z*B`ndG zJ$t9T%rz}u(k>alZtc(irA;x1QIT#jZS&=>$U{h2Q`1UPRoO%;f>V>4%Y6jG*?@?oT&rNgW{x3p*dK~**G~N5Xi~I zv^&7yzPR5X+()ST!KMki{T+9I!=>87kijFiLLf}fkdWxHkF%UN8?)jYOn|N@I$j_F&_JPf-?r&RZFK(&$uYIrRDSI<78s z>LogZ*F_+2@Xy@^;f3i5sfdpw@!?@=?eb)_3{yed!`7DSPGeg4Oiqpjuz^r@WB?+G z80Or?o>&pu0;4f|;G?!%1ex6H18qSdEkE1$A1`e>qFOwZGi($&|U9d3Q)T{0++u zZ^iD0Qmn^n5Y-68RJ5c_+1G8vjD4(JK|wXi41j>;h8*Tzc7j}AwJ94{7PS)d3sU*X z8={B|AOgzNu2f6KSh;iKE_nWCJ zEATRo7fLm0`+!JcLDZ0AF4_ed>4m5T%O=a^=E4Vb#k7f=+FyYZcpAPcE1kE)$2>sK zW?Cq*Go4^4bP6*Zgm-Nt@Zl7*vci5eQ?F#Gv%zHVrYg8bZx5WQyA#@fAiW!y;w}^D z&P%wfRU$33*+6on5ddNss+ETw)6#O|>=*!Zo(adqYFXoMO)KhWLy2^TB}k74>I{Gy z5km;XT$WUI@=p8W$wzA)M zrun_C8gm8y9>$4^x+!oN!^wFYU+Nq(Ot`10Fqq|Nw6;v{l#Bmbl)W%92%?jVK2+*V zJE<4cD7MA!;?{w6FnkQp1yOnL{{cnH3+im&mfx=TKy!iPSb^GQ_!^$yyRPU?HZT&X z<}&_}JVh!Wu^0Q(;$hD;f^&6urqF3}Xqt;Wb6MH#G)6(r6q9p&g*I^pPmr4E~?(y6;0>Iksi;W6Rb1)EPw*cOAscYr0`Lv~{c-W1|4ZkC7hjE>f?|aC%VWVAxXtFt5c;Z1s-- zVvG1Qg$LaTj!rm^%c3p<$hqJ0b`M$rFf#N%l76Dj=qHA*_cH zp7rK;y5gOOFacls)1F6-@-Z{gH)NKk`8<07FtW0E*hQ(96@ACv&-iEj&gC{4I` zh>!$?jy%<;1nJzE%DIPXwJ5)X{~EzLI8m8jfA`PExshR@azZZX)_kS9b~?5J_z}7JeCa(G?3(Z>e&xuwTN@+s5j-fhghV#m9a`S zTxTE(kvvwKfDmo|dS=$dUn}S($+5fV=n}kQAOz{8kix-sSkk?ClBy@EpEG*YG_-)l z8$L`Df%Y82PXo;g?}?>ElQ?YJvmmkX!=1IT8%Ye>qVMkygql_}NCM|!O!}GZ3WAB; zEjXXV!_%{~4p`k-zeAi|y%ilfJJ#eYQHz56ND|)q6apiWi{*ExU2{I_N3b2gE-HT0 znpp~>gNqxpz8qVZC&1RXmz1o5PxBa7q4-s}bEaF?lh{k=-KjL%>g~POUH1xlK166C z5p$I4u$RRd+J#kbOk2EWLYP{xk0B>S$gpHsK9G@ozk8fpCr5UY%i+?QOgPVw50VtN z$O3L5`O#9&#Q|JO>6=qQY!=tyAwy2@r^$*Rz!|@)^b#|}{gRaG*2S09d{v5RokaaR z5+IQDkYAyoK4-5^)vFmD&`tL*)2>eA@L31y(dp-zsXpD%69q;Syx;SH??-xdlZT|$ zjrGco{68&Qyi7TfZXkUvtL)34S7Z zVGP7qGGTc<^N9l{Y;ai9$!;QeO~=ET>h55@ma3&HFJoXxZESodRz}6ml$}ZFx7)k18O|p|kgu-c0uX*MexYf%ENqy{e!ITb z=7a_Op3DzzAG=x#d?py~F1k>vjxT?(WgE-!dWTgZ4=io62ht2oXWU(;8$!)D)9bKB zf

u)(^KBz&VrM5L=#4I4~cXt7>-N;*Cya;7|OW&JB+6Z4*(5bN}rLAUwG9!w=E= zD($pRdeFDA;Dd0hi7=F6b)yd<#Dc*5kyRh)9>A7SM$LD533I}mO+_JIudfv#-_T=Q zb%nooXs7FZIjX=Ta}&mxN|G+@q%$5dUWEB)Duv4WckziSlZPsfF)MFGrMY^zTT^Lr zMpTLob*%&A4qDWMU|_p3HZJuq=+G=j%P@|2m*FR-lF)n}^$if_t3sZLbPa5whLt9+ z7t)3oOa-9W@97OdXxzwZ$2zbFlU^N>{McA61C~2+022F9JPw2w8(q#x=6Rxh`&Tgc zu+wR)LLuY7uQMIy798r0Uj!(v=jt2RODd$wO`@vbiy}SN;`VT%J2mbv;t4Oq%t z2)gjzXmucCMLfJr`^}OcO)9-o@T7*!Jquf!^O1Vvr``k2zxatIA}`tR9MWIs0quB!MypA-UJDo8Nrh{vOGuSmGff}fdCczf4RVEDyZ(niyAJDjhw z5s^c{L84ml_BKug2vGJSay?wJsM*+RQHTa*cWbA$klkObH zX)bJG7u8?*Qk(|h;B1Rs5PR|!Cmi^_cG6FoSfFzV+WE%wz*DfxR z{zT~t!$gxGGW(|09>Y6Nib3N`87m;C_PM=*!@2f^SVI34ycDJZ6HoF(C{?L9Kq&T3 zy=JnokeHoz`!z?#Od#xgQVvpzJbfGZRL{HAE6noB6@C1nl0IG1l=2M{>%)DEaB7g+-$k`>y$A~T;xxFOml5RTes4gd+m z^HdjO+FFMsWEfQd)QYsQbRtC2@M(mW%xN#hJccc?)4QN8?_xRt5JK2gCCTcgl^R_x zr(EJkWB`t*d2k<7IDY|vXu+1po~&tbTj;Gt?l<8k<`y!hT6?%V(ARE#)ik$2K!=`9 z*w;1v6CY)eUusJ7EP_`~?`5XPe2apE>u_$(K^cxET` zBZE)}0Q3?57Zd8^_@bmnf$mL-w^o6DP+(ml6i18%&ay5C6O)1*X( zoYSJyMxFfa;w=g{nl0f(OA(0m-bF@AnJ={VpV$~gOuPI<1@(Ec4(_&;FpxM#i)9=p z8Jy_g(J5?xU5888(iV=jH0<418v%GTk}0%vYaJP{`HAszyjzv-vH8JHe54l#uO_}L z9>!CopyXe9j4e$#rtr+no69h(eLRR9YH10FP$VFVK`*){Ni1FVViuI zg%LJgkAhXK_@RW8#Cag}z4ucxISZ@rtF84@^2M`m*x70?^!(@`W8~j(UFA8O06Qix zB0PlnwJi=#wi5Ez!1vt)KArjGuBG~KA?EYj#1)7juQO|4N^$a_l0DA<^T!2`r?&%7 zKMz}ybTwAAid0|Q6^u4LV)Fm)k@f+TS^#cnSeS5EyoZjlB@Zop{(O5KxH^HuN3C~w z-^Os>04S^Y+gDn9)%330ulzQj<#Ss@9b9Z&FRs;J(>L$|fJ1(G^~cc~Fh0{NTN(%C zA2MMx=e0Xy(y2ZZWF~vF4MKTH=x2uv-?!A8IJ*w~``Y1W{QvCvRQ(p%4L{mihK?yD z^G253q9i)lv~H_o^4d((=HMGP{Loh! zd>XKK@I}6{+|tB;Yu4p-LLxxzk%6Thg*XnQ^k*qb~?9T=yb+`_0En_ z==RK$`Uu1I5ZE&2YIfssl*7f!`j7&gOg&&Rs<8G}K^&v|_4RIjCn(#Y8xUPJ_L%c? q#)-cLU;R70HdS2M7qAS>i1vIl!#CbB@Z;sNyLDmub#V~2S?GUxVRdvCfzoTS%77Fr%>zh9a_ODO*m+QnXpKXUVjP z5)qZ~B3V+(QYsQJ`Z?2hU*F$9b6s=YpL>1IIrn|eo0wH^Vpb&t@D5(N6ZO`o%;>Il z)!^kR&PC(V(yr13#iK!SqmQa{8eBjz&}z9|T7qs(XxW<`5pMXTcc@)?X5m%H@zK=? zQV9AD>*aZ#_5WijWX)Bh% z9A@+%meZ0yQsAeB%(Ns5SnM`AP&ah_hfihEy%3x2T!K`4(a4}Xf33ZBd9v?C-v_G~ zj^`U@Lu$_K;^*4vBJR{F=8?L$P(iw}gnH73W?vS(k-yGQbGLSFvv7>_Ja$}DU?z2; zuxH@dmsI~Dt9r^`1)V&~;3jzV#I#zmI&oW@zf*%fi2nKI;J8tc!-0+f#cpEs!8X~! zr}kgY9^iL&m_J{#Jt!rtIsV~ptMAWiYOc;8)jA<9_H?53!1fBY?C`~0>jyGzWyfl| zok>HR-=1Fj6Jb#iv=>x%R8Xx{@7cehhDlo1B)1 zhc?~ao8s%u;`I@Z=ck{x!th>u5oZrUDz~G0 z-J=mhx>ic6adE&1`VDC5Yy;}lb)sx8u-P~RriGz*kbKPEYnFITCVa6*+8`(Lr)GKk znD3TKhvZfaw*;o88RZ!09a6QER9QkK(8a=Y4TwDlVn^LLjEWz?MP0esypH&qpXDcB zXA8=iTrdG0H2!nWdhK68zbfesZk^p8DHhPIvlUHjKNAjt;=B0u(;ntJ2~Qo$rU%?Y z!8ct#uwHj7n$Gz(1gS-kDB<;Qts+E->0K`0s@mxeEWl8g56zt#zQ8IB&lpF{ND1!N z{uEq|pOhX8h}T_qv1dpnl0h{XUgs2>AT&d2Y!# zL?~qXPEN_4-naxvqar1^A27i8;we^7rNsq zLRi{7SP|4;>%eDd{#xaUizh62aJlkT+x$AK##w+Bb_1F-YY_>7Di_IfZI+3caAGE5 zieidm0SVZxXx&2dE$Bildk+)sRmPQusqH#hP5j6P)&$Yqm#g9GKU)dWqORQu}Q~n6h=od z%~sfUs})-$@_iLbIG45p2FAGUXoUIaE?A^_zWNxi;VOd+@5ND@M1LkYhZ7EpxwG*X zG$KRWf9_Wwk8VQzg(}2?D8)9SNB43gc{Aj+814$}&zd`3H4GDR{<8On$KzFmWY2&d zf*oh6|4-u>$&0Np@Qfo9y2yE9p*{(e@Cijt%q`5K-B1DSFcdfBwQ0En0lFFP8FuyG znpfstU&?q=YsR*y?@A|=Txn-l?y#rE?h8=m$hHufVIHbZ@=(f}qFTAl;Jl#}${(uG z4~4!~=(xqrcriDO}3Xo2$_CaU6Bg1y7TO-q2J zrY%#j914r?N4jm@)}oj3U_0mB)SX6lMpz?uX&So!sfAn}7oD2e*NKU3>G_Xs#6Yzd!4zsJCDMs>l}1T;jd@*04m~ zp@=Cvng_6iT_`C%p#ln}bhMscjrxEMci)rtY53?ch#*Mw|1I+r%2Z4>pI;*%AjBTB zqK2RTISHN+B+xA}e(6vs!k{Ldl8IQ_WmCg^B8Lxw-vlvK%_MLUE{CH%VMF7zZMf_C z%W=&3oViRWmdY`!Xn%?=yAoW(hq3_OXFsJ+d`Mkoxc{nVMw7{R5* z@HKFX1a1d~M1KCc=V{RD;d`pucLmLiuJDQyKD^eS2fak8Ad%qq>rjzP*fdAxzO?T3 zW=WHdbA_AOrNGnNJ=yi0s_7qsOMm}odcm8~MXj6(cmKX$?YmZzy1pJ>6b57I^j_|+ z)+VX|(d0m`i_TosoD#+s{qElpq!Kj8)&jvsylC!*tb5RM*F%l`&M!Tff@gJ(E$3{m zf;&b+D7O^p0u+{t?NXAR#cCxMyFc0f>2fz1FyajgyKt}`?(vt4(!TXhKDf*KG1r+- z#+}&KiIhJh0m3ocQ``j8OyW;;9D6E7xD+WI_x_1g`3lg$+uMVks?|RMU*Kr6>yv*? ziAAYl?%N72=HL3uK|`}FS^~%Tw@-=j_!q+}uMYa?DK%P0NVxa5S3;X929k|M^rE9* zl|do(E5oU>S57Z&Tei&m`M>*CxF?Wku59-iqI6b0GIt&xyCQOw5bMn8$vq<>4Cai* z&?hSXtOl$a<(imEoYze6UF|EIB=Z6&nn?2$hbmee0Gq)m?F512W874yL8q<+Ms9199PUhqyw{GEFKXB}Rrwm>$ zDQf=w41<4Bml}7!eZ(NyP>ks`_vLRDXXx_;2AV7JxbUuP zjzJn%_q$l`TVGac(H&ft#zc0#c;00WLN{ENLax=dnfirK54@0R*i{0WOa;-z`@qHH&X$@Sh>lZ75G2lJ-8aEIFLYoIH`3a*B-ol>|+(Vz+QlP6+UxU!^>jlJl; zer#W@4}7wq#vLS}=7-Q`LTTXh3rS{j)4;_{BIt{YbTM44citW$kNtb_(p(%Z-fIUCu~i6nqg{#io4cA1Hd?J8smk*J+!hjOtjSr{ z*zzV=y-r{gLZ}?!r_bjljsYDDX`+p4bq+Lp&7}H#pUY!>gqMXtdcdYn?5|}?VbFcN z94HJqQwqtEvfP2A60=xy3}r@kL66+6e|2bv~Z8E}$ zST^u=TOOKbx+D}c`*Sc>YRbd zabYwIjbDU9DfDBYRoiB*@CKz_5^t{ffrR6t?8dI0YzyGUY>b&+T|DlobEnE+J!e{@ z)Dj|(4$u>4;9BFsL^P#;Rn;xImn&+IY!HX~VCMJ^bpI=A2y~z%ly{^fMhY9hPWZUB zxW+KpZ6$_k+?MV{g4ZCWJO}TdJ7j^&#yQE{IH0Wp?5%`|ZosY{YR1`gNXzjF=%s~| zJYQ$7v;BV+ApY;(iRpBTgh!R+z5a7M=GPN0+`BBgb;fodcy&UUoseWGZW0=PJnhlf z_vD+wZQYUA6=(a;Kt$%x{O0}N&C%}cbJq0cgLJnB*PCO@r*)pog`6mW^vc$t9+}4) zu$af2y_zCAjgpQINs#+qEIx%Ck(-`3g*ytWW&cIIVoZV=akls2^#DIrW@bC7Zl^(5S3K^C>S?f%?MU}05MnKd+SM0?!c^T~_pW{|y<7XTtzT0&s{Ck4D7;hq z-%*?F{4xn*67tPWyk%85W{U5EY$pD|AB?fwG50VFsOH;nOY<0atA{qc2{6dI4=%maOK>)s4pAo?aj6 zAt?C(0#ZgE6n8Vma)&(mkjNU>xt`14%5%%dUfUqmA79^Z!?Go5y9F)RPaTK0=o8u1 z+Lkkhcdn@)?lbWTU;)my{CaB+JR5>Q?}PoNqyBiqWS?NA*eIdp$-#``;NwN}UOx3p z7fUa*%yA*pxA+3^@xK<0!a8Cq!Eajuc6z3lT81I=Sw-pICmRE7TFASK+b=g*E+M;7 z*VCb_7J8#5Zmv#yKPD?Bp;Yi8)fZ^kNuYPjumEaa5B;F&dr8#r(hp1Jh6e3x;H;ep z+M`sR0fh^u+0qZ!#A*V*#=~2AwpW4@J0Wyn?jY*~`}Ns(H|>|ac9fWIV@z}BE+Bq# zJD9cOL9+#WSm%*Dsmyx8HXEB#iF16VHH2RR1krb&O=h6!$%0gcxZg$ENlngz_z4kC zmNxC=7L?={-wuJ~(2q0Nyg+PN)QRc5(bn)KfY*#6x6~QgCsIf5*IKyMzrNu zzr15snD*?MzCxQ z)RepFQdhuSjZY{Ynf;miQxaUY--+h%u4Nr+CCXXkiap7=*cPrI$(yC8L6^N00f_W9 zLCxZ$*uY|gbC{5uM|h5qx!T#s%CS>kON{{D8IO?|F3TNRke121o*d#c$^>u92#JrK zTZf;3Jb)wZM&*sVB4D86%qlf}RFv*DnbrPnYn3v=1(Fmx#uTfC!u>Ic)V}?DvA5%> z_BQu6iGW2CKjzS-a05WxOwfQQX@Ae&k{-7f!mV<+{gmx!r?uv{xM@Y)~Y7& zNCyvstfPsY<7mgD_8;kx$OwE-apeV+KOSk?ScLI zVT=s?P2~J9weRc7z-I>$bZ+Cxcm!F6q#Th-=JZ!Kh`9Nc`bM;w0Yn`|4LK-EtZkE| zgS1T*^y*#g{I&0j$fd~@j*jcl9hREYzauY0{;w>!@`PqX?+2OQBc7KhxvG-qB0#jG zFbc}gvFV|TQZQOh-0w44_Wv0%epmVp=UZVdCBE* tWcgPfmVXMq^g6seRpgHP-h;*ACh>ewpOV4HX10z6d50V-kEFa1`#;XXIAQ<*