Skip to content

Commit

Permalink
Remove duplicate variables from config fillables
Browse files Browse the repository at this point in the history
  • Loading branch information
mosa11aei committed Jul 10, 2024
1 parent 2478493 commit d693817
Showing 1 changed file with 32 additions and 2 deletions.
34 changes: 32 additions & 2 deletions src/fppm/cli/commands/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,43 @@ def pull_cookiecutter_variables(configObject, packagePath):
# append the variable name
variable = line.split("{{")[1].split("}}")[0].strip().split(".")[1]
lineNumber = configObjectContent.split("\n").index(line)

doNotAdd = False

for vars in cookiecutterVariables:
if vars["variable"] in variable:
doNotAdd = True

if doNotAdd:
continue

cookiecutterVariables.append({
"context": line.strip(),
"variable": variable,
"line": lineNumber + 1
})

# append other variables in the line
for var in line.split("{{")[1:]:
variable = var.split("}}")[0].strip().split(".")[1]
lineNumber = configObjectContent.split("\n").index(line)

doNotAdd = False

for vars in cookiecutterVariables:
print(vars["variable"], variable)
if vars["variable"] in variable:
doNotAdd = True

if doNotAdd:
continue

cookiecutterVariables.append({
"context": line.strip(),
"variable": variable,
"line": lineNumber + 1
})

return (cookiecutterVariables, configDescription)

def create_fillable(variables, description, configObject, packagePath, fillablesPath):
Expand Down Expand Up @@ -253,8 +284,7 @@ def apply_config_fillables(args, context):
try:
os.mkdir(f"{packageFolder}.fillables/out")
except FileExistsError:
shutil.rmtree(f"{packageFolder}.fillables/out", ignore_errors=True)
os.mkdir(f"{packageFolder}.fillables/out")
pass

# move all files in the generated directory to the out directory

Expand Down

0 comments on commit d693817

Please sign in to comment.