From 132c6d6bc3906326ed1c1a7f2006b19280a54e52 Mon Sep 17 00:00:00 2001
From: John Andrews <john@reven.co.nz>
Date: Tue, 13 Aug 2024 13:19:02 +1200
Subject: [PATCH] FF-1721: New plugin Nextcloud

---
 FileFlows.Plugin.dll          | Bin 150016 -> 150016 bytes
 FileFlows.Plugin.pdb          | Bin 37492 -> 37492 bytes
 Web/Helpers/DownloadHelper.cs |  15 +--------------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/FileFlows.Plugin.dll b/FileFlows.Plugin.dll
index 573ca5895ef02790dde2bc82ba05e411e5af510e..f48a49c5209bf19de7837ec482526fd23ce4a38a 100644
GIT binary patch
delta 250
zcmZpe!r3r|b3z9TW3|Vu#-7$5#;rX}Z?pvL`<5k6^mp@}_{8JE+2BPpw|8hWg^FmH
zn<pDvm>VajBpD{Am?jz|nVBS8SeO}EBqy7sr6d|yrWu=<8>bp>XLVreXJnbBd12-B
z8IDW=0&A_^JY2qCbnK7g)LPzipl<pPM<#m(sAwTSR1~OQb6ap@@71f1^W#lTy0?cr
zG2LYGH)k+sNM<l*umIA=KvoJv5`!T_B9Jx(k_JGY8G{K>+yV&A7>s~qG7y?Dqybfc
W<Sl_LV;~=-JC(t3d%ZhTBNG4v3rvmx

delta 250
zcmZpe!r3r|b3zA;*YOjN8hcuM7`OH?z0nfLa60zlX4Xm9sk@~E<MdhTws&YVg^FmH
zn3|cGm>MLdnkSl@SsEr98C#~Nnp&ion;4`R8>c2FS|nPSr<hu9XLVreXJmQ3w(<7#
z8IDW=0)5*XB^p&d{aX?)$2hv|X`24Sk;z^GDyr`S6$Pq~{-p0|xyq{TN`|wm)b?;E
zrkgDOCJd$wW(+1kXv$!~ki?M6V9t;T#AXbZ42D3K5rZ+1l?sHW3>FM2Kp7LDx)h+O
YF;FZK2ra<a94KbWV7a~CovD!t0N&Y4I{*Lx

diff --git a/FileFlows.Plugin.pdb b/FileFlows.Plugin.pdb
index 7ebd1bffda4fb51c33e1dc235e24de4162a46cf1..7f55b153a9f28497f1c93a41f156ef866217ade0 100644
GIT binary patch
delta 467
zcmV;^0WALXqyqG$0+4(Ztvg0YMEB7_k6sBXr;NaUnkmq!v5+Z6e=*>D+D(Lp59Te&
z30;QM+culu0+CP3cZa1nUd8#l*@0K;0{{T6lTAy*KoExS`4vM?iZp3WZK4&S7AhWu
z(iT04hskD=ENpgVKP>t8ZmKOUMd=~4r+sJknGa^8sNbmtQ3Utstm>B}Nu#Cwq19Sj
zSKI(oIl%@E?ER26e}G_>5}}XW1<xv!B^j@SZQm7K5Y*TJLuUxMWJ+sd7BZ^viz^K%
zbJ%bpyaGZQ3%uCDY(+nbJxJ3&bGWTGIxV;3nFP*oS;DF@mg>pTEnHF|d>dTJNf5lF
zF;r)wxjS`-(_i0A)t@MvskNGC&eBD1?q@R>YGcBMa3z<$f6I?^QL^Br^L=~u0JtPU
zXy|NCTfi%6b4(eAgZ7+Fd6tFJ^|lrif8ef?gvDtRvpgGOeuIN-JYs1&zD^k%6*&%W
zi+Gg8G(0=&LaW>{+r>E7+zRRf^zSU&rF}a5JneSBtR5W~IlO6ZY35gbuCc61T42Iw
z41?es0XYFTlQu_VC^t7_GdMRhV`O46VPrL7Fk&_|V>mcAGB{&nG-hOBFga#3G&eJ4
JF|)x(vr2JU)7St2

delta 467
zcmV;^0WALXqyqG$0+4(Zj<<mrfh9>#gkaNLK}5WQ>#c#?v5+Z6f5ha|INv^k?`+7|
zna&qp_Ex>YqU0rZSEE0e`szbuE`e9-0{{T6lizE?Fc8Pz`&S%3Z46tTt<^aOPH^mD
zAS&C#*u%BCwt+MmNjm9&ztl}pWTOwgJmq_r&;8&M1pQ9U3j(;u%Bp@&k~CUk4~^E?
zw%`U*#Rzt2;OK{>e+C4rl<-~TA$U=s%*i+%Z1XPTf}q42QmhOCm#Na4QVR(c_{Eh5
zlni!U2&aHh#sbd{Fk8@1Vh7T6%<S*04KB;=cqU$DxXfWw8%yQv?B=g26Rr)e<jnKl
z(HJTdQQuv<{rRtNp~_E`_1s#`lgiRnZ|P>U6l!Pum8fzqe|y&-ZBa7gdFA?c>Ira7
zg3wTFPE)`uX>(2)`h(`Qraa3`>2hBSia&5SVKffIXpm5h@pwAK+tHLLny@$=u+fMR
zCpd{&G;N)Ar4_4E+r>Dy+zRRf^zSU2rF}a6Jk55$Y#u8v7`$n2Y2j9VsWC4}T1bV<
z=zHEb0XYFTlQu_VC^R)TG&D6ZVr4gBH#RvjVKOs0Wo0!uWH&T0WHU2mVPQC7I5%W9
JIkUk>vr3L>-$Vca

diff --git a/Web/Helpers/DownloadHelper.cs b/Web/Helpers/DownloadHelper.cs
index f5137b10..dc3e73d0 100644
--- a/Web/Helpers/DownloadHelper.cs
+++ b/Web/Helpers/DownloadHelper.cs
@@ -36,10 +36,8 @@ public static class DownloadHelper
             client.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36");
         }
 
-
         try
         {
-
             logger.ILog("Downloading: " + url);
             string filename = GetFilenameFromUrl(logger, url)?.EmptyAsNull() ?? Guid.NewGuid().ToString();
             logger.ILog("Filename: " + filename);
@@ -67,18 +65,6 @@ public static class DownloadHelper
                 }
                 else
                 {
-                    if (fileExtension == null)
-                    {
-                        // Check for common file headers if the content type is not recognized
-                        var buffer = new byte[512];
-                        using (var contentStream = response.Content.ReadAsStreamAsync().Result)
-                        {
-                            contentStream.Read(buffer, 0, buffer.Length);
-                            fileExtension = GetFileExtensionFromHeader(buffer) ?? ".html";
-                            contentStream.Position = 0; // Reset stream position for reading again
-                        }
-                    }
-
                     if (string.IsNullOrWhiteSpace(fileExtension) == false)
                     {
                         if(string.IsNullOrWhiteSpace(FileHelper.GetExtension(tempFile)) == false)
@@ -167,6 +153,7 @@ public static class DownloadHelper
             case "image/jpeg": return ".jpg";
             case "image/png": return ".png";
             case "image/gif": return ".gif";
+            case "image/webp": return ".webp";
             case "application/pdf": return ".pdf";
             case "application/zip": return ".zip";
             case "application/json": return ".json";