Skip to content

Updated plucked.cf.sub from masterfiles (3.24.x) #6495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nickanderson wants to merge 2 commits into
base: 3.24.x
Choose a base branch
from
+34 −4
Open

Updated plucked.cf.sub from masterfiles (3.24.x) #6495

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ca2dc9
Updated plucked.cf.sub from masterfiles
nickanderson Nov 10, 2026
b7a507a
Updated set_variable_values_ini in plucked.cf.sub from masterfiles
nickanderson Nov 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 34 additions & 4 deletions tests/acceptance/plucked.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,10 +726,18 @@ bundle edit_line manage_variable_values_ini(tab, sectionName)
{
vars:
"index" slist => getindices("$(tab)[$(sectionName)]");
"_escaped_section" string => escape("$(sectionName)");

classes:
"section_$(sectionName)_exists"
expression => regline("^\[$(_escaped_section)\]", "$(edit.filename)"),
if => fileexists("$(edit.filename)"),
comment => "Check if the section header already exists in the file";

delete_lines:
".*"
select_region => INI_section(escape("$(sectionName)")),
if => canonify("section_$(sectionName)_exists"),
comment => "Remove all entries in the region so there are no extra entries";

insert_lines:
Expand All @@ -738,7 +746,12 @@ bundle edit_line manage_variable_values_ini(tab, sectionName)
comment => "Insert lines";

"$(index)=$($(tab)[$(sectionName)][$(index)])"
select_region => INI_section(escape("$(sectionName)"));
select_region => INI_section(escape("$(sectionName)")),
if => canonify("section_$(sectionName)_exists");

"$(index)=$($(tab)[$(sectionName)][$(index)])"
location => after("^\[$(_escaped_section)\]"),
if => not(canonify("section_$(sectionName)_exists"));
}

bundle edit_line set_variable_values_ini(tab, sectionName)
Expand All @@ -760,25 +773,33 @@ bundle edit_line set_variable_values_ini(tab, sectionName)

# Be careful if the index string contains funny chars
"cindex[$(index)]" string => canonify("$(index)");
"_escaped_section" string => escape("$(sectionName)");

classes:
"edit_$(cindex[$(index)])" not => strcmp("$($(tab)[$(sectionName)][$(index)])","dontchange"),
comment => "Create conditions to make changes";

"section_$(sectionName)_exists"
expression => regline("^\[$(_escaped_section)\]", "$(edit.filename)"),
if => fileexists("$(edit.filename)"),
comment => "Check if the section header already exists in the file";

field_edits:

# If the line is there, but commented out, first uncomment it
"#+\s*$(index)\s*=.*"
select_region => INI_section(escape("$(sectionName)")),
edit_field => col("\s*=\s*","1","$(index)","set"),
if => "edit_$(cindex[$(index)])";
if => and("edit_$(cindex[$(index)])",
canonify("section_$(sectionName)_exists"));

# match a line starting like the key something
"\s*$(index)\s*=.*"
edit_field => col("\s*=\s*","2","$($(tab)[$(sectionName)][$(index)])","set"),
select_region => INI_section(escape("$(sectionName)")),
classes => results("bundle", "set_variable_values_ini_not_$(cindex[$(index)])"),
if => "edit_$(cindex[$(index)])";
if => and("edit_$(cindex[$(index)])",
canonify("section_$(sectionName)_exists"));

insert_lines:
"[$(sectionName)]"
Expand All @@ -787,7 +808,16 @@ bundle edit_line set_variable_values_ini(tab, sectionName)

"$(index)=$($(tab)[$(sectionName)][$(index)])"
select_region => INI_section(escape("$(sectionName)")),
if => "!(set_variable_values_ini_not_$(cindex[$(index)])_kept|set_variable_values_ini_not_$(cindex[$(index)])_repaired).edit_$(cindex[$(index)])";
if => and("!(set_variable_values_ini_not_$(cindex[$(index)])_kept|set_variable_values_ini_not_$(cindex[$(index)])_repaired)",
"edit_$(cindex[$(index)])",
canonify("section_$(sectionName)_exists")),
handle => "insert_key_in_existing_section_$(sectionName)_$(cindex[$(index)])";

"$(index)=$($(tab)[$(sectionName)][$(index)])"
location => after("^\[$(_escaped_section)\]"),
if => and("edit_$(cindex[$(index)])",
not(canonify("section_$(sectionName)_exists"))),
handle => "insert_key_in_new_section_$(sectionName)_$(cindex[$(index)])";

}

Expand Down
Loading