Regular checking of manifest.

surgicalcoder · surgicalcoder · commit df463e794a5f · 2018-01-29T16:45:01.000Z
diff --git a/Tether/ManifestRegularCheck.cs b/Tether/ManifestRegularCheck.cs
@@ -33,7 +33,7 @@ public void Execute(IJobExecutionContext context)
                 }
 
                 var pluginPath = Path.Combine(basePath, "plugins");
-                var tempPluginPath = Path.Combine(pluginPath, "_temp");
+                //var tempPluginPath = Path.Combine(pluginPath, "_temp");
 
                 var contents = string.Empty;
 
@@ -49,7 +49,7 @@ public void Execute(IJobExecutionContext context)
                     }
                     else if (newUri.Scheme == "dns")
                     {
-
+                        throw new NotImplementedException("DNS scheme is not implemented yet");
                     }
                     else
                     {
@@ -85,8 +85,6 @@ public void Execute(IJobExecutionContext context)
 
                 foreach (var manifestItem in manifest.Items.Where(f => new Regex(f.MachineFilter, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant).IsMatch(Environment.MachineName)))
                 {
-
-
                     var assembly = ConfigurationSingleton.Instance.PluginAssemblies.FirstOrDefault(f => f.Name == manifestItem.PluginName);
 
                     if (assembly != null)
@@ -98,33 +96,27 @@ public void Execute(IJobExecutionContext context)
 
                         logger.Debug($"Assembly: {assembly.FullName}, Current assembly version = {assembly.Version}, expecting {manifestItem.PluginVersion}");
 
-                        var zipPath = Path.Combine(tempPluginPath, assembly.Name + ".zip");
+                        var zipPath = Path.Combine(pluginPath, assembly.Name + ".zip");
 
-                        if (!Directory.Exists(tempPluginPath))
-                        {
-                            Directory.CreateDirectory(tempPluginPath);
-                        }
+                        Directory.CreateDirectory(pluginPath);       
 
                         client.DownloadFile(manifestItem.PluginDownloadLocation, zipPath);
 
-                        Unzip(zipPath, tempPluginPath);
+                        Unzip(zipPath, pluginPath);
 
                         File.Delete(zipPath);
                     }
                     else
                     {
                         logger.Debug($"Assembly not found: {manifestItem.PluginName}, downloading from {manifestItem.PluginDownloadLocation}");
 
-                        var zipPath = Path.Combine(tempPluginPath, manifestItem.PluginName + ".zip");
-
-                        if (!Directory.Exists(tempPluginPath))
-                        {
-                            Directory.CreateDirectory(tempPluginPath);
-                        }
-
+                        var zipPath = Path.Combine(pluginPath, manifestItem.PluginName + ".zip");
+                        
+                        Directory.CreateDirectory(pluginPath);
+                        
                         client.DownloadFile(manifestItem.PluginDownloadLocation, zipPath);
 
-                        Unzip(zipPath, tempPluginPath);
+                        Unzip(zipPath, pluginPath);
 
                         File.Delete(zipPath);
                     }
