From 1f53b5205b8bb372892f6ab834336a2764f2ad0e Mon Sep 17 00:00:00 2001 From: Ben Cohen Date: Sun, 28 Jul 2019 18:51:38 -0400 Subject: phew --- app.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'app.py') diff --git a/app.py b/app.py index 3c26ed2..eac1fce 100644 --- a/app.py +++ b/app.py @@ -9,17 +9,23 @@ app = Flask(__name__) with open("./data/beer_info_small.json") as beers_json: beer = json.loads(beers_json.read()) - beer_ids = {} - for long_id, val in beer.items(): - beer_ids[val[0]] = long_id.split('-')[1] +# beer_ids = {} +# for long_id, val in beer.items(): +# beer_ids[val[0]] = long_id.split('-')[1] + + beers_for_random = [b for b in beer if beer[b][3] > 75] print(len(beers_for_random)) with open('./data/brewery_names.json') as f: brewery_names = json.load(f) - brewery_ids = {} - for id, name in brewery_names.items(): - brewery_ids[name] = id + # brewery_ids = {} + # for id, name in brewery_names.items(): + # brewery_ids[name] = id + +with open('./data/name_list.json') as f: + name_list = json.load(f) + ATTRS = ['Barnyardy', 'Bitter', 'Boozy', @@ -109,7 +115,7 @@ def get_beer_details(brewery_id, beer_id): @app.route('/all_beers.json') def get_all_beers(): - return jsonify([ brewery_names[k.split('-')[0]]+' — '+v[0] for k, v in beer.items()]) + return jsonify([brewery_names[k.split('-')[0]]+' — '+v[0] for k, v in beer.items()]) @app.route('/search', methods=['POST']) def search(): @@ -117,14 +123,15 @@ def search(): if not q: return redirect('/') brewery, beer_name = q.split(' — ') - brewery_id = brewery_ids[brewery] - beer_id = beer_ids[beer_name] + print('SEARCHING: ', q) + beer_id, brewery_id = name_list[q].split('-') return redirect(url_for('get_beer_details', beer_id=beer_id, brewery_id=brewery_id)) def beer_lookup(brewery_id, beer_id=None): if beer_id: item_id = brewery_id + "-" + beer_id + print(item_id) try: beer_result = beer[item_id] return beer_result, brewery_names[brewery_id] -- cgit v1.2.3