Fix ZIP external attributes on move actions

Author: GerardSmit

src/Zio.Tests/FileSystems/TestZipArchiveFileSystemCompact.cs

@@ -128,6 +128,56 @@ public void TestDirectoryMove()
         Assert.True(fs.FileExists("/dir2/file2.txt"));
     }
 
+#if !NET472
+    [Fact]
+    public void TestDirectoryMoveAttributes()
+    {
+        fs.CreateDirectory("/dir");
+        fs.WriteAllText("/dir/file.txt", "test");
+
+        fs.SetAttributes("/dir", FileAttributes.Temporary);
+        Assert.Equal(FileAttributes.Directory | FileAttributes.Temporary, fs.GetAttributes("/dir"));
+
+        fs.SetAttributes("/dir/file.txt", FileAttributes.Temporary);
+
+        Assert.Equal(FileAttributes.Temporary, fs.GetAttributes("/dir/file.txt"));
+
+        fs.MoveDirectory("/dir", "/moved");
+
+        Assert.True(fs.DirectoryExists("/moved"));
+        Assert.Equal(FileAttributes.Directory | FileAttributes.Temporary, fs.GetAttributes("/moved"));
+
+        Assert.True(fs.FileExists("/moved/file.txt"));
+        Assert.Equal(FileAttributes.Temporary, fs.GetAttributes("/moved/file.txt"));
+    }
+
+    [Fact]
+    public void TestFileMoveAttributes()
+    {
+        fs.WriteAllText("/file.txt", "test");
+        fs.SetAttributes("/file.txt", FileAttributes.Temporary);
+        Assert.Equal(FileAttributes.Temporary, fs.GetAttributes("/file.txt"));
+
+        fs.MoveFile("/file.txt", "/moved.txt");
+
+        Assert.True(fs.FileExists("/moved.txt"));
+        Assert.Equal(FileAttributes.Temporary, fs.GetAttributes("/moved.txt"));
+    }
+
+    [Fact]
+    public void TestCopyFileAttributes()
+    {
+        fs.WriteAllText("/file.txt", "test");
+        fs.SetAttributes("/file.txt", FileAttributes.Temporary);
+        Assert.Equal(FileAttributes.Temporary, fs.GetAttributes("/file.txt"));
+
+        fs.CopyFile("/file.txt", "/copy.txt", true);
+
+        Assert.True(fs.FileExists("/copy.txt"));
+        Assert.Equal(FileAttributes.Temporary, fs.GetAttributes("/copy.txt"));
+    }
+#endif
+
     [Fact]
     public void TestFile()
     {

src/Zio/FileSystems/ZipArchiveFileSystem.cs

@@ -267,14 +267,18 @@ protected override void CopyFileImpl(UPath srcPath, UPath destPath, bool overwri
             using var srcStream = srcEntry.Open();
             srcStream.CopyTo(destStream);
         }
-#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
-        destEntry.ExternalAttributes = srcEntry.ExternalAttributes | (int)FileAttributes.Archive;
-#endif
+        CopyEntryProperties(srcEntry, destEntry, includeLastWriteTime: false);
         TryGetDispatcher()?.RaiseCreated(destPath);
     }
 
     /// <inheritdoc />
     protected override void CreateDirectoryImpl(UPath path)
+    {
+        CreateDirectoryWithoutNotification(path);
+        TryGetDispatcher()?.RaiseCreated(path);
+    }
+
+    private ZipArchiveEntry CreateDirectoryWithoutNotification(UPath path)
     {
         if (FileExistsImpl(path))
         {
@@ -295,8 +299,7 @@ protected override void CreateDirectoryImpl(UPath path)
             }
         }
 
-        CreateEntry(path, isDirectory: true);
-        TryGetDispatcher()?.RaiseCreated(path);
+        return CreateEntry(path, isDirectory: true);
     }
 
     /// <inheritdoc />
@@ -653,28 +656,33 @@ protected override void MoveDirectoryImpl(UPath srcPath, UPath destPath)
             throw FileSystemExceptionHelper.NewDirectoryNotFoundException(srcPath);
         }
 
-        CreateDirectoryImpl(destPath);
+        var rootEntry = CreateDirectoryWithoutNotification(destPath);
         foreach (var internalEntry in entries)
         {
             var entry = internalEntry.Entry;
 
+            ZipArchiveEntry destEntry;
+
             if (entry.FullName.Length == srcDir.Length)
             {
-                RemoveEntry(entry);
-                continue;
+                destEntry = rootEntry;
             }
-
-            var entryName = entry.FullName.Substring(srcDir.Length);
-            var isDirectory = internalEntry.IsDirectory;
-            var destEntry = CreateEntry(UPath.Combine(destPath, entryName), isDirectory: isDirectory);
-
-            if (!isDirectory)
+            else
             {
-                using var entryStream = entry.Open();
-                using var destEntryStream = destEntry.Open();
-                entryStream.CopyTo(destEntryStream);
+                var entryName = entry.FullName.Substring(srcDir.Length);
+                var isDirectory = internalEntry.IsDirectory;
+                destEntry = CreateEntry(UPath.Combine(destPath, entryName), isDirectory: isDirectory);
+
+                if (!isDirectory)
+                {
+                    using var entryStream = entry.Open();
+                    using var destEntryStream = destEntry.Open();
+                    entryStream.CopyTo(destEntryStream);
+                }
             }
 
+            CopyEntryProperties(entry, destEntry);
+
             TryGetDispatcher()?.RaiseCreated(destPath);
             RemoveEntry(entry);
             TryGetDispatcher()?.RaiseDeleted(srcPath);
@@ -717,6 +725,7 @@ protected override void MoveFileImpl(UPath srcPath, UPath destPath)
         }        
 
         destEntry = CreateEntry(destPath.FullName);
+        CopyEntryProperties(srcEntry, destEntry);
         TryGetDispatcher()?.RaiseCreated(destPath);
         using (var destStream = destEntry.Open())
         {
@@ -827,6 +836,7 @@ protected override void ReplaceFileImpl(UPath srcPath, UPath destPath, UPath des
             if (!destBackupPath.IsEmpty)
             {
                 var destBackupEntry = CreateEntry(destBackupPath.FullName);
+                CopyEntryProperties(destEntry, destBackupEntry);
                 using var destBackupStream = destBackupEntry.Open();
                 using var destStream = destEntry.Open();
                 destStream.CopyTo(destBackupStream);
@@ -836,6 +846,7 @@ protected override void ReplaceFileImpl(UPath srcPath, UPath destPath, UPath des
         }
 
         var newEntry = CreateEntry(destPath.FullName);
+        CopyEntryProperties(sourceEntry, newEntry);
         using (var newStream = newEntry.Open())
         {
             using (var sourceStream = sourceEntry.Open())
@@ -985,11 +996,11 @@ private string GetArchivePath(UPath path, bool isDirectory)
         {
             if (ctx.LeadingSlashInArchive)
             {
-                ctx.path.FullName.AsSpan().CopyTo(span.Slice(0, ctx.path.FullName.Length));
+                ctx.path.FullName.AsSpan().CopyTo(span);
             }
             else
             {
-                ctx.path.FullName.AsSpan(1, ctx.path.FullName.Length - 1).CopyTo(span);
+                ctx.path.FullName.AsSpan(1).CopyTo(span);
             }
 
             if (ctx.isDirectory)
@@ -1003,6 +1014,21 @@ private string GetArchivePath(UPath path, bool isDirectory)
 
     private static readonly char[] s_slashChars = { '/', '\\' };
 
+    private static void CopyEntryProperties(ZipArchiveEntry source, ZipArchiveEntry dest, bool includeLastWriteTime = true)
+    {
+        if (includeLastWriteTime)
+        {
+            dest.LastWriteTime = source.LastWriteTime;
+        }
+
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
+        dest.ExternalAttributes = source.ExternalAttributes;
+#endif
+#if NET6_0_OR_GREATER
+        dest.Comment = source.Comment;
+#endif
+    }
+
     private static ReadOnlySpan<char> GetName(ZipArchiveEntry entry)
     {
         var name = entry.FullName.TrimEnd(s_slashChars);