Build n.10

Plenyx · Apr 16, 2019 · 059737e · 059737e
1 parent f6cdc4e
commit 059737e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/FormMain.cs b/FormMain.cs
@@ -24,7 +24,7 @@ public partial class FormMain : Form
         public DPSReportJSONMinimal LastLog { get; set; }
         public string ChannelName { get; set; } = "";
         public string DPSReportServer { get; set; } = "";
-        public int Build { get; } = 9;
+        public int Build { get; } = 10;
 
         // fields
         private TwitchIrcClient chatConnect;
@@ -329,7 +329,7 @@ protected void DoCommandArgs()
                         {
                             if (archived)
                             {
-                                File.Delete(GetLocalDir() + Path.GetFileName(zipfilelocation) + ".zevtc");
+                                File.Delete($"{GetLocalDir()}{Path.GetFileName(zipfilelocation)}.zevtc");
                             }
                         }
                     }
@@ -768,7 +768,32 @@ private void FormMain_DragDrop(object sender, DragEventArgs e)
             string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
             foreach (string file in files)
             {
-                HttpUploadFileToDPSReport(file, postData, true);
+                if (File.Exists(file) && (file.EndsWith(".evtc") || file.EndsWith(".zevtc")))
+                {
+                    bool archived = false;
+                    string zipfilelocation = file;
+                    if (!file.EndsWith(".zevtc"))
+                    {
+                        zipfilelocation = $"{GetLocalDir()}{Path.GetFileName(file)}.zevtc";
+                        using (ZipArchive zipfile = ZipFile.Open(zipfilelocation, ZipArchiveMode.Create)) { zipfile.CreateEntryFromFile(@file, Path.GetFileName(file)); }
+                        archived = true;
+                    }
+                    try
+                    {
+                        HttpUploadFileToDPSReport(zipfilelocation, postData);
+                    }
+                    catch
+                    {
+                        AddToText($">>> Unknown error uploading a log: {zipfilelocation}");
+                    }
+                    finally
+                    {
+                        if (archived)
+                        {
+                            File.Delete($"{GetLocalDir()}{Path.GetFileName(zipfilelocation)}.zevtc");
+                        }
+                    }
+                }
             }
         }
     }

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-9
+10