Marty
/
habitmove
1
0
Fork 0
Code Issues 9 Pull Requests Projects Releases 1 Wiki Activity

Rename NomieImport to ImportData

This commit is contained in:
Marty Oehme 2021-12-16 13:09:52 +01:00
parent 539a983505
commit 70c626b748
Signed by: Marty
GPG Key ID: B7538B8F50A1C800
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/habitmove/cli.py
View File

@ -3,13 +3,13 @@ import habitmove.schema as schema
import habitmove.habits as habits import habitmove.habits as habits
import habitmove.repetitions as rep import habitmove.repetitions as rep
import habitmove.nomie as nomie import habitmove.nomie as nomie
from habitmove.nomiedata import NomieImport from habitmove.nomiedata import ImportData
import click import click
from . import __version__ from . import __version__
def migrate(data: NomieImport): def migrate(data: ImportData):
db = schema.migrate("output.db") db = schema.migrate("output.db")
if not db: if not db:
raise ConnectionError raise ConnectionError
@ -29,7 +29,7 @@ def migrate(data: NomieImport):
@click.version_option(version=__version__) @click.version_option(version=__version__)
@click.argument("inputfile") @click.argument("inputfile")
def main(inputfile): def main(inputfile):
data = nomie.get_data(inputfile) data = nomie.get_data(inputfile, False)
migrate(data) migrate(data)

8
src/habitmove/nomie.py
View File

@ -3,7 +3,7 @@
import json import json
import re import re
from click import secho, echo from click import secho, echo
from habitmove.nomiedata import Tracker, Event, Activity, NomieImport from habitmove.nomiedata import Tracker, Event, Activity, ImportData
def load_file(filename): def load_file(filename):
@ -26,7 +26,7 @@ def confirmation_question(question, default_no=True):
# display stats and ask user to confirm if they seem okay # display stats and ask user to confirm if they seem okay
def verify_continue(data: NomieImport): def verify_continue(data: ImportData):
trackers = "" trackers = ""
for t in data.trackers: for t in data.trackers:
trackers += t.label + ", " trackers += t.label + ", "
@ -94,14 +94,14 @@ def get_activities_for_event(event_text, tracker_list):
# return the data belonging to nomie # return the data belonging to nomie
def get_data(file, interactive=True): def get_data(file: str, interactive: bool = True):
raw_data = load_file(file) raw_data = load_file(file)
nomie_version = raw_data["nomie"]["number"] nomie_version = raw_data["nomie"]["number"]
tracker_list = get_trackers(raw_data["trackers"]) tracker_list = get_trackers(raw_data["trackers"])
event_list = get_events(raw_data["events"], tracker_list) event_list = get_events(raw_data["events"], tracker_list)
data = NomieImport(nomie_version, tracker_list, event_list) data = ImportData(nomie_version, tracker_list, event_list)
if interactive: if interactive:
verify_continue(data) verify_continue(data)

2
src/habitmove/nomiedata.py
View File

@ -59,7 +59,7 @@ class Event:
@dataclass(frozen=True) @dataclass(frozen=True)
class NomieImport: class ImportData:
version: str version: str
trackers: list[Tracker] trackers: list[Tracker]
events: list[Event] events: list[Event]