Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@vletroye
vletroye committed Aug 27, 2023
1 parent fce566a commit 79ce7ac
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 14 deletions.
11 changes: 9 additions & 2 deletions Mods/Data/PackageINFO.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ internal string GetMyValue(MethodBase method)
return value;
}

[PackageInfoProperty("noarch")]
[PackageInfoProperty("arch")]
public string Arch
{
get { return GetMyValue(MethodBase.GetCurrentMethod()); }
Expand Down Expand Up @@ -338,7 +338,7 @@ private bool ReadInfoFile()
var loaded = false;

if (FilePath.Exists)
{
{
this.Clear();
var lines = File.ReadAllLines(FilePath.FullName);//, Encoding.Default);
foreach (var line in lines)
Expand All @@ -362,11 +362,18 @@ private bool ReadInfoFile()
}
}
}
loaded = true;

if (Maintainer == "...")
Maintainer = Environment.UserName;
if (Distributor == "...")
Distributor = Environment.UserName;
if (DsmUiDir == null)
{
DsmUiDir = "";
HelperNew.PublishWarning("This Package has no UI. Adding/Editing Items will be disabled.");
}

}

return loaded;
Expand Down
31 changes: 22 additions & 9 deletions Mods/Forms/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,7 @@ private async void PublishWarning(string message)
{
if (!mainHelper.Warnings.Contains(message)) mainHelper.Warnings.Add(message);

pictureBoxWarning.Enabled = true;
if (!pictureBoxWarning.Visible)
{
var watch = new Stopwatch();
Expand All @@ -687,7 +688,6 @@ private async void PublishWarning(string message)
while (mainHelper != null && mainHelper.Warnings.Count > 0 && watch.ElapsedMilliseconds < 6000)
{
await Task.Delay(500);
pictureBoxWarning.Enabled = true;
if (pictureBoxWarning.BackgroundImage == null)
pictureBoxWarning.BackgroundImage = image;
else
Expand All @@ -696,8 +696,16 @@ private async void PublishWarning(string message)
watch.Stop();
pictureBoxWarning.BackgroundImage = image;
}

}

private void ShowWarnings()
{
var message = mainHelper.Warnings.Aggregate((i, j) => i + "\r\n_____________________________________________________________\r\n\r\n" + j);
mainHelper.Warnings.Clear();
pictureBoxWarning.Visible = false;
MessageBoxEx.Show(this, message, "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
}

#endregion --------------------------------------------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -1846,6 +1854,7 @@ private void EnableItemDetails()
{
bool enabling;
bool packaging;
bool itemArea;

if (CurrentPackage == null)
{
Expand All @@ -1868,23 +1877,25 @@ private void EnableItemDetails()
//packaging = listViewItems.Items.Count > 0 && !enabling;
packaging = true; //A package can be published even without any item

itemArea = !string.IsNullOrWhiteSpace(CurrentPackage.DsmUiDir);

EnableItemFieldDetails(!enabling && CurrentPackage.Config != null, enabling);
switch (state)
{
case State.View:
add = CurrentPackage.Config != null && (CurrentPackage.INFO.SingleApp == "no" || CurrentPackage.Config.items.Count == 0);
EnableItemButtonDetails(add, true, false, false, true, packaging);
EnableItemMenuDetails(!enabling, true, !enabling, !enabling, true, true, true, true, true);
EnableItemMenuDetails(!enabling, itemArea, !enabling, !enabling, true, true, true, true, true);
break;
case State.None:
add = CurrentPackage.Config != null && (CurrentPackage.INFO.SingleApp == "no" || CurrentPackage.Config.items.Count == 0);
EnableItemButtonDetails(add, false, false, false, false, packaging);
EnableItemMenuDetails(!enabling, true, !enabling, !enabling, true, true, true, true, true);
EnableItemMenuDetails(!enabling, itemArea, !enabling, !enabling, true, true, true, true, true);
break;
case State.Add:
case State.Edit:
EnableItemButtonDetails(false, false, true, true, false, packaging);
EnableItemMenuDetails(!enabling, true, !enabling, !enabling, false, false, false, false, false);
EnableItemMenuDetails(!enabling, itemArea, !enabling, !enabling, false, false, false, false, false);
break;
}
textBoxUrl.ReadOnly = !(comboBoxItemType.SelectedIndex == (int)AppDataType.Url);
Expand Down Expand Up @@ -3255,7 +3266,12 @@ private void menuOpen_Click(object sender, EventArgs e)

// Open another Package if the user saved/discarded explicitly pending changes.
if (saved == DialogResult.Yes || saved == DialogResult.No)
mainHelper.OpenExistingPackage();
if (!mainHelper.OpenExistingPackage())
{
//Main Screen Disabled
if (pictureBoxWarning.Visible && !pictureBoxWarning.Enabled)
ShowWarnings();
}
}
private void menuReset_Click(object sender, EventArgs e)
{
Expand Down Expand Up @@ -4373,10 +4389,7 @@ private void menuParameters_Click(object sender, EventArgs e)

private void pictureBoxWarning_Click(object sender, EventArgs e)
{
var message = mainHelper.Warnings.Aggregate((i, j) => i + "\r\n_____________________________________________________________\r\n\r\n" + j);
mainHelper.Warnings.Clear();
pictureBoxWarning.Visible = false;
MessageBoxEx.Show(this, message, "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
ShowWarnings();
}

private void MainForm_DragEnter(object sender, DragEventArgs e)
Expand Down
3 changes: 3 additions & 0 deletions Mods/Helpers/MainHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,9 @@ internal bool OpenExistingPackage(string targetPackage = null, bool import = fal
PackageHelper.CopyPackagingBinaries(targetPackage);
}
}
} else if (ready == DialogResult.Cancel)
{
succeed = false;
}
}

Expand Down
8 changes: 5 additions & 3 deletions Mods/Helpers/PackageHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace BeatificaBytes.Synology.Mods.Helpers
internal abstract class BasePackage
{
#region Standard SPK files et folders
protected const string file_INFO = "INFO";
protected const string file_INFO = "INFO";
protected const string folder_Conf = "conf";
protected const string folder_Package = "package";
protected const string folder_WizardUI = "WIZARD_UIFILES";
Expand Down Expand Up @@ -70,7 +70,8 @@ internal string Path_Config
if (String.IsNullOrWhiteSpace(Folder_Root))
throw new ArgumentNullException("Application error: Package folder is not set.");

if (string.IsNullOrWhiteSpace(DsmUiDir))
//It exists packages without dsmUiDir, used to deploy binaries only. In such case DsmUiDir = ""
if (DsmUiDir == null)
throw new ArgumentNullException("Application error: INFO file has not been loaded.");

return Path.Combine(Folder_Root, String.Format(file_Config, DsmUiDir));
Expand Down Expand Up @@ -133,7 +134,8 @@ internal string Folder_UI
if (String.IsNullOrWhiteSpace(Folder_Root))
throw new ArgumentNullException("Application error: Package folder is not set.");

if (String.IsNullOrWhiteSpace(DsmUiDir))
//It exists packages without dsmUiDir, used to deploy binaries only. In such case DsmUiDir = ""
if (DsmUiDir == null)
throw new ArgumentNullException("Application error: UI folder is not defined in INFO file.");

return Path.Combine(Folder_Root, folder_Package, DsmUiDir);
Expand Down

0 comments on commit 79ce7ac

Please sign in to comment.