Use | as separator in regex syntax to be consistent with random syntax

This commit is contained in:
Jaex 2018-09-29 12:43:30 +03:00
parent f293b6238b
commit eea65f67db
2 changed files with 5 additions and 4 deletions

View file

@ -594,7 +594,7 @@ public void LoadSettings()
cbOwnCloudDirectLink.Checked = Config.OwnCloudDirectLink;
cbOwnCloud81Compatibility.Checked = Config.OwnCloud81Compatibility;
cbOwnCloudUsePreviewLinks.Checked = Config.OwnCloudUsePreviewLinks;
cbOwnCloudAutoExpire.Checked = Config.OwnCloudAutoExpire;
cbOwnCloudAutoExpire.Checked = Config.OwnCloudAutoExpire;
#endregion ownCloud / Nextcloud
@ -2332,6 +2332,7 @@ private void cbOwnCloudUsePreviewLinks_CheckedChanged(object sender, EventArgs e
{
Config.OwnCloudUsePreviewLinks = cbOwnCloudUsePreviewLinks.Checked;
}
private void cbOwnCloudAutoExpire_CheckedChanged(object sender, EventArgs e)
{
Config.OwnCloudAutoExpire = cbOwnCloudAutoExpire.Checked;
@ -3694,11 +3695,11 @@ private void btnCustomUploaderRegexAddSyntax_Click(object sender, EventArgs e)
{
if (match.Groups.Count > 1 && !string.IsNullOrEmpty(match.Groups[1].Value))
{
syntax = string.Format("$regex:{0},{1}$", selectedIndex + 1, match.Groups[1].Value);
syntax = string.Format("$regex:{0}|{1}$", selectedIndex + 1, match.Groups[1].Value);
}
else
{
syntax = string.Format("$regex:{0},1$", selectedIndex + 1);
syntax = string.Format("$regex:{0}|1$", selectedIndex + 1);
}
}
else

View file

@ -356,7 +356,7 @@ private string ParseRegexSyntax(string syntax)
}
else
{
if (syntax[i] == ',')
if (syntax[i] == '|' || syntax[i] == ',')
{
isGroupRegex = true;
}