rename FormatDetector to FormatFactory.

cube-soft · Nov 11, 2022 · 60064da · 60064da
1 parent c8975c6
commit 60064da
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/Applications/Ice/Core/Sources/CompressionQueryValue.cs b/Applications/Ice/Core/Sources/CompressionQueryValue.cs
@@ -264,7 +264,7 @@ private void SetDestination(string src)
         if (!src.HasValue()) return;
 
         var ext = Io.GetExtension(src).ToLowerInvariant();
-        var obj = ext == ".exe" ? Format.Sfx : FormatDetector.FromExtension(ext);
+        var obj = ext == ".exe" ? Format.Sfx : FormatFactory.FromExtension(ext);
         if (obj == Format.Unknown) return;
 
         var fmt = obj == Format.GZip || obj == Format.BZip2 || obj == Format.XZ ? Format.Tar : obj;

diff --git a/Applications/Ice/Main/Sources/Presenters/Extract/ExtractFacade.cs b/Applications/Ice/Main/Sources/Presenters/Extract/ExtractFacade.cs
@@ -165,7 +165,7 @@ private void Invoke(ArchiveReader src, int index, ExtractDirectory dir)
         Retry(() => src.Save(Temp, item, GetProgress()));
 
         var dest = Io.Combine(Temp, item.FullName);
-        if (FormatDetector.From(dest) != Format.Tar) Move(item);
+        if (FormatFactory.From(dest) != Format.Tar) Move(item);
         else
         {
             using var e = new ArchiveReader(dest, Password, src.Options);

diff --git a/Libraries/Core/Sources/ArchiveReader.cs b/Libraries/Core/Sources/ArchiveReader.cs
@@ -109,7 +109,7 @@ public ArchiveReader(string src, ArchiveOption options) : this(src, string.Empty
     ///
     /* --------------------------------------------------------------------- */
     public ArchiveReader(string src, string password, ArchiveOption options) :
-        this(FormatDetector.From(src), src, new(password), options) { }
+        this(FormatFactory.From(src), src, new(password), options) { }
 
     /* --------------------------------------------------------------------- */
     ///
@@ -126,7 +126,7 @@ public ArchiveReader(string src, string password, ArchiveOption options) :
     ///
     /* --------------------------------------------------------------------- */
     public ArchiveReader(string src, IQuery<string> password, ArchiveOption options) :
-        this(FormatDetector.From(src), src, new(password), options) { }
+        this(FormatFactory.From(src), src, new(password), options) { }
 
     /* --------------------------------------------------------------------- */
     ///

diff --git a/Libraries/Core/Sources/FormatDetector.cs → Libraries/Core/Sources/FormatFactory.cs b/Libraries/Core/Sources/FormatDetector.cs → Libraries/Core/Sources/FormatFactory.cs
@@ -25,14 +25,15 @@ namespace Cube.FileSystem.SevenZip;
 
 /* ------------------------------------------------------------------------- */
 ///
-/// Formatter
+/// FormatFactory
 ///
 /// <summary>
-/// Provides extended methods of the Format.
+/// Provides functionality to detect the archive format with the specified
+/// arguments.
 /// </summary>
 ///
 /* ------------------------------------------------------------------------- */
-public static class FormatDetector
+public static class FormatFactory
 {
     #region Methods
 

diff --git a/Libraries/Core/Sources/Internal/ArchiveExtension.cs b/Libraries/Core/Sources/Internal/ArchiveExtension.cs
@@ -78,7 +78,7 @@ public static string GetPath(this IInArchive src, int index, string path)
         if (dest.HasValue()) return dest;
 
         var tmp = Io.GetBaseName(path);
-        var fmt = FormatDetector.FromExtension(Io.GetExtension(tmp));
+        var fmt = FormatFactory.FromExtension(Io.GetExtension(tmp));
         if (fmt != Format.Unknown) return Io.GetFileName(tmp);
 
         var name = index == 0 ? Io.GetFileName(tmp) : $"{Io.GetFileName(tmp)}({index})";

diff --git a/Tests/Core/Sources/ArchiveWriterExTest.cs b/Tests/Core/Sources/ArchiveWriterExTest.cs
@@ -61,7 +61,7 @@ public void WithCjk(CodePage cp)
         }
 
         using var ss = Io.Open(dest);
-        Assert.That(FormatDetector.From(ss), Is.EqualTo(zip));
+        Assert.That(FormatFactory.From(ss), Is.EqualTo(zip));
     }
 
     /* --------------------------------------------------------------------- */

diff --git a/Tests/Core/Sources/ArchiveWriterTest.cs b/Tests/Core/Sources/ArchiveWriterTest.cs
@@ -58,7 +58,7 @@ public Format Save(string filename, Format format, string[] src, CompressionOpti
             obj.Clear();
         }
 
-        using (var obj = Io.Open(dest)) return FormatDetector.From(obj);
+        using (var obj = Io.Open(dest)) return FormatFactory.From(obj);
     }
 
     #endregion

diff --git a/Tests/Core/Sources/FormatTest.cs b/Tests/Core/Sources/FormatTest.cs
@@ -71,7 +71,7 @@ public Format Detect(string filename)
     {
         var dest = Get(Guid.NewGuid().ToString("N"));
         Io.Copy(GetSource(filename), dest, true);
-        return FormatDetector.From(dest);
+        return FormatFactory.From(dest);
     }
 
     /* --------------------------------------------------------------------- */
@@ -102,7 +102,7 @@ public Format Detect(string filename)
     /* --------------------------------------------------------------------- */
     [Test]
     public void FromFile_NotFound()=> Assert.That(
-        FormatDetector.From(GetSource("NotFound.rar")),
+        FormatFactory.From(GetSource("NotFound.rar")),
         Is.EqualTo(Format.Rar)
     );