Skip to content

Commit 526fc15

Browse files
Fix the application of analyses (#103)
1 parent 2c92503 commit 526fc15

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

asimov/cli/application.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,18 @@ def apply_page(file, event=None, ledger=None, update_page=False):
7878
if document["kind"] == "event":
7979
logger.info("Found an event")
8080
document.pop("kind")
81-
event = asimov.event.Event.from_yaml(yaml.dump(document))
81+
event_obj = asimov.event.Event.from_yaml(yaml.dump(document))
8282

8383
# Check if the event is in the ledger already
8484
# ledger.events is a dict with event names as keys
85-
event_exists = event.name in ledger.events
85+
event_exists = event_obj.name in ledger.events
8686

8787
if event_exists and update_page is True:
88-
old_event = deepcopy(ledger.events[event.name])
88+
old_event = deepcopy(ledger.events[event_obj.name])
8989
for key in ["name", "productions", "working directory", "repository", "ledger"]:
9090
old_event.pop(key, None)
9191
analyses = []
92-
for prod in ledger.events[event.name].get("productions", []):
92+
for prod in ledger.events[event_obj.name].get("productions", []):
9393
prod_name = None
9494
prod_data = None
9595

@@ -115,37 +115,37 @@ def apply_page(file, event=None, ledger=None, update_page=False):
115115
# Add the old version to the history
116116
if "history" not in ledger.data:
117117
ledger.data["history"] = {}
118-
history = ledger.data["history"].get(event.name, {})
118+
history = ledger.data["history"].get(event_obj.name, {})
119119
version = f"version-{len(history)+1}"
120120
history[version] = old_event
121121
history[version]["date changed"] = datetime.now()
122122

123-
ledger.data["history"][event.name] = history
123+
ledger.data["history"][event_obj.name] = history
124124
ledger.save()
125-
update(ledger.events[event.name], event.meta)
126-
ledger.events[event.name]["productions"] = analyses
127-
ledger.events[event.name].pop("ledger", None)
125+
update(ledger.events[event_obj.name], event_obj.meta)
126+
ledger.events[event_obj.name]["productions"] = analyses
127+
ledger.events[event_obj.name].pop("ledger", None)
128128

129129
click.echo(
130-
click.style("●", fg="green") + f" Successfully updated {event.name}"
130+
click.style("●", fg="green") + f" Successfully updated {event_obj.name}"
131131
)
132132

133133
elif not event_exists and update_page is False:
134-
ledger.update_event(event)
134+
ledger.update_event(event_obj)
135135
click.echo(
136-
click.style("●", fg="green") + f" Successfully added {event.name}"
136+
click.style("●", fg="green") + f" Successfully added {event_obj.name}"
137137
)
138-
logger.info(f"Added {event.name} to project")
138+
logger.info(f"Added {event_obj.name} to project")
139139

140140
elif not event_exists and update_page is True:
141141
click.echo(
142142
click.style("●", fg="red")
143-
+ f" {event.name} cannot be updated as there is no record of it in the project."
143+
+ f" {event_obj.name} cannot be updated as there is no record of it in the project."
144144
)
145145
else:
146146
click.echo(
147147
click.style("●", fg="red")
148-
+ f" {event.name} already exists in this project."
148+
+ f" {event_obj.name} already exists in this project."
149149
)
150150

151151
elif document["kind"] == "analysis":

0 commit comments

Comments
 (0)