From df1dfc0c57b978eb8b1e01120736d08364500e28 Mon Sep 17 00:00:00 2001
From: John Andrews <john@reven.co.nz>
Date: Mon, 12 Aug 2024 12:00:46 +1200
Subject: [PATCH] FF-1721: New plugin Nextcloud

---
 FileFlows.Plugin.dll          | Bin 149504 -> 149504 bytes
 FileFlows.Plugin.pdb          | Bin 37444 -> 37444 bytes
 Web/Helpers/DownloadHelper.cs |   9 ++++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/FileFlows.Plugin.dll b/FileFlows.Plugin.dll
index 299eac725e5d0190c29246df1082d988309e4081..020a8da6a42184f4a9511c55f2cdd097da136e97 100644
GIT binary patch
delta 247
zcmZpez}YZ?b3zBpjhCr&8+%%N7`OH?ozN60=wMXOc$V+APe|1{;q&*X?I~JJMk4A-
z#%4yAhA9TdhKa`J1}UlLscDAB=B9~;DaPhT$%dvTNtP)|Nv7NP+A;Mrvb^cqIDLA6
z15<!N{ES7Rf5Y;<I>HuNE<Nxue)<LnCVK^_Xch-l6r_Ht*s~WtT-5>}zvcbj&hN;i
z%;KBGV9a2~V8md_V91cdU;yM9G9&^?b09l~Ar(lcGNb{;Kq96<8IURv+lV0<$Tnp#
UVMqe%O#zZg45r)bU6~r0054=s@Bjb+

delta 247
zcmZpez}YZ?b3zA;V%zDK#-7$5#;rX}Co~0gI+f<Nb;r9csW)7im-$d+dx{p5k%)R~
znvt=ErMZcvv9YC@p@Er!S(=5VL1LO^ib-0MNot~rfuV(Ys@e9vc1-<@EE3;0Je?lk
zz!V_x>AdobcAI+le*ecz6P^k>Pv79cWUl}fJ<bmm1*%Vt31(1R>{2JUcE7XSc78`D
zWftF5hBO8v24e;b21^EW1`{A@41|^pW(<Z520#*o)4;L@42eLNB|{2ORT@JQkW2-N
Um;hB60_DwtJhScfu1t+g0Ex*+V*mgE

diff --git a/FileFlows.Plugin.pdb b/FileFlows.Plugin.pdb
index a7cd75460c8ea7ba9707876a9366b24c4594b2da..f5e1a6fd4cc9bfdc67a3bbd1f0d9c38803f688aa 100644
GIT binary patch
delta 466
zcmV;@0WJQ-qyogG0+4(ZUznm*{Z?;Eh*qLGrNHrD?256Mv5*Z#e><(T7(YU+;a~CO
z%(v&r6cglY=Ql}}cH;cVRA~n6`+-;L0{{T6liy3jFc8Pz`&S%$Qe^GAI?J30b1?Bi
z7~9YX@!`^3+d!H~k~;d|n@%@2MCn5>Px;>Eb3eF5(Xdwwq6qG=c6wNlB7=_jeXF&$
zEro?lbAlaOIQoG#e}Le$mZ6V41TRWd1zE3yYv1KU5>(hghP5RSD$~YL=73R&pF$fz
z#bGC;^a@CA9f<q@b0vKz_8>#Y%;CP;=y$n2&m^d=Pz7un>!_NY-NH5H(zhYBngzid
zT1yp^&Fyb@IREi2boGI%nLB3$s~ueomVP!%sdqM9$+{3~e{lKU6{T`f)V^=8o&eV*
z2`zQzv<1A7vFDUH9JQx2<w@n*RQp;`{(-xivgBqwjrk~vF-b?9Qp)2bonXw9bezSL
zYc}PKO*&^?8O`g=^)b$^aFY4}{X5HcX&+BNPrKdEn}=FR4zETyTKH988Z0VO4l?O8
zhC%QJ0XYFTlNv{4Ct@=;GC471Ff%b>GdD0~WjAGJF*7$cVKHPgH!@=}H8f&5WMX19
Iv!zF$N+e_5Q2+n{

delta 466
zcmV;@0WJQ-qyogG0+4(Z^3Nmahdh5rk5A(QkmV6W827N{v5*Z#e~UR)j&W>E+N){#
z9C77w9WqeeED?uv{9;?#Q3)|F1%X%U0{{T6liy3jFc8Pz`&S%$Qe<uCO1C-@=3wH3
zFt(u&;={GQw1G5{Bz5$^H=S;545bgfJmq_r&;8&M1jAm<3j(;u+Nxnek~CV%A6l)o
zZOIK}Dks>XfukSNe+Ce&Qo?tUhu}qtvLNGhu<bj>1wn-kWLO&lE;FSyWfoE@@rx@B
zD0A3xA)Eq284H{pV78>6#15qCnAzV~8(fy#^Gv+ja9O~nF_x;?+09=Q6Rr)e<jnKl
z(HN>y(cE3S{rRtNp{h@m&D>he)7sM2VCiPF6l!Pum8c6Ye+SneT~U(pqIP{d^#r&k
zL1?Hmr!C->v^l4Y{IETpDbJEAUF~Z@@dxfEA$B{SCX*-`kCS*5#$n8+Nr)`TBbG*l
zQ8=1TDDIqfrBz;MwvTacxfRq0=-*kkOZ#;CdD`uM**w-<<nX4srG;DdrN*KnX(1CX
zqwjg&0XYFTlNv{4CuL?bGdMXnG&wUfIW{pcHZV43I5{w3W;tXuW@0pDVKgu?I5%ZB
Iv!zF$N~sy!SO5S3

diff --git a/Web/Helpers/DownloadHelper.cs b/Web/Helpers/DownloadHelper.cs
index d35e1d6e..a938bb5c 100644
--- a/Web/Helpers/DownloadHelper.cs
+++ b/Web/Helpers/DownloadHelper.cs
@@ -1,5 +1,6 @@
 using System.Net;
 using System.Text.RegularExpressions;
+using FileFlows.Plugin.Helpers;
 
 namespace FileFlows.Web.Helpers;
 
@@ -78,7 +79,13 @@ public static class DownloadHelper
                         }
                     }
 
-                    tempFile += fileExtension;
+                    if (string.IsNullOrWhiteSpace(fileExtension) == false)
+                    {
+                        if(string.IsNullOrWhiteSpace(FileHelper.GetExtension(tempFile)) == false)
+                            tempFile = FileHelper.ChangeExtension(tempFile, fileExtension);
+                        else
+                            tempFile += fileExtension;
+                    }
                 }
 
                 using (var contentStream = response.Content.ReadAsStreamAsync().Result)