From 4aa1141538a5870277ce9e4b5f184aff2f43a5e9 Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Tue, 25 Jul 2017 10:07:21 -0400 Subject: [PATCH] Made the parse_entry function for the Formula class a little less confusing --- lib/Formula.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/Formula.py b/lib/Formula.py index 86e84e1..42c805c 100644 --- a/lib/Formula.py +++ b/lib/Formula.py @@ -10,33 +10,34 @@ class Formula(): def __init__(self, formula_def, formulas_dir, formulas_url): self.formulas_dir = formulas_dir self.formulas_url = formulas_url - self.parse_entry(formula_def) + self.formula_def = formula_def + self.parse_entry() # sets the formula's git_url and local_path variables - def parse_entry(self, formula_def): + def parse_entry(self): # define our function variables here git_url = '' local_path = '' # check if the formula entry is a string or a dictionary - if isinstance(formula_def, dict): + if isinstance(self.formula_def, dict): # entry is a dictionary # check if the formula's name was defined - if not 'name' in formula_def: + if not 'name' in self.formula_def: # set the formula's name if need be - name_partial = [k for i, k in enumerate(formula_def.keys()) if i == 0][0] - formula_def['name'] = name_partial + '-formula' + name_partial = [k for i, k in enumerate(self.formula_def.keys()) if i == 0][0] + self.formula_def['name'] = name_partial + '-formula' # check if the dictionary has a git URL defined - if 'url' in formula_def: - git_url = str(formula_def['url']) + if 'url' in self.formula_def: + git_url = str(self.formula_def['url']) else: - git_url = str(self.formulas_url) + str(formula_def) + '-formula' + git_url = str(self.formulas_url) + str(self.formula_def['name']) + '-formula' # put together the local - local_path = str(self.formulas_dir) + '/' + str(formula_def['name']) - elif isinstance(formula_def, str): + local_path = str(self.formulas_dir) + '/' + str(self.formula_def['name']) + elif isinstance(self.formula_def, str): # entry is a string - git_url = str(self.formulas_url) + str(formula_def) + '-formula' - local_path = str(self.formulas_dir) + '/' + str(formula_def) + '-formula' + git_url = str(self.formulas_url) + str(self.formula_def) + '-formula' + local_path = str(self.formulas_dir) + '/' + str(self.formula_def) + '-formula' else: # entry type is not supported print('One of your formula entries is not a dict or a string (' + str(formula_def) + ') - please fix this.')