Fixed drag-drop again

aa2g · May 8, 2016 · a659753 · a659753
1 parent c89f4fe
commit a659753
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/AA2Pack/Program.cs b/AA2Pack/Program.cs
@@ -48,6 +48,9 @@ static void Main(string[] args)
                 args.ContainsSwitch("h"))
             {
                 PrintHelp();
+#if DEBUG
+                Console.ReadKey();
+#endif
                 return;
             }
 
@@ -82,7 +85,7 @@ static void Main(string[] args)
                         using (FileStream fs = new FileStream(path, FileMode.Create))
                             iw.WriteTo(fs);
 
-                        ConsoleWriter.WriteFormat("[{0}/{1}] Processed {2}... ({3})",
+                        ConsoleWriter.WriteLineFormat("[{0}/{1}] Processed {2}... ({3})",
                             (++i).ToString(), //processed subfiles
                             pp.Subfiles.Count.ToString(), //total subfiles
                             iw.Name, //current subfile
@@ -95,11 +98,7 @@ static void Main(string[] args)
                 {
                     //packing into a .pp
 
-                    string localPath = s.TrimEnd('\\') + ".pp";
-                    if (localPath.Contains("\\"))
-                        localPath = localPath.Remove(0, s.LastIndexOf('\\'));
-
-                    string ppPath = Path.Combine(Path.GetDirectoryName(s.TrimEnd('\\')), localPath);
+                    string ppPath = Path.GetFullPath(s).TrimEnd('\\') + ".pp";
 
                     if (File.Exists(ppPath))
                     {
@@ -122,7 +121,7 @@ static void Main(string[] args)
                     bg.ProgressChanged += (sender, e) =>
                     {
                         ConsoleWriter.ClearLine();
-                        ConsoleWriter.WriteFormat("Writing " + localPath + "... ({0})", e.ProgressPercentage + "%");
+                        ConsoleWriter.WriteFormat("Writing " + ppPath + "... ({0})", e.ProgressPercentage + "%");
                     };
 
                     bg.RunWorkerAsync();
@@ -131,10 +130,13 @@ static void Main(string[] args)
                         System.Threading.Thread.Sleep(50);
 
                     ConsoleWriter.ClearLine();
-                    ConsoleWriter.WriteLineFormat("Writing " + localPath + "... ({0})", "100%");
+                    ConsoleWriter.WriteLineFormat("Writing " + ppPath + "... ({0})", "100%");
                 }
-
             }
+
+#if DEBUG
+            Console.ReadKey();
+#endif
         }
     }
 }