Bunch of fixes after a debugging session of scheduled task

Author: donker

Server/Core/CheckGithubTask.cs

@@ -27,18 +27,26 @@ public override void DoWork()
         foreach (var link in links)
         {
           AddLogLine($"Checking {link.Name}");
-          if (link.IsResourcesRepo)
+          try
           {
-            GithubController.CheckResourcesRepo(link);
+            if (link.IsResourcesRepo)
+            {
+              GithubController.CheckResourcesRepo(link);
+            }
+            else
+            {
+              GithubController.CheckPackage(link);
+            }
+            AddLogLine($"Finished checking {link.Name}");
           }
-          else
+          catch (Exception ex)
           {
-            GithubController.CheckPackage(link);
+            Logger.Error(ex);
+            AddLogLine($"Error checking {link.Name}, check log for details - continuing with other packages");
           }
-          AddLogLine($"Finished checking {link.Name}");
         }
 
-        Data.Sprocs.RefreshNrTexts();
+        TextRepository.Instance.RefreshNrTexts();
         AddLogLine($"Refreshed Nr Texts");
 
         ScheduleHistoryItem.Succeeded = true;

Server/Core/Repositories/TextRepository.cs

@@ -1,25 +1,41 @@
 using DotNetNuke.Framework;
 using Connect.LanguagePackManager.Core.Models.Texts;
+using System.Data.SqlClient;
+using System;
+using DotNetNuke.Data;
+using DotNetNuke.Data.PetaPoco;
 
 namespace Connect.LanguagePackManager.Core.Repositories
 {
-    public partial class TextRepository : ServiceLocator<ITextRepository, TextRepository>, ITextRepository
+  public partial class TextRepository : ServiceLocator<ITextRepository, TextRepository>, ITextRepository
+  {
+    public TextBase AddText(int packageVersionId, int resourceFileId, string key, string value)
     {
-        public TextBase AddText(int packageVersionId, int resourceFileId, string key, string value)
-        {
-            var text = new TextBase()
-            {
-                PackageVersionId = packageVersionId,
-                ResourceFileId = resourceFileId,
-                TextKey = key,
-                OriginalValue = value
-            };
-            return AddText(text);
-        }
+      var text = new TextBase()
+      {
+        PackageVersionId = packageVersionId,
+        ResourceFileId = resourceFileId,
+        TextKey = key,
+        OriginalValue = value
+      };
+      return AddText(text);
     }
-    public partial interface ITextRepository
+
+    public void RefreshNrTexts()
     {
-        TextBase AddText(int packageVersionId, int resourceFileId, string key, string value);
+      // We have to bypass the regular DB Context as we need to be able to set the timeout. This SPROC can take minutes to complete.
+      var dbInst = DataProvider.Instance();
+      PetaPocoHelper.ExecuteNonQuery(
+          dbInst.ConnectionString,
+          System.Data.CommandType.StoredProcedure,
+          (int)TimeSpan.FromMinutes(30).TotalSeconds,
+          dbInst.DatabaseOwner + dbInst.ObjectQualifier + "Connect_LPM_RefreshNrTexts");
     }
+  }
+  public partial interface ITextRepository
+  {
+    TextBase AddText(int packageVersionId, int resourceFileId, string key, string value);
+    void RefreshNrTexts();
+  }
 }
 

Server/Core/Services/Github/GithubController.cs

@@ -19,11 +19,16 @@ public static void CheckPackage(PackageLink package)
     {
       Logger.Info($"Checking package repo {package.Name}");
       var baseVersion = string.IsNullOrEmpty(package.LastDownloadedVersion) ? "00.00.00" : package.LastDownloadedVersion;
-      var githubVersions = GithubService.GetReleases(package.OrgName, package.RepoName)
-          .Where(gp => gp.Draft == false
-                      && gp.Prerelease == false
-                      && (string.IsNullOrEmpty(package.LastDownloadedVersion) || baseVersion.IsSmallerThan(gp.TagName.ParseVersion().ToNormalizedFormat())))
-          .OrderBy(p => p.Published);
+      var gh1 = GithubService.GetReleases(package.OrgName, package.RepoName);
+      var gh2 = gh1.Where(gp => gp.Draft == false);
+      var gh3 = gh2.Where(gp => gp.Prerelease == false);
+      var gh4 = gh3.Where(gp => (string.IsNullOrEmpty(package.LastDownloadedVersion) || baseVersion.IsSmallerThan(gp.TagName.ParseVersion().ToNormalizedFormat())));
+      var githubVersions = gh4.OrderBy(p => p.Published);
+      //var githubVersions = GithubService.GetReleases(package.OrgName, package.RepoName)
+      //    .Where(gp => gp.Draft == false
+      //                && gp.Prerelease == false
+      //                && (string.IsNullOrEmpty(package.LastDownloadedVersion) || baseVersion.IsSmallerThan(gp.TagName.ParseVersion().ToNormalizedFormat())))
+      //    .OrderBy(p => p.Published);
       foreach (var githubVersion in githubVersions)
       {
         foreach (var download in githubVersion.Assets)

Server/Core/Services/Github/GithubService.cs

@@ -79,6 +79,7 @@ public static bool DownloadFile(string fileUrl, string destinationFile)
 
           Logger.Info($"Retrieving {fileUrl} and saving to {destinationFile}");
           client.DownloadFile(fileUrl, destinationFile);
+          System.Threading.Thread.Sleep(1000);
         }
       }
       catch (Exception ex)

Server/Core/Services/Packages/PackageReader.cs

@@ -48,7 +48,17 @@ public PackageReader(int packageLinkId, int parentPackageVersionId, string zipFi
       else
       {
         Logger.Info("Regular DNN package");
-        this.Manifest = new Manifest(this.UnzipResult);
+        try
+        {
+          this.Manifest = new Manifest(this.UnzipResult);
+        }
+        catch (Exception ex)
+        {
+          Logger.Error("Cannot parse manifest of package");
+          Logger.Error(ex);
+          this.IsInError= true;
+          this.ErrorMessage = "Cannot parse manifest of package";
+        }
       }
     }