From: Christian Heller Date: Wed, 11 Nov 2020 22:59:44 +0000 (+0100) Subject: Add deck management. X-Git-Url: https://plomlompom.com/repos/unset_cookie?a=commitdiff_plain;h=c0290f81d02b98927666ccb8a7e94147bae79ac0;p=guiltcards Add deck management. --- diff --git a/guiltcards.py b/guiltcards.py index aa77ce3..cad1cb3 100755 --- a/guiltcards.py +++ b/guiltcards.py @@ -5,12 +5,13 @@ import json import base64 web_path = '/guiltcards' -cards_dir = 'cards/' +decks_dir = 'decks/' -def get_card_data(card_id): +def get_card_data(deck_id, card_id): + cards_dir = decks_dir + deck_id if not os.path.exists(cards_dir): os.makedirs(cards_dir) - path_card = cards_dir + card_id + path_card = cards_dir + '/' + card_id if os.path.exists(path_card): with open(path_card, 'r') as f: data = json.loads(f.read()) @@ -21,42 +22,64 @@ def get_card_data(card_id): return data @get(web_path + '/') -@view('intro') -def intro(): - return dict() +@get(web_path + '/decks') +@view('decks') +def list_decks(): + if not os.path.exists(decks_dir): + os.makedirs(decks_dir) + deck_ids = os.listdir(decks_dir) + decks = {} + print('DEBUG', deck_ids) + for deck_id in deck_ids: + decks[deck_id] = base64.b64decode(deck_id).decode() + return dict(web_path=web_path, decks=decks) -@get(web_path + '/cards') +@get(web_path + '/decks/') +def new_deck(): + deck_name = request.query.get('deck_name') + deck_id = base64.b64encode(deck_name.encode()).decode() + redirect(web_path + '/decks/' + deck_id + '/cards') + +@get(web_path + '/decks//cards') +@get(web_path + '/decks//') +@get(web_path + '/decks/') @view('cards') -def list_cards(): - if not os.path.exists(cards_dir): - os.makedirs(cards_dir) - card_ids = os.listdir(cards_dir) +def list_cards(deck_id): + cards_dir = decks_dir + deck_id + card_ids = [] + if os.path.exists(cards_dir): + card_ids = os.listdir(cards_dir) cards = {} for card_id in card_ids: cards[card_id] = base64.b64decode(card_id).decode() + deck_name = base64.b64decode(deck_id).decode() return dict(web_path=web_path, + deck_id=deck_id, + deck_name=deck_name, cards=cards) -@get(web_path + '/cards/') -def new_card(): +@get(web_path + '/decks//cards/') +def new_card(deck_id): card_name = request.query.get('card_name') card_id = base64.b64encode(card_name.encode()).decode() - redirect(web_path + '/cards/' + card_id + '/form') + redirect(web_path + '/decks/' + deck_id + '/cards/' + card_id + '/form') -@get(web_path + '/cards//view') +@get(web_path + '/decks//cards//view') @view('card') -def show_card(card_id): - data = get_card_data(card_id) +def show_card(deck_id, card_id): + data = get_card_data(deck_id, card_id) return dict(web_path=web_path, + deck_id=deck_id, title=data['title'], prompt=data['prompt'], answers=data['answers']) -@post(web_path + '/cards/') -def update_card(card_id): +@post(web_path + '/decks//cards/') +def update_card(deck_id, card_id): + cards_dir = decks_dir + deck_id if not os.path.exists(cards_dir): os.makedirs(cards_dir) - path_card = cards_dir + card_id + path_card = cards_dir + '/' + card_id json_dict = { 'title': request.forms.get('title'), 'prompt': request.forms.get('prompt'), @@ -66,37 +89,40 @@ def update_card(card_id): if answer.strip() != ''] with open(path_card, 'w') as f: f.write(json.dumps(json_dict, indent=4)) - redirect(web_path + '/cards/' + card_id + '/view') + redirect(web_path + '/decks/' + deck_id + '/cards/' + card_id + '/view') -@get(web_path + '/cards//form') +@get(web_path + '/decks//cards//form') @view('card_form') -def card_form(card_id): - data = get_card_data(card_id) - card_path = cards_dir + '/' + card_id +def card_form(deck_id, card_id): + data = get_card_data(deck_id, card_id) + card_path = decks_dir + deck_id + '/' + card_id deletable = False if os.path.exists(card_path): deletable = True return dict(web_path=web_path, card_id=card_id, + deck_id=deck_id, title=data['title'], prompt=data['prompt'], answers=data['answers'], deletable=deletable) -@get(web_path + '/cards//delete') +@get(web_path + '/decks//cards//delete') @view('delete_card') -def delete_card_ask(card_id): +def delete_card_ask(deck_id, card_id): card_name = base64.b64decode(card_id.encode()).decode() return dict(web_path=web_path, + deck_id=deck_id, card_name=card_name, card_id=card_id) -@post(web_path + '/cards//delete') -def delete_card_do(card_id): +@post(web_path + '/decks//cards//delete') +def delete_card_do(deck_id, card_id): + cards_dir = decks_dir + deck_id card_path = cards_dir + '/' + card_id if os.path.exists(card_path): os.remove(card_path) - redirect(web_path + '/cards') + redirect(web_path + '/decks/' + deck_id + '/cards') # App running. diff --git a/views/card.tpl b/views/card.tpl index 8e89f50..cb121e6 100644 --- a/views/card.tpl +++ b/views/card.tpl @@ -17,6 +17,6 @@ % end
    -back to overview +back to overview diff --git a/views/card_form.tpl b/views/card_form.tpl index a2aa551..c4c6488 100644 --- a/views/card_form.tpl +++ b/views/card_form.tpl @@ -1,7 +1,7 @@ -
    + title:
    prompt:
    % for answer in answers: @@ -17,7 +17,7 @@ answer:

    % if deletable:

    -Or would you rather DELETE this card? +Or would you rather DELETE this card?

    % end
    diff --git a/views/cards.tpl b/views/cards.tpl index 758fe22..2c20cb0 100644 --- a/views/cards.tpl +++ b/views/cards.tpl @@ -1,13 +1,17 @@ +

    deck: {{deck_name}}

    -
    -add another? name: + +add another card? name:
    +

    +back to decks overview +

    diff --git a/views/delete_card.tpl b/views/delete_card.tpl index cd1ec0f..c9c0677 100644 --- a/views/delete_card.tpl +++ b/views/delete_card.tpl @@ -1,9 +1,9 @@ -
    +
    -Nah, better not … +Nah, better not … diff --git a/views/intro.tpl b/views/intro.tpl deleted file mode 100644 index e24a7a0..0000000 --- a/views/intro.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - -Hey there! - -