AppliStation,ハッシュが非整合の時に尋ねるようにした。(all-get.exeにも反映)

[applistation/AppliStation.git] / na-get-lib / NaGet.SubCommands / NaGetTaskSet.cs

diff --git a/na-get-lib/NaGet.SubCommands/NaGetTaskSet.cs b/na-get-lib/NaGet.SubCommands/NaGetTaskSet.cs
index 83beaf8..75a43ac 100644 (file)
--- a/na-get-lib/NaGet.SubCommands/NaGetTaskSet.cs
+++ b/na-get-lib/NaGet.SubCommands/NaGetTaskSet.cs
@@ -50,9 +50,30 @@ namespace NaGet.SubCommands
                /// <summary>\r
                /// \8dì\8bÆ\82ð\8fI\97¹\r
                /// </summary>\r
-               COMPLETED_TASKSET\r
+               COMPLETED_TASKSET,\r
+               /// <summary>\r
+               /// \8e¿\96â\r
+               /// </summary>\r
+               QUERY,\r
+               /// <summary>\r
+               /// \8cx\8d\90\82ð\8aÜ\82Þ\8e¿\96â\r
+               /// </summary>\r
+               WARNING_QUERY,\r
+       }\r
+       \r
+       /// <summary>\r
+       /// \8e¿\96â\82Ì\93\9a\82¦\r
+       /// </summary>\r
+       public enum NaGetTaskQueryResult\r
+       {\r
+               CONTINUE,\r
+               RETRY,\r
+               CANCEL,\r
+               CANCELED_AUTOMATICALLY,\r
        }\r
        \r
+       public delegate NaGetTaskQueryResult NaGetTaskQueryHandler(object sender, NaGetTaskSetEventArgs e);\r
+       \r
        /// <summary>\r
        /// NaGet\83^\83X\83N\8f\88\97\9d\82Ì\83p\83b\83N\r
        /// </summary>\r
@@ -64,6 +85,11 @@ namespace NaGet.SubCommands
                public event EventHandler<NaGetTaskSetEventArgs> TaskSetRaised;\r
                \r
                /// <summary>\r
+               /// \83^\83X\83N\8f\88\97\9d\92\86\82Ì\8e¿\96â\82Ì\83n\83\93\83h\83\89\r
+               /// </summary>\r
+               public event NaGetTaskQueryHandler TaskQueryRaised;\r
+               \r
+               /// <summary>\r
                /// \95¶\8e\9a\97ñ\82Å\95\\8c»\82µ\82½\8dì\8bÆ\88ê\97\97\83\8a\83X\83g\r
                /// </summary>\r
                public string[] TaskSetNames;\r
@@ -83,13 +109,8 @@ namespace NaGet.SubCommands
                \r
                protected virtual void RaiseTaskSetEvent(NaGetTaskSetEventType type, string message, float percent)\r
                {\r
-                       RaiseTaskSetEvent(new NaGetTaskSetEventArgs(type, message, percent));\r
-               }\r
-               \r
-               protected virtual void RaiseTaskSetEvent(NaGetTaskSetEventArgs e)\r
-               {\r
                        if (TaskSetRaised != null) {\r
-                               TaskSetRaised(this, e);\r
+                               TaskSetRaised(this, new NaGetTaskSetEventArgs(type, message, percent));\r
                        }\r
                }\r
                \r
@@ -107,6 +128,20 @@ namespace NaGet.SubCommands
                        }\r
                }\r
                \r
+               protected virtual NaGetTaskQueryResult RaiseTaskSetQueryEvent(NaGetTaskSetEventType type, string message)\r
+               {\r
+                       float percent = (CurrentTaskSetIndex >= 0)? CurrentTaskSetIndex * 100 / TaskSetNames.Length : -1;\r
+                       return RaiseTaskSetQueryEvent(type, message, percent);\r
+               }\r
+               \r
+               protected virtual NaGetTaskQueryResult RaiseTaskSetQueryEvent(NaGetTaskSetEventType type, string message, float percent)\r
+               {\r
+                       if (TaskQueryRaised != null) {\r
+                               return TaskQueryRaised(this, new NaGetTaskSetEventArgs(type, message, percent));\r
+                       }\r
+                       return NaGetTaskQueryResult.CANCELED_AUTOMATICALLY;\r
+               }\r
+               \r
                public override bool Running {\r
                        get { return CurrentTaskSetIndex >= 0 && !Done; }\r
                }\r