Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-26 13:12:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4386 from OmrSi/work-on-multiple-replace

Browse Source 
Add Multiple Replace group state to Export + Fix bug in CLI
This commit is contained in:
Nikolaj Olsson 2020-09-24 19:34:40 +02:00 committed by GitHub
commit 013c8de1d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Forms/MultipleReplace.cs
View File

@ -14,6 +14,7 @@ namespace Nikse.SubtitleEdit.Forms
{
internal const string Group = "Group";
internal const string GroupName = "Name";
internal const string GroupEnabled = "Enabled";
internal const string MultipleSearchAndReplaceItem = "MultipleSearchAndReplaceItem";
internal const string RuleEnabled = "Enabled";
internal const string FindWhat = "FindWhat";
@ -167,7 +168,7 @@ namespace Nikse.SubtitleEdit.Forms
}
else
{
ImportRulesFile(fileName);
Configuration.Settings.MultipleSearchAndReplaceGroups.AddRange(ImportGroupsFile(fileName));
}
}
RunFromBatch(subtitle);
@ -763,10 +764,10 @@ namespace Nikse.SubtitleEdit.Forms
{
var group = new MultipleSearchAndReplaceGroup();
var nameNode = groupNode.SelectSingleNode(GroupName);
if (nameNode != null)
{
group.Name = nameNode.InnerText;
}
var enabledNode = groupNode.SelectSingleNode(GroupEnabled);
group.Name = nameNode != null ? nameNode.InnerText : "Untitled";
group.Enabled = enabledNode != null ? Convert.ToBoolean(enabledNode.InnerText) : false;
group.Rules = new List<MultipleSearchAndReplaceSetting>();
list.Add(group);
@ -786,9 +787,11 @@ namespace Nikse.SubtitleEdit.Forms
if (list.Count == 0)
{
// import into "untitled" group if only rules
var group = new MultipleSearchAndReplaceGroup();
group.Name = "untitled";
group.Rules = new List<MultipleSearchAndReplaceSetting>();
var group = new MultipleSearchAndReplaceGroup
{
Name = "untitled",
Rules = new List<MultipleSearchAndReplaceSetting>()
};
var replaceItems = doc.DocumentElement?.SelectNodes("//MultipleSearchAndReplaceItem");
if (replaceItems != null)
{

1
src/Forms/MultipleReplaceExportImport.cs
View File

@ -108,6 +108,7 @@ namespace Nikse.SubtitleEdit.Forms
{
textWriter.WriteStartElement(MultipleReplace.Group, string.Empty);
textWriter.WriteElementString(MultipleReplace.GroupName, group.Name);
textWriter.WriteElementString(MultipleReplace.GroupEnabled, group.Enabled.ToString());
foreach (var item in group.Rules)
{
textWriter.WriteStartElement(MultipleReplace.MultipleSearchAndReplaceItem, string.Empty);