Merge pull request #755 from github-for-unity/fixes/update-server

Use http everywhere

Author: StanleyGoldman

src/GitHub.Api/Installer/GitInstaller.cs

@@ -218,7 +218,12 @@ private GitInstallationState GetZipsIfNeeded(GitInstallationState state)
                 return state;
 
             var downloader = new Downloader();
-            downloader.Catch(e => true);
+            downloader
+                .Catch(e =>
+                {
+                    LogHelper.Trace(e, "Failed to download");
+                    return true;
+                });
             downloader.Progress(p => ((Progress)Progress)?.UpdateProgress(20 + (long)(20 * p.Percentage), 100, downloader.Name));
             if (!state.GitZipExists && !state.GitIsValid && state.GitPackage != null)
                 downloader.QueueDownload(state.GitPackage.Uri, installDetails.ZipPath);
@@ -255,7 +260,11 @@ private GitInstallationState ExtractGit(GitInstallationState state)
                 var unzipTask = new UnzipTask(cancellationToken, installDetails.GitZipPath,
                         gitExtractPath, sharpZipLibHelper,
                         environment.FileSystem)
-                    .Catch(e => true);
+                    .Catch(e =>
+                    {
+                        LogHelper.Trace(e, "Failed to unzip " + installDetails.GitZipPath);
+                        return true;
+                    });
                 unzipTask.Progress(p => ((Progress)Progress)?.UpdateProgress(40 + (long)(20 * p.Percentage), 100, unzipTask.Name));
                 var path = unzipTask.RunWithReturn(true);
                 var target = state.GitInstallationPath;
@@ -276,7 +285,11 @@ private GitInstallationState ExtractGit(GitInstallationState state)
                 var unzipTask = new UnzipTask(cancellationToken, installDetails.GitLfsZipPath,
                         gitLfsExtractPath, sharpZipLibHelper,
                         environment.FileSystem)
-                    .Catch(e => true);
+                    .Catch(e =>
+                    {
+                        LogHelper.Trace(e, "Failed to unzip " + installDetails.GitLfsZipPath);
+                        return true;
+                    });
                 unzipTask.Progress(p => ((Progress)Progress)?.UpdateProgress(60 + (long)(20 * p.Percentage), 100, unzipTask.Name));
                 var path = unzipTask.RunWithReturn(true);
                 var target = state.GitLfsExecutablePath;
@@ -319,7 +332,7 @@ public class GitInstallDetails
 #if DEBUG
             private const string packageFeed = "http://localhost:50000/unity/git/";
 #else
-            private const string packageFeed = "https://ghfvs-installer.github.com/unity/git/";
+            private const string packageFeed = "http://github-vs.s3.amazonaws.com/unity/git/";
 #endif
 
             private const string PackageVersion = "f02737a78695063deace08e96d5042710d3e32db";

src/GitHub.Api/Installer/OctorunInstaller.cs

@@ -82,8 +82,8 @@ private bool IsOctorunExtracted()
 
         public class OctorunInstallDetails
         {
-            public const string DefaultZipMd5Url = "https://ghfvs-installer.github.com/unity/octorun/octorun.zip.md5";
-            public const string DefaultZipUrl = "https://ghfvs-installer.github.com/unity/octorun/octorun.zip";
+            public const string DefaultZipMd5Url = "http://github-vs.s3.amazonaws.com/unity/octorun/octorun.zip.md5";
+            public const string DefaultZipUrl = "http://github-vs.s3.amazonaws.com/unity/octorun/octorun.zip";
 
             public const string PackageVersion = "9fcd9faa";
             private const string PackageName = "octorun";

src/GitHub.Api/Primitives/Package.cs

@@ -33,8 +33,12 @@ public static Package Load(IEnvironment environment, UriString packageFeed)
             if (!feed.FileExists() || now.Date > environment.UserSettings.Get<DateTimeOffset>(key).Date)
             {
                 feed = new DownloadTask(TaskManager.Instance.Token, environment.FileSystem, packageFeed, environment.UserCachePath)
-                        .Catch(e => true)
-                        .RunWithReturn(true);
+                    .Catch(e =>
+                    {
+                        LogHelper.Trace(e, "Failed to download " + packageFeed);
+                        return true;
+                    })
+                    .RunWithReturn(true);
 
                 if (feed.IsInitialized)
                     environment.UserSettings.Set<DateTimeOffset>(key, now);

src/UnityExtension/Assets/Editor/GitHub.Unity/UpdateCheck.cs

@@ -54,14 +54,18 @@ public class UpdateCheckWindow :  EditorWindow
 #if DEBUG
         "http://localhost:50000/unity/latest.json"
 #else
-        "https://ghfvs-installer.github.com/unity/latest.json"
+        "http://github-vs.s3.amazonaws.com/unity/latest.json"
 #endif
         ;
 
         public static void CheckForUpdates()
         {
             var download = new DownloadTask(TaskManager.Instance.Token, EntryPoint.Environment.FileSystem, UpdateFeedUrl, EntryPoint.Environment.UserCachePath)
-                .Catch(e => true);
+                .Catch(e =>
+                {
+                    LogHelper.Trace(e, "Failed to download " + UpdateFeedUrl);
+                    return true;
+                });
             download.OnEnd += (thisTask, result, success, exception) =>
             {
                 if (success)