From 86da122cc9cb30dce391f908e865dd116f77bbfc Mon Sep 17 00:00:00 2001
From: John Andrews <john@reven.nz>
Date: Sun, 26 Jun 2022 12:00:05 +1200
Subject: [PATCH] merge

---
 Apprise/Apprise.csproj                   | Bin 2760 -> 2760 bytes
 BasicNodes/BasicNodes.csproj             | Bin 3566 -> 3566 bytes
 BasicNodes/Tests/CopyTests.cs            |  14 ++++++++++++++
 ChecksumNodes/ChecksumNodes.csproj       | Bin 2872 -> 2872 bytes
 CollectionNodes/CollectionNodes.csproj   | Bin 3256 -> 3256 bytes
 DiscordNodes/DiscordNodes.csproj         | Bin 2870 -> 2870 bytes
 EmailNodes/EmailNodes.csproj             | Bin 3386 -> 3386 bytes
 Emby/Emby.csproj                         | Bin 2844 -> 2844 bytes
 Gotify/Gotify.csproj                     | Bin 2752 -> 2752 bytes
 ImageNodes/ImageNodes.csproj             | Bin 3232 -> 3232 bytes
 MetaNodes/MetaNodes.csproj               | Bin 4504 -> 4504 bytes
 MusicNodes/MusicNodes.csproj             | Bin 4228 -> 4228 bytes
 Plex/Plex.csproj                         | Bin 2844 -> 2844 bytes
 VideoLegacyNodes/VideoLegacyNodes.csproj | Bin 2994 -> 2994 bytes
 VideoNodes/VideoNodes.csproj             | Bin 4098 -> 4098 bytes
 15 files changed, 14 insertions(+)

diff --git a/Apprise/Apprise.csproj b/Apprise/Apprise.csproj
index 2033af1e7fb76dcd93c67fee4f4128022306c32d..0d510c3c1598678dbdb01f8bfff64a38ab8c9ca4 100644
GIT binary patch
delta 36
rcmX>hdO~!A6BD~3gCT<rgZ^Y`CdtWrm^db9G3hV^#Wv4m(&qpGtmX*1

delta 36
rcmX>hdO~!A6BD}ugBgPjgZ^Y`CdtWrm^db9G3hV^#Wv4m(&qpGtzrnm

diff --git a/BasicNodes/BasicNodes.csproj b/BasicNodes/BasicNodes.csproj
index ec197716cbaa213ace483a875034f9b460528e10..f2e879b96b6e67757e8beb69c8a9421a7a457213 100644
GIT binary patch
delta 24
dcmaDS{Z4wrD@JBR2E)m38N)&JW_PCL+yHZE2mSy6

delta 24
dcmaDS{Z4wrD@JAm2D8a;8N)&JW_PCL+yHa52nGNE

diff --git a/BasicNodes/Tests/CopyTests.cs b/BasicNodes/Tests/CopyTests.cs
index fa2f2a7b..30f3a666 100644
--- a/BasicNodes/Tests/CopyTests.cs
+++ b/BasicNodes/Tests/CopyTests.cs
@@ -34,6 +34,20 @@ public class CopyTests
         Assert.AreEqual(2, result);
     }
 
+    [TestMethod]
+    public void CopyTests_Dir_DateReplacements()
+    {
+        var logger = new TestLogger();
+        var args = new FileFlows.Plugin.NodeParameters(@"D:\videos\testfiles\bigbuckbunny_480p_30s.mp4", logger, false, string.Empty);
+        args.PathMapper = s => Map(s);
+
+        CopyFile node = new();
+        node.CopyFolder = true;
+        node.DestinationPath = @"D:\videos\converted";
+        node.DestinationFile = "{file.Orig.FileName}-{file.Create.Month:00}-{file.Create.Year}{ext}";
+        var result = node.Execute(args);
+        Assert.AreEqual(1, result);
+    }
 
     string Map(string path)
     {
diff --git a/ChecksumNodes/ChecksumNodes.csproj b/ChecksumNodes/ChecksumNodes.csproj
index d42a6b741cacd330f58d8233fe2d4e0bae5f4980..99c996c5084f4b8a96a25852cdcd9020d6153744 100644
GIT binary patch
delta 39
ucmdlXwnJ>g2_|+!215oL2K~tknItFQ<KmjE#=<v=S&kVfyjhW1oC5&fpb3}&

delta 39
ucmdlXwnJ>g2_|*}1~Ud52K~tknItFQ<KmjE#=<v=S&kVfyjhW1oC5&gC<&kd

diff --git a/CollectionNodes/CollectionNodes.csproj b/CollectionNodes/CollectionNodes.csproj
index ff13de2339d5eed60e93d272ad7c845d30ecaf25..ef5c80f4c9c9c711da1a2df3f8e1dbb25ebdc13f 100644
GIT binary patch
delta 40
vcmdlXxkGZp4MuiD215oL2K~t!86_vj@o-Jv!^}5XfJu%SD8AW{shtY|>~9KW

delta 40
vcmdlXxkGZp4MuhY1~Ud52K~t!86_vj@o-Jv!^}5XfJu%SD8AW{shtY|?E4CA

diff --git a/DiscordNodes/DiscordNodes.csproj b/DiscordNodes/DiscordNodes.csproj
index f54e37f2d430eaa69a1d53ea143a2b6f054dacad..b50eefb95afd8f407c4671f3f75544a98bb0bc79 100644
GIT binary patch
delta 24
dcmdlcwoPoq1SV!f2E)mdnF2xd=I2cQ8~|TL2N3`O

delta 24
dcmdlcwoPoq1SVz!2D8bNnF2xd=I2cQ8~|UC2N?hW

diff --git a/EmailNodes/EmailNodes.csproj b/EmailNodes/EmailNodes.csproj
index f0b2665973766e51ed81236cb18a9030b9d77277..4244525c5a974382802182e894194ff1e216ce9b 100644
GIT binary patch
delta 36
rcmdlbwM%M)6AQZ`gCT<rgZ^Y`7RkwbShyzVuxK#@#Wv4mS;zqZtOf}t

delta 36
rcmdlbwM%M)6AQZmgBgPjgZ^Y`7RkwbShyzVuxK#@#Wv4mS;zqZtbz$H

diff --git a/Emby/Emby.csproj b/Emby/Emby.csproj
index 93d95ed0bf57cc1ce719fbe824292632762bd516..d3fc8a2b8f8a0c09ae06a9b7fcb7f60e953b7d3c 100644
GIT binary patch
delta 24
dcmbOuHb-p31SV!f2E)mdnF2xd=I2bN8~|Em2EzaV

delta 24
dcmbOuHb-p31SVz!2D8bNnF2xd=I2bN8~|Fd2Fm~d

diff --git a/Gotify/Gotify.csproj b/Gotify/Gotify.csproj
index 0715bc7386ccdbed2fcfc9ed0be6c7031b41bdc7..277be62dff8ece8e97eaffbdb6cf4030f0e56548 100644
GIT binary patch
delta 36
rcmX>gdO&o86BD~3gCT<rgZ^Y`CdtWrm^db9G3hV^#Wv4mQs)2ws-_5{

delta 36
rcmX>gdO&o86BD}ugBgPjgZ^Y`CdtWrm^db9G3hV^#Wv4mQs)2wt0D-h

diff --git a/ImageNodes/ImageNodes.csproj b/ImageNodes/ImageNodes.csproj
index 3809f50ee117632318fb4688772ad96bcac0b534..1f0bcf03eeb16aed566beb57a27bd7a5da99cc99 100644
GIT binary patch
delta 32
ncmZ1=xj=HmG$wXK215oL2K~wTOp=qgF<CJK`I|p8t>pv&k%9>H

delta 32
ncmZ1=xj=HmG$wWf1~Ud52K~wTOp=qgF<CJK`I|p8t>pv&k?sim

diff --git a/MetaNodes/MetaNodes.csproj b/MetaNodes/MetaNodes.csproj
index 93263df95346e3b9db46119a3e74a3137df05336..2afe5ebbcf896895e5224814b204a5094406e2b3 100644
GIT binary patch
delta 24
dcmbQCJVSZIEhc6|2E)mBnZiNzW^?95J^*672J!#^

delta 24
dcmbQCJVSZIEhc6I2D8a`nZiNzW^?95J^*6}2KoR1

diff --git a/MusicNodes/MusicNodes.csproj b/MusicNodes/MusicNodes.csproj
index 3809f6cd92960a0b98493923ba30b1feb6c35479..e17eb775a184a383a0a9c731cf1ad25cbf49c3ca 100644
GIT binary patch
delta 24
dcmZosY*F0sfQi|V!Eo|prf?9w*_PRz7XV*q2E70P

delta 24
dcmZosY*F0sfQi|F!EEwlrf?9w*_PRz7XV+h2E_mX

diff --git a/Plex/Plex.csproj b/Plex/Plex.csproj
index 6f9b18d2f472e43f513bad132adc0dcf698152a8..2f9f3ebc3b3439a8d8930f7053437c4efc62456a 100644
GIT binary patch
delta 24
dcmbOuHb-p31SV!f2E)mdnF2xd=I2bN8~|Em2EzaV

delta 24
dcmbOuHb-p31SVz!2D8bNnF2xd=I2bN8~|Fd2Fm~d

diff --git a/VideoLegacyNodes/VideoLegacyNodes.csproj b/VideoLegacyNodes/VideoLegacyNodes.csproj
index 7a6a4ca842bffabfefe2ce3540b15c2e2cc2b8eb..74531a4994cbaf1d8d2e44f2e09dc10cefd1d6c8 100644
GIT binary patch
delta 24
dcmdlazDayT4->N?gW=?Urce;Q`8m^R4gg<V2ZI0r

delta 24
dcmdlazDayT4->NigW2SMrce;Q`8m^R4gg=M2a5mz

diff --git a/VideoNodes/VideoNodes.csproj b/VideoNodes/VideoNodes.csproj
index d379ec7b13fb2a9377ac5893786fbf277e1f548c..c8b6df2e947dc28b229fde20bcfea1c357615a76 100644
GIT binary patch
delta 24
dcmZotXj0hlfQi|V!Eo|prf?9w*_Qbz4**}=2Q&Zx

delta 24
dcmZotXj0hlfQi|F!EEwlrf?9w*_Qbz4**~%2Rr}(