Merge pull request #27 from richardletshacks/github-model-mirror

auto update model list and make github the default mirror
This commit is contained in:
N00MKRAD
2021-02-27 12:47:42 +01:00
committed by GitHub
4 changed files with 24 additions and 4 deletions

View File

@@ -70,6 +70,7 @@ namespace Flowframes
GetWebInfo.LoadNews(newsLabel);
GetWebInfo.LoadPatronListCsv(patronsLabel);
Updater.AsyncUpdateCheck();
Updater.UpdateModelList();
Python.CheckCompression();
}
catch (Exception e)

View File

@@ -1670,6 +1670,7 @@
this.modelsBaseUrl.ForeColor = System.Drawing.Color.White;
this.modelsBaseUrl.FormattingEnabled = true;
this.modelsBaseUrl.Items.AddRange(new object[] {
"https://raw.githubusercontent.com/n00mkrad/flowframes/main/Models/",
"https://dl.nmkd.de/flowframes/mdl/",
"http://45.132.246.240/dl/flowframes/mdl/",
"http://104.225.145.33/models/"});

View File

@@ -156,7 +156,7 @@ namespace Flowframes.IO
if (key == "ncnnThreads") return WriteDefault(key, "1");
if (key == "dainNcnnTilesize") return WriteDefault(key, "768");
// Debug / Other / Experimental
if (key == "modelsBaseUrl") return WriteDefault(key, "https://dl.nmkd.de/flowframes/mdl/");
if (key == "modelsBaseUrl") return WriteDefault(key, "https://raw.githubusercontent.com/n00mkrad/flowframes/main/Models/");
if (key == "ffEncPreset") return WriteDefault(key, "medium");
if (key == "ffEncArgs") return WriteDefault(key, "");

View File

@@ -2,11 +2,8 @@
using Flowframes.Forms;
using Flowframes.IO;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -132,5 +129,26 @@ namespace Flowframes.OS
Logger.Log($"You are running Flowframes {installed}. The latest Patreon version is {latestPat}, the latest free version is {latestFree}.");
}
public static async Task UpdateModelList()
{
try
{
Networks.networks.ForEach(ai =>
{
var client = new WebClient();
string aiName = Path.GetFileNameWithoutExtension(ai.pkg.fileName);
string url = $"https://raw.githubusercontent.com/n00mkrad/flowframes/main/Pkgs/{aiName}/models.txt";
string savePath = Path.Combine(Paths.GetPkgPath(), aiName, "models.txt");
if(File.Exists(savePath)) File.Delete(savePath);
client.DownloadFile(url, savePath);
});
}
catch (Exception e)
{
Logger.Log("Non-critical error while performing model list update. See logs for details.");
Logger.Log($"{e.Message}\n{e.StackTrace}", true);
}
}
}
}