change Report interface.

Author: clown

Applications/Ice/Main/Sources/Internal/ExtractExtension.cs

@@ -80,8 +80,8 @@ internal static class ExtractExtension
         ///
         /* ----------------------------------------------------------------- */
         public static string GetText(this ExtractFacade src) =>
-            src.Report.Current != null ?
-            src.Report.Current.FullName :
+            src.Report.Target != null ?
+            src.Report.Target.FullName :
             Properties.Resources.MessagePreExtract;
 
         #endregion

Applications/Ice/Main/Sources/Internal/ProgressExtension.cs

@@ -78,7 +78,7 @@ public static void SuspendOrResume(this ProgressFacade src)
     /* --------------------------------------------------------------------- */
     public static string GetTitle(this ProgressFacade src, string path)
     {
-        var percentage = (int)(src.Report.Ratio * 100.0);
+        var percentage = (int)(src.Report.GetRatio() * 100.0);
         var dest = new StringBuilder();
         _ = dest.Append($"{percentage}%");
         if (path.HasValue()) _ = dest.Append($" - {Io.GetFileName(path)}");

Applications/Ice/Main/Sources/Internal/ReportExtension.cs

@@ -55,10 +55,10 @@ internal static class ReportExtension
         /* ----------------------------------------------------------------- */
         public static TimeSpan Estimate(this Report src, TimeSpan elapsed, TimeSpan prev)
         {
-            if (src.Ratio < 0.01 || elapsed <= TimeSpan.Zero) return TimeSpan.Zero;
+            if (src.GetRatio() < 0.01 || elapsed <= TimeSpan.Zero) return TimeSpan.Zero;
 
             var unit  = 10L;
-            var ratio = Math.Max(1 / src.Ratio - 1.0, 0.0);
+            var ratio = Math.Max(1 / src.GetRatio() - 1.0, 0.0);
             var value = elapsed.TotalSeconds * ratio;
             var delta = value - prev.TotalSeconds;
 
@@ -80,8 +80,8 @@ public static TimeSpan Estimate(this Report src, TimeSpan elapsed, TimeSpan prev
         /* ----------------------------------------------------------------- */
         public static void CopyTo(this Report src, Report dest)
         {
-            dest.Current    = src.Current;
             dest.State      = src.State;
+            dest.Target     = src.Target;
             dest.Count      = src.Count;
             dest.TotalCount = src.TotalCount;
             dest.Bytes      = src.Bytes;

Applications/Ice/Main/Sources/Message.cs

@@ -138,7 +138,7 @@ private static string GetErrorText(Report src)
                    src.Exception is SevenZipException se ? se.Code.ToString() :
                    src.Exception.GetType().Name;
 
-        if (src.Current is not null) _ = dest.AppendLine(src.Current.RawName);
+        if (src.Target is not null) _ = dest.AppendLine(src.Target.RawName);
 
         return dest.AppendFormat(Properties.Resources.ErrorGeneric, e)
                    .AppendLine()

Applications/Ice/Main/Sources/Presenters/Base/ProgressViewModel.cs

@@ -102,7 +102,7 @@ public int Value
     {
         get
         {
-            var src = Math.Max((int)(Facade.Report.Ratio * Unit), 1);
+            var src = Math.Max((int)(Facade.Report.GetRatio() * Unit), 1);
             var cmp = Get<int>();
             if (src > cmp) { _ = Set(src); return src; }
             else return cmp;

Applications/Ice/Main/Sources/Presenters/Extract/ExtractFacade.cs

@@ -129,7 +129,7 @@ private void Invoke(ArchiveReader src, ExtractDirectory dir)
             e.CopyTo(Report);
             if (Report.State == ProgressState.Success)
             {
-                try { Move(e.Current); }
+                try { Move(e.Target); }
                 catch (Exception err)
                 {
                     e.State     = ProgressState.Failed;
@@ -140,7 +140,7 @@ private void Invoke(ArchiveReader src, ExtractDirectory dir)
             else if (Report.State == ProgressState.Failed)
             {
                 Error?.Invoke(e);
-                if (!e.Cancel) Logger.Warn(() => Move(e.Current));
+                if (!e.Cancel) Logger.Warn(() => Move(e.Target));
             }
         });
 

Libraries/Core/Sources/Internal/Callbacks/CallbackBase.cs

@@ -276,7 +276,7 @@ protected SevenZipCode Run(Func<SevenZipCode> func, ProgressState state, Func<En
         Cancel     = state == ProgressState.Failed,
         State      = state,
         Exception  = error,
-        Current    = entity,
+        Target     = entity,
         Bytes      = Bytes,
         Count      = Count,
         TotalBytes = TotalBytes,

Libraries/Core/Sources/Report.cs

@@ -58,26 +58,26 @@ public class Report
 
     /* --------------------------------------------------------------------- */
     ///
-    /// Exception
+    /// Target
     ///
     /// <summary>
-    /// Gets or sets an exception object. The property is set when the value
-    /// of Status is Failed.
+    /// Gets or sets the file information that is currently processing.
     /// </summary>
     ///
     /* --------------------------------------------------------------------- */
-    public Exception Exception { get; set; }
+    public Entity Target { get; set; }
 
     /* --------------------------------------------------------------------- */
     ///
-    /// Current
+    /// Exception
     ///
     /// <summary>
-    /// Gets or sets the file information that is currently processing.
+    /// Gets or sets an exception object. The property is set when the value
+    /// of State is Failed.
     /// </summary>
     ///
     /* --------------------------------------------------------------------- */
-    public Entity Current { get; set; }
+    public Exception Exception { get; set; }
 
     /* --------------------------------------------------------------------- */
     ///
@@ -123,19 +123,5 @@ public class Report
     /* --------------------------------------------------------------------- */
     public long TotalBytes { get; set; }
 
-    /* --------------------------------------------------------------------- */
-    ///
-    /// Ratio
-    ///
-    /// <summary>
-    /// Gets the progress ratio within the range of [0, 1].
-    /// </summary>
-    ///
-    /* --------------------------------------------------------------------- */
-    public double Ratio => Math.Min(
-        TotalBytes > 0 ? Bytes / (double)TotalBytes : 0.0,
-        TotalCount > 0 ? Count / (double)TotalCount : 0.0
-    );
-
     #endregion
 }

Libraries/Core/Sources/ReportExtension.cs

@@ -0,0 +1,47 @@
+/* ------------------------------------------------------------------------- */
+//
+// Copyright (c) 2010 CubeSoft, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+/* ------------------------------------------------------------------------- */
+namespace Cube.FileSystem.SevenZip;
+
+using System;
+
+/* ------------------------------------------------------------------------- */
+///
+/// ReportExtension
+///
+/// <summary>
+/// Provides extended methods of the Report class.
+/// </summary>
+///
+/* ------------------------------------------------------------------------- */
+public static class ReportExtension
+{
+    /* --------------------------------------------------------------------- */
+    ///
+    /// GetRatio
+    ///
+    /// <summary>
+    /// Gets the progress ratio within the range of [0, 1].
+    /// </summary>
+    ///
+    /* --------------------------------------------------------------------- */
+    public static double GetRatio(this Report src) => Math.Min(
+        src.TotalBytes > 0 ? src.Bytes / (double)src.TotalBytes : 0.0,
+        src.TotalCount > 0 ? src.Count / (double)src.TotalCount : 0.0
+    );
+}