Clean up dead code

Author: donker

Server/Core/Services/Github/GithubBlob.cs

@@ -1,10 +1,8 @@
-using Connect.LanguagePackManager.Core.Services.Packages;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Text;
 
 namespace Connect.LanguagePackManager.Core.Services.Github
 {
@@ -15,11 +13,6 @@ public static List<GithubRelease> GetReleases(string org, string repo)
       return GetJsonObject<List<GithubRelease>>($"repos/{org}/{repo}/releases?per_page=99");
     }
 
-    public static GithubTree GetFileTree(string org, string repo, string treeSha)
-    {
-      return GetJsonObject<GithubTree>($"repos/{org}/{repo}/git/trees/{treeSha}?recursive=1");
-    }
-
     public static GithubCommit GetLastCommit(string org, string repo)
     {
       return GetJsonObject<List<GithubCommit>>($"repos/{org}/{repo}/commits?per_page=1&page=1")
@@ -60,7 +53,7 @@ public static bool DownloadFile(string fileUrl, string destinationFile)
           ServicePointManager.Expect100Continue = true;
           ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Ssl3;
           client.Headers.Add("user-agent", "request");
-          
+
           client.DownloadFile(fileUrl, destinationFile);
         }
       }
@@ -71,28 +64,5 @@ public static bool DownloadFile(string fileUrl, string destinationFile)
 
       return true;
     }
-
-    public static string DownloadFile(string fileUrl)
-    {
-      try
-      {
-        using (var client = new WebClient())
-        {
-          ServicePointManager.Expect100Continue = true;
-          ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Ssl3;
-          client.Headers.Add("user-agent", "request");
-
-          var blobJsonBytes = client.DownloadData(fileUrl);
-          var blobJson = Encoding.UTF8.GetString(blobJsonBytes, 0, blobJsonBytes.Length);
-          var blob = Newtonsoft.Json.JsonConvert.DeserializeObject<GithubBlob>(blobJson);
-          var blobBytes = Convert.FromBase64String(blob.Content);
-          return Encoding.UTF8.GetString(blobBytes, 0, blobBytes.Length);
-        }
-      }
-      catch (Exception ex)
-      {
-        return null;
-      }
-    }
   }
 }

Server/Core/Services/Github/GithubFile.cs

@@ -2,7 +2,6 @@
 using Connect.LanguagePackManager.Core.Data;
 using Connect.LanguagePackManager.Core.Helpers;
 using Connect.LanguagePackManager.Core.Repositories;
-using Connect.LanguagePackManager.Core.Services.Github;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -17,32 +16,6 @@ public class LanguagePackManifest : XmlDocument
     public int ModuleId { get; set; }
     public int ManifestVersion { get; set; } = 0;
     public List<ComponentPack> Components { get; set; } = new List<ComponentPack>();
-    private string BasePath { get; set; } = "";
-
-    public LanguagePackManifest(GithubTree tree, GithubFile manifestFile, int moduleId)
-    {
-      var manifest = GithubService.DownloadFile(manifestFile.Url);
-
-      this.ModuleId = moduleId;
-      this.LoadXml(manifest);
-
-      var mainNodes = this.SelectNodes("dotnetnuke/packages/package");
-      if (mainNodes.Count > 0)
-      {
-        this.BasePath = Path.GetDirectoryName(manifestFile.Path);
-        this.ManifestVersion = 5;
-        this.LoadPackV5FromGithub(tree);
-      }
-      else
-      {
-        mainNodes = this.SelectNodes("dotnetnuke/folders/folder");
-        if (mainNodes.Count > 0)
-        {
-          this.ManifestVersion = 3;
-          throw new System.Exception("Version 3 manifest not implemented");
-        }
-      }
-    }
 
     public LanguagePackManifest(UnzipResult unzipResult, int moduleId)
     {
@@ -149,60 +122,5 @@ private void LoadPackV5FromUploadedZipFile(UnzipResult unzipResult)
         }
       }
     }
-
-    private void LoadPackV5FromGithub(GithubTree tree)
-    {
-      foreach (XmlNode p in this.SelectNodes("dotnetnuke/packages/package"))
-      {
-        try
-        {
-          string packType = p.SelectSingleNode("@type").InnerText.ToLowerInvariant();
-          var isCorePack = packType == "corelanguagepack";
-          var component = isCorePack ? Common.Globals.glbCoreName : p.SelectSingleNode("components/component/languageFiles/package").InnerText;
-
-          var package = PackageRepository.Instance.FindPackage(component, this.ModuleId);
-          if (package != null)
-          {
-            var comp = new ComponentPack()
-            {
-              Package = package,
-              Version = p.SelectSingleNode("@version").InnerText.ParseVersion().ToNormalizedFormat(),
-              Locale = p.SelectSingleNode("components/component/languageFiles/code").InnerText.ToLowerInvariant()
-            };
-            if (comp.Version == "00.00.00")
-            {
-              comp.Version = package.LastVersion;
-            }
-
-            string basePath = "";
-            if (p.SelectSingleNode("components/component/languageFiles/basePath") is object)
-            {
-              basePath = p.SelectSingleNode("components/component/languageFiles/basePath").InnerText;
-            }
-
-            foreach (XmlNode xNode in p.SelectNodes("components/component/languageFiles/languageFile"))
-            {
-              string filePath = xNode.SelectSingleNode("path").InnerText;
-              string fileName = xNode.SelectSingleNode("name").InnerText;
-              string fileKey = Globals.DnnPathCombine(basePath, filePath, Regex.Replace(fileName, @"(?i)\.\w{2}(-\w+)?\.resx$(?-i)", ".resx"));
-
-              var fileInZip = Globals.DnnPathCombine(this.BasePath, filePath, fileName).ToLowerInvariant();
-
-              var fileOnGithub = tree.Files.FirstOrDefault(f => f.Path.ToLowerInvariant().CompareTo(fileInZip) == 0);
-              if (fileOnGithub != null)
-              {
-                var rfile = new ResxFile(fileKey, GithubService.DownloadFile(fileOnGithub.Url));
-                comp.ResourceFiles.Add(rfile);
-              }
-            }
-
-            this.Components.Add(comp);
-          }
-        }
-        catch (Exception ex)
-        {
-        }
-      }
-    }
   }
 }

Server/Core/Services/Github/GithubService.cs

@@ -1,12 +1,9 @@
-using System.IO;
-using System.Linq;
-using System.Web.Mvc;
 using Connect.LanguagePackManager.Core.Common;
-using Connect.LanguagePackManager.Core.Data;
 using Connect.LanguagePackManager.Core.Helpers;
-using Connect.LanguagePackManager.Core.Repositories;
 using Connect.LanguagePackManager.Core.Services.Packages;
 using Connect.LanguagePackManager.Presentation.Common;
+using System.IO;
+using System.Web.Mvc;
 
 namespace Connect.LanguagePackManager.Presentation.Controllers
 {