Add capability to directly get language pack resources from GH repos

Author: donker

Server/Core/CheckGithubTask.cs

@@ -7,49 +7,56 @@
 
 namespace Connect.LanguagePackManager.Core
 {
-    public class CheckGithubTask : SchedulerClient
+  public class CheckGithubTask : SchedulerClient
+  {
+    public CheckGithubTask(ScheduleHistoryItem history)
     {
-        public CheckGithubTask(ScheduleHistoryItem history)
-        {
-            this.ScheduleHistoryItem = history;
-        }
+      this.ScheduleHistoryItem = history;
+    }
 
-        public StringBuilder Log { get; set; } = new StringBuilder();
-        public DateTime Start { get; private set; } = DateTime.Now;
+    public StringBuilder Log { get; set; } = new StringBuilder();
+    public DateTime Start { get; private set; } = DateTime.Now;
 
-        public override void DoWork()
-        {
-            try
-            {
-                AddLogLine($"Cleaning up temp folder");
-                Common.Globals.CleanupTempFolder();
+    public override void DoWork()
+    {
+      try
+      {
+        AddLogLine($"Cleaning up temp folder");
+        Common.Globals.CleanupTempFolder();
 
-                var links = PackageLinkRepository.Instance.GetPackageLinks();
-                foreach (var link in links)
-                {
-                    AddLogLine($"Checking {link.Name}");
-                    GithubController.CheckPackage(link);
-                    AddLogLine($"Finished checking {link.Name}");
-                }
+        var links = PackageLinkRepository.Instance.GetPackageLinks();
+        foreach (var link in links)
+        {
+          AddLogLine($"Checking {link.Name}");
+          if (link.IsResourcesRepo)
+          {
+            GithubController.CheckResourcesRepo(link);
+          }
+          else
+          {
+            GithubController.CheckPackage(link);
+          }
+          AddLogLine($"Finished checking {link.Name}");
+        }
 
-                Data.Sprocs.RefreshNrTexts();
-                AddLogLine($"Refreshed Nr Texts");
+        Data.Sprocs.RefreshNrTexts();
+        AddLogLine($"Refreshed Nr Texts");
 
-                ScheduleHistoryItem.Succeeded = true;
-                ScheduleHistoryItem.AddLogNote(Log.ToString().Replace(Environment.NewLine, "<br />"));
-            }
-            catch (Exception ex)
-            {
-                ScheduleHistoryItem.Succeeded = false;
-                ScheduleHistoryItem.AddLogNote($"Failed: {ex.Message} ({ex.StackTrace}) <br />{Log.ToString().Replace(Environment.NewLine, "<br />")}");
-                Errored(ref ex);
-                Exceptions.LogException(ex);
-            }
-        }
+        ScheduleHistoryItem.Succeeded = true;
+        ScheduleHistoryItem.AddLogNote(Log.ToString().Replace(Environment.NewLine, "<br />"));
+      }
+      catch (Exception ex)
+      {
+        ScheduleHistoryItem.Succeeded = false;
+        ScheduleHistoryItem.AddLogNote($"Failed: {ex.Message} ({ex.StackTrace}) <br />{Log.ToString().Replace(Environment.NewLine, "<br />")}");
+        Errored(ref ex);
+        Exceptions.LogException(ex);
+      }
+    }
 
-        private void AddLogLine(string line)
-        {
-            Log.AppendLine($"{Start.ToString("HH:mm:ss")} {line}");
-        }
+    private void AddLogLine(string line)
+    {
+      Log.AppendLine($"{Start.ToString("HH:mm:ss")} {line}");
     }
+  }
 }

Server/Core/Helpers/UnzipResult.cs

@@ -5,49 +5,50 @@
 
 namespace Connect.LanguagePackManager.Core.Helpers
 {
-    public class UnzipResult
+  public class UnzipResult
+  {
+    public class FoundFile
     {
-        public class FoundFile
-        {
-            public string FilePath { get; set; }
-            public string FilePathLowered { get; set; }
-            public string HashedName { get; set; }
-        }
-
-        public string UnzipDirectory { get; set; } = Path.Combine(Globals.GetLpmFolder(-1, "Temp"), (Guid.NewGuid()).ToString());
-        public SortedDictionary<string, FoundFile> ResourceFiles { get; set; } = new SortedDictionary<string, FoundFile>();
-        public SortedDictionary<string, FoundFile> ZipFiles { get; set; } = new SortedDictionary<string, FoundFile>();
-        public string ManifestFile { get; set; }
-        public Version DnnVersion { get; set; }
-        public string BasePath { get; set; }
+      public string FilePath { get; set; }
+      public string FilePathLowered { get; set; }
+      public string HashedName { get; set; }
+    }
 
-        public UnzipResult(string basePath)
-        {
-            this.BasePath = basePath;
-            Directory.CreateDirectory(UnzipDirectory);
-        }
+    public string UnzipDirectory { get; set; } = Path.Combine(Globals.GetLpmFolder(-1, "Temp"), (Guid.NewGuid()).ToString());
+    public SortedDictionary<string, FoundFile> ResourceFiles { get; set; } = new SortedDictionary<string, FoundFile>();
+    public SortedDictionary<string, FoundFile> ZipFiles { get; set; } = new SortedDictionary<string, FoundFile>();
+    public string ManifestFile { get; set; }
+    public string ManifestFilePath { get; set; } = "";
+    public Version DnnVersion { get; set; }
+    public string BasePath { get; set; }
 
-        public void AddResourceFile(string filePath, string hashedName)
-        {
-            var f = new FoundFile()
-            {
-                FilePath = filePath,
-                FilePathLowered = filePath.ToLower(),
-                HashedName = hashedName
-            };
-            this.ResourceFiles.Add(f.FilePathLowered, f);
-        }
+    public UnzipResult(string basePath)
+    {
+      this.BasePath = basePath;
+      Directory.CreateDirectory(UnzipDirectory);
+    }
 
-        public void AddZipFile(string filePath, string hashedName)
-        {
-            var f = new FoundFile()
-            {
-                FilePath = filePath,
-                FilePathLowered = filePath.ToLower(),
-                HashedName = hashedName
-            };
-            this.ZipFiles.Add(f.FilePathLowered, f);
-        }
+    public void AddResourceFile(string filePath, string hashedName)
+    {
+      var f = new FoundFile()
+      {
+        FilePath = filePath,
+        FilePathLowered = filePath.ToLower(),
+        HashedName = hashedName
+      };
+      this.ResourceFiles.Add(f.FilePathLowered, f);
+    }
 
+    public void AddZipFile(string filePath, string hashedName)
+    {
+      var f = new FoundFile()
+      {
+        FilePath = filePath,
+        FilePathLowered = filePath.ToLower(),
+        HashedName = hashedName
+      };
+      this.ZipFiles.Add(f.FilePathLowered, f);
     }
+
+  }
 }

Server/Core/Helpers/ZipHelper.cs

@@ -1,68 +1,79 @@
 using Connect.LanguagePackManager.Core.Common;
 using System.IO;
 using System.IO.Compression;
+using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 
 namespace Connect.LanguagePackManager.Core.Helpers
 {
-    public class ZipHelper
+  public class ZipHelper
+  {
+    public static UnzipResult Unzip(Stream fileStream, string packageBasePath, bool allowTranslations)
     {
-        public static UnzipResult Unzip(Stream fileStream, string packageBasePath, bool allowTranslations)
+      var result = new UnzipResult(packageBasePath);
+      using (var objZipInputStream = new ZipArchive(fileStream, ZipArchiveMode.Read))
+      {
+        foreach (var entry in objZipInputStream.Entries)
         {
-            var result = new UnzipResult(packageBasePath);
-            using (var objZipInputStream = new ZipArchive(fileStream, ZipArchiveMode.Read))
-            {
-                foreach (var entry in objZipInputStream.Entries)
+          var fullName = entry.FullName.Trim('/').ToLowerInvariant();
+          var ext = Path.GetExtension(fullName);
+          switch (ext)
+          {
+            case ".dnn":
+              entry.ExtractToFile(Path.Combine(result.UnzipDirectory, entry.Name), true);
+              result.ManifestFile = entry.Name;
+              result.ManifestFilePath = Path.GetDirectoryName(entry.FullName);
+              break;
+            case ".dll":
+              if (entry.Name.ToLowerInvariant() == "dotnetnuke.dll")
+              {
+                entry.ExtractToFile(Path.Combine(result.UnzipDirectory, entry.Name), true);
+                result.DnnVersion = Globals.GetAssemblyVersion(Path.Combine(result.UnzipDirectory, entry.Name));
+                try
                 {
-                    var fullName = entry.FullName.Trim('/').ToLowerInvariant();
-                    var ext = Path.GetExtension(fullName);
-                    switch (ext)
-                    {
-                        case ".dnn":
-                            entry.ExtractToFile(Path.Combine(result.UnzipDirectory, entry.Name), true);
-                            result.ManifestFile = entry.Name;
-                            break;
-                        case ".dll":
-                            if (entry.Name.ToLowerInvariant() == "dotnetnuke.dll")
-                            {
-                                entry.ExtractToFile(Path.Combine(result.UnzipDirectory, entry.Name), true);
-                                result.DnnVersion = Globals.GetAssemblyVersion(Path.Combine(result.UnzipDirectory, entry.Name));
-                                try
-                                {
-                                    File.Delete(Path.Combine(result.UnzipDirectory, entry.Name));
-                                }
-                                catch
-                                {
-                                }
-                            }
-                            break;
-                        case ".resx":
-                            var fileName = fullName.ToMD5Hash();
-                            var m = Regex.Match(entry.Name, @"\.(\w{2,3}-\w\w)\.");
-                            if (allowTranslations || !m.Success || m.Groups[1].Value.ToLower() == "en-us") // filter out all files that are not default locale
-                            {
-                                entry.ExtractToFile(Path.Combine(result.UnzipDirectory, fileName));
-                                result.AddResourceFile(fullName, fileName);
-                            }
-                            break;
-                        case ".resources":
-                        case ".zip":
-                            var zipName = fullName.ToMD5Hash();
-                            entry.ExtractToFile(Path.Combine(result.UnzipDirectory, zipName));
-                            result.AddZipFile(fullName, zipName);
-                            break;
-                    }
+                  File.Delete(Path.Combine(result.UnzipDirectory, entry.Name));
                 }
-            }
-            return result;
+                catch
+                {
+                }
+              }
+              break;
+            case ".resx":
+              var fileName = fullName.ToMD5Hash();
+              var m = Regex.Match(entry.Name, @"\.(\w{2,3}-\w\w)\.");
+              if (allowTranslations || !m.Success || m.Groups[1].Value.ToLower() == "en-us") // filter out all files that are not default locale
+              {
+                entry.ExtractToFile(Path.Combine(result.UnzipDirectory, fileName));
+                result.AddResourceFile(fullName, fileName);
+              }
+              break;
+            case ".resources":
+            case ".zip":
+              var zipName = fullName.ToMD5Hash();
+              entry.ExtractToFile(Path.Combine(result.UnzipDirectory, zipName));
+              result.AddZipFile(fullName, zipName);
+              break;
+          }
         }
-
-        public static UnzipResult Unzip(string filePath, string packageBasePath, bool allowTranslations)
+      }
+      if (!string.IsNullOrEmpty(result.ManifestFilePath))
+      {
+        var l = result.ManifestFilePath.Length + 1;
+        foreach (var resx in result.ResourceFiles.Values)
         {
-            using (var fileStrm = File.Open(filePath, FileMode.Open, FileAccess.Read))
-            {
-                return Unzip(fileStrm, packageBasePath, allowTranslations);
-            }
+          resx.FilePath = resx.FilePath.Remove(0, l);
+          resx.FilePathLowered = resx.FilePathLowered.Remove(0, l);
         }
+      }
+      return result;
+    }
+
+    public static UnzipResult Unzip(string filePath, string packageBasePath, bool allowTranslations)
+    {
+      using (var fileStrm = File.Open(filePath, FileMode.Open, FileAccess.Read))
+      {
+        return Unzip(fileStrm, packageBasePath, allowTranslations);
+      }
     }
+  }
 }

Server/Core/Models/PackageLinks/PackageLinkBase.cs

@@ -36,6 +36,8 @@ public PackageLinkBase()
         public DateTime? LastChecked { get; set; }
         [DataMember]
         public string LastDownloadedVersion { get; set; }
+        [DataMember]
+        public bool IsResourcesRepo { get; set; }
         #endregion
 
         #region Methods
@@ -65,6 +67,8 @@ public void ReadPackageLinkBase(PackageLinkBase packageLink)
             if (!String.IsNullOrEmpty(packageLink.LastDownloadedVersion))
                 LastDownloadedVersion = packageLink.LastDownloadedVersion;
 
+            IsResourcesRepo = packageLink.IsResourcesRepo;
+
         }
         #endregion
 

Server/Core/Models/PackageLinks/PackageLinkBase_Interfaces.cs

@@ -24,6 +24,7 @@ public virtual void Fill(IDataReader dr)
    AssetRegex = Convert.ToString(Null.SetNull(dr["AssetRegex"], AssetRegex));
    LastChecked = (DateTime)(Null.SetNull(dr["LastChecked"], LastChecked));
    LastDownloadedVersion = Convert.ToString(Null.SetNull(dr["LastDownloadedVersion"], LastDownloadedVersion));
+   IsResourcesRepo = Convert.ToBoolean(Null.SetNull(dr["IsResourcesRepo"], IsResourcesRepo));
         }
 
         [IgnoreColumn()]
@@ -63,6 +64,8 @@ public virtual string GetProperty(string strPropertyName, string strFormat, Syst
          return "";
      };
      return PropertyAccess.FormatString(LastDownloadedVersion, strFormat);
+    case "isresourcesrepo": // Bit
+     return IsResourcesRepo.ToString();
                 default:
                     propertyNotFound = true;
                     break;

Server/Core/Models/PackageLinks/PackageLink_Declaration.cs

@@ -39,6 +39,7 @@ public PackageLinkBase GetPackageLinkBase()
              res.AssetRegex = AssetRegex;
              res.LastChecked = LastChecked;
              res.LastDownloadedVersion = LastDownloadedVersion;
+             res.IsResourcesRepo = IsResourcesRepo;
             res.CreatedByUserID = CreatedByUserID;
             res.CreatedOnDate = CreatedOnDate;
             res.LastModifiedByUserID = LastModifiedByUserID;
@@ -56,6 +57,7 @@ public PackageLink Clone()
             res.AssetRegex = AssetRegex;
             res.LastChecked = LastChecked;
             res.LastDownloadedVersion = LastDownloadedVersion;
+            res.IsResourcesRepo = IsResourcesRepo;
             res.PortalID = PortalID;
             res.CreatedByUser = CreatedByUser;
             res.ModifiedByUser = ModifiedByUser;

Server/Core/Services/Github/GithubBlob.cs

@@ -0,0 +1,20 @@
+namespace Connect.LanguagePackManager.Core.Services.Github
+{
+  using System.Runtime.Serialization;
+
+  [DataContract]
+  public class GithubBlob
+  {
+    [DataMember(Name = "content")]
+    public string Content { get; set; }
+
+    [DataMember(Name = "encoding")]
+    public string Encoding { get; set; }
+
+    [DataMember(Name = "sha")]
+    public string Sha { get; set; }
+
+    [DataMember(Name = "size")]
+    public int Size { get; set; }
+  }
+}