Skip to content
Snippets Groups Projects
Commit d0e9a6e0 authored by Hunter Wittenborn's avatar Hunter Wittenborn
Browse files

Moved if/elif statements over to dictionary

Runs a bit quicker now and it's easier to look at
parent cbea5921
No related branches found
No related tags found
No related merge requests found
Pipeline #11115 passed
......@@ -17,29 +17,32 @@ from aurweb.models.user import User
# Define functions for request types.
def add_deps(current_array, db_dep):
if db_dep.count() > 0:
current_array["Depends"] = []
current_array["CheckDepends"] = []
current_array["MakeDepends"] = []
current_array["OptDepends"] = []
# Define dependency types.
DEP_TYPES = {
DEPENDS_ID: "Depends",
MAKEDEPENDS_ID: "MakeDepends",
CHECKDEPENDS_ID: "CheckDepends",
OPTDEPENDS_ID: "OptDepends"
}
# Create lists for all dependency types.
for i in DEP_TYPES.values():
current_array[i] = []
# Generate each dependency item in list.
for i in db_dep.all():
dep_string = i.DepName
# Add relationship (i.e. '<=5') if it exists.
# Add relationship version restrictor (i.e. '<=5') if it exists.
if i.DepCondition is not None:
dep_string += i.DepCondition
if i.DepTypeID == DEPENDS_ID:
current_array["Depends"] += [dep_string]
elif i.DepTypeID == MAKEDEPENDS_ID:
current_array["MakeDepends"] += [dep_string]
elif i.DepTypeID == CHECKDEPENDS_ID:
current_array["CheckDepends"] += [dep_string]
elif i.DepTypeID == OPTDEPENDS_ID:
current_array["OptDepends"] += [dep_string]
# Add item to list.
current_deptype = DEP_TYPES.get(i.DepTypeID)
current_array[current_deptype] += [dep_string]
# Remove any dependency lists that are empty.
for i in ["Depends", "MakeDepends", "CheckDepends", "OptDepends"]:
for i in DEP_TYPES.values():
if current_array[i] == []:
current_array.pop(i)
......@@ -48,26 +51,31 @@ def add_deps(current_array, db_dep):
def add_rels(current_array, db_rel):
if db_rel.count() > 0:
current_array["Conflicts"] = []
current_array["Provides"] = []
current_array["Replaces"] = []
# Define relationship types.
REL_TYPES = {
CONFLICTS_ID: "Conflicts",
PROVIDES_ID: "Provides",
REPLACES_ID: "Replaces"
}
# Create lists for all relationship types.
for i in REL_TYPES.values():
current_array[i] = []
# Generate each relationship item in list.
for i in db_rel.all():
rel_string = i.RelName
# Add relationship (i.e. '<=5') if it exists.
# Add relationship version restrictor (i.e. '<=5') if it exists.
if i.RelCondition is not None:
rel_string += i.RelCondition
if i.RelTypeID == CONFLICTS_ID:
current_array["Conflicts"] += [rel_string]
elif i.RelTypeID == PROVIDES_ID:
current_array["Provides"] += [rel_string]
elif i.RelTypeID == REPLACES_ID:
current_array["Replaces"] += [rel_string]
# Add item to list.
current_reltype = REL_TYPES.get(i.RelTypeID)
current_array[current_reltype] += [rel_string]
# Remove any relationship lists that are empty.
for i in ["Conflicts", "Provides", "Replaces"]:
for i in REL_TYPES.values():
if current_array[i] == []:
current_array.pop(i)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment