Support for downloading and unzip zip files

Author: sweiland-openrails

Source/Menu/DownloadContentForm.cs

@@ -27,6 +27,8 @@
 using System.Diagnostics;
 using System.Threading;
 using System.ComponentModel;
+using System.Net;
+using System.IO.Compression;
 
 namespace ORTS
 {
@@ -86,10 +88,10 @@ private void DownloadContentButton_Click(object sender, EventArgs e)
             string installPathRoute = Path.Combine(installPath, RouteName);
             string message;
 
-            message = Catalog.GetStringFmt("Route to be installed in \"{0}\", are you sure?", installPathRoute);
-
             // various checks for the directory where the route is installed
 
+            message = Catalog.GetStringFmt("Route to be installed in \"{0}\", are you sure?", installPathRoute);
+
             if (MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) != DialogResult.OK)
             {
                 // cancelled
@@ -170,23 +172,57 @@ private bool downloadRoute(string installPathRoute)
         {
             bool returnValue = false;
 
-            Thread cloneThread = new Thread(() =>
+            Thread downloadThread = new Thread(() =>
             {
-                returnValue = doTheClone(installPathRoute);
+                if (Routes[RouteName].Url.EndsWith(".git"))
+                {
+                    returnValue = doTheClone(installPathRoute);
+                }
+                if (Routes[RouteName].Url.EndsWith(".zip"))
+                {
+                    returnValue = doTheZipDownload(Routes[RouteName].Url, Path.Combine(installPathRoute, RouteName + ".zip"));
+                }
             });
-            cloneThread.Start();
+            downloadThread.Start();
 
-            while (cloneThread.IsAlive)
+            while (downloadThread.IsAlive)
             {
                 Stopwatch sw = Stopwatch.StartNew();
 
                 TotalBytes = 0;
                 sumMB(installPathRoute);
                 dataGridViewDownloadContent.CurrentRow.Cells[1].Value =
-                    string.Format("downloaded: {0} kB", Math.Round((double)(TotalBytes / 1024)));
+                    string.Format("downloaded: {0} kB", (TotalBytes / 1024).ToString("N0"));
                 Refresh();
 
-                while ((cloneThread.IsAlive) && (sw.ElapsedMilliseconds <= 3000)) { }
+                while ((downloadThread.IsAlive) && (sw.ElapsedMilliseconds <= 3000)) { }
+            }
+
+            if (returnValue)
+            {
+                if (Routes[RouteName].Url.EndsWith(".zip"))
+                {
+                    Thread installThread = new Thread(() =>
+                    {
+                        returnValue = doTheUnzipInstall(Path.Combine(installPathRoute, RouteName + ".zip"), installPathRoute);
+                    });
+                    installThread.Start();
+
+                    long bytesZipfile = TotalBytes;
+
+                    while (installThread.IsAlive)
+                    {
+                        Stopwatch sw = Stopwatch.StartNew();
+
+                        TotalBytes = -bytesZipfile;
+                        sumMB(installPathRoute);
+                        dataGridViewDownloadContent.CurrentRow.Cells[1].Value =
+                            string.Format("Installed: {0} kB", (TotalBytes / 1024).ToString("N0"));
+                        Refresh();
+
+                        while ((installThread.IsAlive) && (sw.ElapsedMilliseconds <= 3000)) { }
+                    }
+                }
             }
 
             dataGridViewDownloadContent.CurrentRow.Cells[1].Value = "";
@@ -203,7 +239,45 @@ private bool doTheClone(string installPathRoute)
             catch (LibGit2SharpException libGit2SharpException)
             {
                 {
-                    string message = Catalog.GetStringFmt("Error during download: {0}", libGit2SharpException.Message);
+                    string message = Catalog.GetStringFmt("Error during github download: {0}", libGit2SharpException.Message);
+                    MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private bool doTheZipDownload(string url, string installPathRouteZipfileName)
+        {
+            try
+            {
+                WebClient myWebClient = new WebClient();
+                myWebClient.DownloadFile(url, installPathRouteZipfileName);
+            }
+            catch (Exception error)
+            {
+                {
+                    string message = Catalog.GetStringFmt("Error during download zipfile {0}: {1}", url, error.Message);
+                    MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private bool doTheUnzipInstall(string installPathRouteZipfileName, string installPathRoute)
+        {
+            try
+            {
+                ZipFile.ExtractToDirectory(installPathRouteZipfileName, installPathRoute);
+                File.Delete(installPathRouteZipfileName);
+            }
+            catch (Exception error)
+            {
+                {
+                    string message = Catalog.GetStringFmt("Error during unzip zipfile {0}: {1}", installPathRouteZipfileName, error.Message);
                     MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.OK, MessageBoxIcon.Error);
                     return false;
                 }

Source/ORTS.Settings/RouteSettings.cs

@@ -18,14 +18,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using LibGit2Sharp;
-using static ORTS.Settings.RouteSettings;
-using System.Windows.Forms;
 
 namespace ORTS.Settings
 {
@@ -79,17 +76,18 @@ public void LoadContentAndInstalled()
             }
 
             string definedContentJsonName = @"d:\content\routes.json";
-            string definedContentJsonDirectoryName = Path.Combine(UserSettings.UserDataFolder, "ContentJson");
-            string githubUrl = "https://github.com/openrails/content.git";
+
+            string definedContentJsonDirectoryName = Path.GetTempFileName();
+            File.Delete(definedContentJsonDirectoryName);
+
+            string githubUrl = "https://github.com/openrails/content.git";;
 
             if (Environment.GetEnvironmentVariable("TstLoadContentAndInstalled") == null)
             {
                 try
                 {
                     // normal non test behaviour, retrieve json file from github
 
-                    directoryDelete(definedContentJsonDirectoryName);
-
                     Repository.Clone(githubUrl, definedContentJsonDirectoryName);
 
                     definedContentJsonName = Path.Combine(definedContentJsonDirectoryName, "routes.json");
@@ -109,12 +107,14 @@ public void LoadContentAndInstalled()
                     IList<JToken> results = JsonConvert.DeserializeObject<JToken>(json) as IList<JToken>;
                     foreach (JToken result in results)
                     {
-                        if (result["url"].ToString().EndsWith(".git"))
+                        string routeName = result["name"].ToString();
+                        string url = result["url"].ToString();
+
+                        if (url.EndsWith(".git") || url.EndsWith(".zip"))
                         {
-                            string routeName = result["name"].ToString();
                             if (!Routes.ContainsKey(routeName))
                             {
-                                Routes.Add(routeName, new RouteSettings.Route("", result["url"].ToString()));
+                                Routes.Add(routeName, new RouteSettings.Route("", url));
                             }
                         }
                     }
@@ -134,6 +134,7 @@ private void directoryDelete(string directoryName)
         {
             if (Directory.Exists(directoryName))
             {
+                // remove the read only flags, otherwise the Directory.delete does not work
                 directoryRemoveReadOnlyFlags(directoryName);
                 Directory.Delete(directoryName, true);
             }
@@ -158,6 +159,7 @@ public void Save()
 
             for (int index = 0; index < Routes.Count; index++)
             {
+                // only save the installed routes
                 if (!string.IsNullOrWhiteSpace(Routes.ElementAt(index).Value.DateInstalled))
                 {
                     routes.Add(Routes.ElementAt(index));