From 9b36291d031a370de7ef1375a1d372c154b9dbb5 Mon Sep 17 00:00:00 2001 From: John Andrews Date: Mon, 12 Aug 2024 11:51:17 +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 | 3 +++ Web/Tests/DownloadUrlTests.cs | 11 +++++++++++ 4 files changed, 14 insertions(+) diff --git a/FileFlows.Plugin.dll b/FileFlows.Plugin.dll index c3d4d4e3a7b1cf85af8a561ad3044d778da3c38c..299eac725e5d0190c29246df1082d988309e4081 100644 GIT binary patch delta 250 zcmZpez}YZ?b3zA;V%zDK#-7$5#;rX}Co~0gI+f?9fj4Tr0H$0sl z;J_3h@aeqri*}oO_kRD!OcS08I#1u=z+|rg6+O-m6$PqKjR|H@TkKLNw|2j?+;)CP zCPfy1ONLa2GzKFEV+IQbO9pcW6Ch~}gq93u42BE_KoW%0z_JDmi9nVmLkdt;8bcD0 XOa+RV096bjlZ zkx7xoKZzlU!IHt4!JNSejFT8r7z}|p1t@03U;)Hw3}!%V$Y2Uo2NJOWvdzG(WT2WP Vpj;x5P6Wy)GbC-VcV%j10suV1O9B7@ diff --git a/FileFlows.Plugin.pdb b/FileFlows.Plugin.pdb index 0bb165da25769f1deb0102a944544415446290cd..a7cd75460c8ea7ba9707876a9366b24c4594b2da 100644 GIT binary patch delta 3076 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 RjgU)B2N^`>eVZEi{{v)FBDeqm diff --git a/Web/Helpers/DownloadHelper.cs b/Web/Helpers/DownloadHelper.cs index e0c2f410..d35e1d6e 100644 --- a/Web/Helpers/DownloadHelper.cs +++ b/Web/Helpers/DownloadHelper.cs @@ -39,9 +39,12 @@ public static class DownloadHelper try { + logger.ILog("Downloading: " + url); string filename = GetFilenameFromUrl(logger, url)?.EmptyAsNull() ?? Guid.NewGuid().ToString(); + logger.ILog("Filename: " + filename); var tempFile = Path.Combine(destinationPath, filename); + logger.ILog("Temp File: " + tempFile); using (var response = client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead).Result) { diff --git a/Web/Tests/DownloadUrlTests.cs b/Web/Tests/DownloadUrlTests.cs index dab3337d..90801577 100644 --- a/Web/Tests/DownloadUrlTests.cs +++ b/Web/Tests/DownloadUrlTests.cs @@ -17,6 +17,17 @@ public class DownloadUrlTests : TestBase var result = element.Execute(args); Assert.AreEqual(1, result); } + + [TestMethod] + public void InputFile() + { + var args = new NodeParameters("https://images.pexels.com/photos/45201/kitty-cat-kitten-pet-45201.jpeg", Logger, false, string.Empty, new LocalFileService()); + + var element = new InputUrl(); + element.Download = true; + var result = element.Execute(args); + Assert.AreEqual(1, result); + } } #endif \ No newline at end of file