mirrors/Novetus_src
1
0
Fork 0
mirror of https://github.com/Novetus/Novetus_src.git synced 2025-01-31 09:41:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

asset fixer updates (mainly progress bar stuff)

Browse Source
This commit is contained in:
Bitl 2022-07-18 14:45:10 -07:00
parent 667bba2b9a
commit 9cc33b425d
2 changed files with 61 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Novetus/NovetusLauncher/Forms/SDK/AssetSDK.Designer.cs generated
View File

@ -45,6 +45,8 @@
this.URLListLabel = new System.Windows.Forms.Label();
this.URLSelection = new System.Windows.Forms.ComboBox();
this.AssetLocalization = new System.Windows.Forms.GroupBox();
this.AssetFixer_ProgressLabel = new System.Windows.Forms.Label();
this.AssetFixer_ProgressBar = new System.Windows.Forms.ProgressBar();
this.AssetLocalization_AssetLinks = new System.Windows.Forms.CheckBox();
this.AssetLocalization_LocalizePermanentlyBox = new System.Windows.Forms.CheckBox();
this.AssetLocalization_SaveBackups = new System.Windows.Forms.CheckBox();
@ -84,7 +86,7 @@
this.AssetDownloader.Controls.Add(this.AssetDownloader_AssetDownloaderButton);
this.AssetDownloader.Location = new System.Drawing.Point(12, 62);
this.AssetDownloader.Name = "AssetDownloader";
this.AssetDownloader.Size = new System.Drawing.Size(260, 311);
this.AssetDownloader.Size = new System.Drawing.Size(260, 360);
this.AssetDownloader.TabIndex = 0;
this.AssetDownloader.TabStop = false;
this.AssetDownloader.Text = "Asset Downloader";
@ -108,7 +110,7 @@
this.AssetDownloaderBatch_Status.Cursor = System.Windows.Forms.Cursors.Default;
this.AssetDownloaderBatch_Status.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.AssetDownloaderBatch_Status.ForeColor = System.Drawing.Color.Red;
this.AssetDownloaderBatch_Status.Location = new System.Drawing.Point(89, 281);
this.AssetDownloaderBatch_Status.Location = new System.Drawing.Point(94, 343);
this.AssetDownloaderBatch_Status.Name = "AssetDownloaderBatch_Status";
this.AssetDownloaderBatch_Status.Size = new System.Drawing.Size(84, 13);
this.AssetDownloaderBatch_Status.TabIndex = 1;
@ -132,7 +134,7 @@
this.AssetDownloaderBatch_BatchIDBox.Multiline = true;
this.AssetDownloaderBatch_BatchIDBox.Name = "AssetDownloaderBatch_BatchIDBox";
this.AssetDownloaderBatch_BatchIDBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.AssetDownloaderBatch_BatchIDBox.Size = new System.Drawing.Size(242, 146);
this.AssetDownloaderBatch_BatchIDBox.Size = new System.Drawing.Size(242, 208);
this.AssetDownloaderBatch_BatchIDBox.TabIndex = 0;
//
// AssetDownloader_AssetNameBox
@ -246,6 +248,8 @@
//
// AssetLocalization
//
this.AssetLocalization.Controls.Add(this.AssetFixer_ProgressLabel);
this.AssetLocalization.Controls.Add(this.AssetFixer_ProgressBar);
this.AssetLocalization.Controls.Add(this.AssetLocalization_AssetLinks);
this.AssetLocalization.Controls.Add(this.AssetLocalization_LocalizePermanentlyBox);
this.AssetLocalization.Controls.Add(this.AssetLocalization_SaveBackups);
@ -259,11 +263,26 @@
this.AssetLocalization.Controls.Add(this.AssetLocalization_LocalizeButton);
this.AssetLocalization.Location = new System.Drawing.Point(278, 176);
this.AssetLocalization.Name = "AssetLocalization";
this.AssetLocalization.Size = new System.Drawing.Size(267, 197);
this.AssetLocalization.Size = new System.Drawing.Size(267, 246);
this.AssetLocalization.TabIndex = 1;
this.AssetLocalization.TabStop = false;
this.AssetLocalization.Text = "Asset Fixer";
//
// AssetFixer_ProgressLabel
//
this.AssetFixer_ProgressLabel.Location = new System.Drawing.Point(6, 224);
this.AssetFixer_ProgressLabel.Name = "AssetFixer_ProgressLabel";
this.AssetFixer_ProgressLabel.Size = new System.Drawing.Size(254, 18);
this.AssetFixer_ProgressLabel.TabIndex = 24;
this.AssetFixer_ProgressLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// AssetFixer_ProgressBar
//
this.AssetFixer_ProgressBar.Location = new System.Drawing.Point(6, 198);
this.AssetFixer_ProgressBar.Name = "AssetFixer_ProgressBar";
this.AssetFixer_ProgressBar.Size = new System.Drawing.Size(254, 23);
this.AssetFixer_ProgressBar.TabIndex = 23;
//
// AssetLocalization_AssetLinks
//
this.AssetLocalization_AssetLinks.AutoSize = true;
@ -349,7 +368,7 @@
//
this.AssetLocalization_StatusText.Location = new System.Drawing.Point(6, 167);
this.AssetLocalization_StatusText.Name = "AssetLocalization_StatusText";
this.AssetLocalization_StatusText.Size = new System.Drawing.Size(254, 13);
this.AssetLocalization_StatusText.Size = new System.Drawing.Size(254, 27);
this.AssetLocalization_StatusText.TabIndex = 13;
this.AssetLocalization_StatusText.Text = "Idle";
this.AssetLocalization_StatusText.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -456,7 +475,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.ClientSize = new System.Drawing.Size(557, 377);
this.ClientSize = new System.Drawing.Size(557, 430);
this.Controls.Add(this.URLOverrideBox);
this.Controls.Add(this.CustomDLURLLabel);
this.Controls.Add(this.MeshConverter);
@ -523,4 +542,6 @@
private System.Windows.Forms.CheckBox AssetLocalization_LocalizePermanentlyBox;
private System.Windows.Forms.ComboBox MeshConverter_MeshVersionSelector;
private System.Windows.Forms.CheckBox AssetLocalization_AssetLinks;
private System.Windows.Forms.ProgressBar AssetFixer_ProgressBar;
private System.Windows.Forms.Label AssetFixer_ProgressLabel;
}

36
Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs
View File

@ -381,6 +381,9 @@ public partial class AssetSDK : Form
string[] file = File.ReadAllLines(filepath);
int index = 0;
AssetFixer_ProgressBar.Maximum = file.Length;
foreach (var line in file)
{
++index;
@ -388,11 +391,16 @@ public partial class AssetSDK : Form
try
{
if (line.Contains("www.w3.org") || line.Contains("roblox.xsd"))
{
ProgressChangedEvent();
continue;
}
if (line.Contains("http://") || line.Contains("https://"))
{
AssetLocalization_StatusText.Text = "Localizing " + line;
string oneline = Regex.Replace(line, @"\t|\n|\r", "");
AssetLocalization_StatusText.Text = "Localizing " + oneline;
AssetLocalization_StatusText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//https://stackoverflow.com/questions/10576686/c-sharp-regex-pattern-to-extract-urls-from-given-string-not-full-html-urls-but
List<string> links = new List<string>();
@ -421,6 +429,8 @@ public partial class AssetSDK : Form
}
}
}
ProgressChangedEvent();
}
catch (Exception ex)
{
@ -429,6 +439,7 @@ public partial class AssetSDK : Form
GlobalFuncs.LogPrint("ASSETFIX|FILE " + path + " LINE #" + (index) + " " + ex.Message, 2);
GlobalFuncs.LogPrint("ASSETFIX|Asset might be private or unavailable.");
//MessageBox.Show("Error: Unable to localize the asset. " + ex.Message + "\n\nLine: " + line, "Novetus Asset SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
ProgressChangedEvent();
continue;
}
}
@ -442,6 +453,8 @@ public partial class AssetSDK : Form
int index = 0;
AssetFixer_ProgressBar.Maximum = file.Length;
foreach (var line in file)
{
++index;
@ -449,11 +462,16 @@ public partial class AssetSDK : Form
try
{
if (line.Contains("www.w3.org") || line.Contains("roblox.xsd"))
{
ProgressChangedEvent();
continue;
}
if ((line.Contains("http://") || line.Contains("https://")) && !line.Contains(url))
{
AssetLocalization_StatusText.Text = "Fixing " + line;
string oneline = Regex.Replace(line, @"\t|\n|\r", "");
AssetLocalization_StatusText.Text = "Fixing " + oneline;
AssetLocalization_StatusText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
string oldurl = line;
string urlFixed = GlobalFuncs.FixURLString(oldurl, url);
@ -465,6 +483,8 @@ public partial class AssetSDK : Form
file[index - 1] = urlFixed;
}
}
ProgressChangedEvent();
}
catch (Exception ex)
{
@ -473,6 +493,7 @@ public partial class AssetSDK : Form
GlobalFuncs.LogPrint("ASSETFIX|FILE " + path + " LINE #" + (index) + " " + ex.Message, 2);
GlobalFuncs.LogPrint("ASSETFIX|Asset might be private or unavailable.");
//MessageBox.Show("Error: Unable to fix the URL. " + ex.Message + "\n\nLine: " + line, "Novetus Asset SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
ProgressChangedEvent();
continue;
}
}
@ -480,6 +501,12 @@ public partial class AssetSDK : Form
File.WriteAllLines(filepath, file);
}
void ProgressChangedEvent()
{
AssetFixer_ProgressBar.Value += 1;
AssetFixer_ProgressLabel.Text = "Progress: " + AssetFixer_ProgressBar.Value.ToString() + "/" + AssetFixer_ProgressBar.Maximum.ToString();
}
public void FixURLSOrDownloadFromScript(string filepath, string savefilepath, string inGameDir, bool useURLs, string url)
{
if (useURLs)
@ -639,6 +666,7 @@ public partial class AssetSDK : Form
// This event handler updates the progress.
private void AssetLocalization_BackgroundWorker_ProgressChanged(object sender, ProgressChangedEventArgs e)
{
//Progress Bar doesn't work here, wtf?
}
// This event handler deals with the results of the background operation.
@ -673,6 +701,10 @@ public partial class AssetSDK : Form
}
break;
}
AssetLocalization_StatusText.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
AssetFixer_ProgressBar.Value = 0;
AssetFixer_ProgressLabel.Text = "";
}
private void AssetLocalization_LocalizePermanentlyBox_Click(object sender, EventArgs e)