shit

1 files changed, 27 insertions, 15 deletions

diff --git a/app.py b/app.py
index aea7cff..d4f49f5 100644
--- a/app.py
+++ b/app.py
@@ -3,6 +3,7 @@ from flask import render_template
 from flask import redirect
 from flask import request
 from flask import url_for
+from utils import get_closest
 import json
 import random
 import re
@@ -41,23 +42,35 @@ def get_beer_details(brewery_id, beer_id):
              'Barnyardy', 'Woody', 'Smoky', 'Roasty', 'Yeasty', 'Sweet',
              'Juicy', 'Light', 'Thin', 'Spicy', 'Dry', 'Fruity', 'Herbal',
              'Salty']
+    similar_beers = get_closest(brewery_id + '-' + beer_id)
+    similar_beer_objects = []
+    for item in similar_beers:
+        item_result, item_brewer = beer_lookup(item)
+        similar_beer_objects.append(BeerInfo(item, item_brewer, item_result))
+
     if request.method == 'POST':
-        similar_beers = []
         attr = request.form['attr']
         direction = request.form['direction']
         return render_template('beerpage.jinja2', beer_data=beerinfo, attrs=attrs,
-                similar_beers=similar_beers, attr=attr, direction=direction)
-    return render_template('beerpage.jinja2', beer_data=beerinfo, attrs=attrs)
+                similar_beers=similar_beer_objects, attr=attr, direction=direction)
+    return render_template('beerpage.jinja2', beer_data=beerinfo, attrs=attrs,
+                           similar_beers=similar_beer_objects)
 
 
-def beer_lookup(brewery_id, beer_id):
-    try:
+def beer_lookup(brewery_id, beer_id=None):
+    if beer_id:
         item_id = brewery_id + "-" + beer_id
-        beer_result = beer[item_id]
-        brewer = brewery_names[brewery_id]
-        return BeerInfo(beer_id, brewery_id, beer_result, brewer)
-    except:
-        return None
+        try:
+            beer_result = beer[item_id]
+            return beer_result, brewery_names[brewery_id]
+        except:
+            return None
+    else:
+        try:
+            beer_result = beer[brewery_id]
+            return beer_result, brewery_names[brewery_id.split("-")[0]]
+        except:
+            return None
 
 
 def find_beers_from_brewery(brewery_id):
@@ -68,17 +81,16 @@ def find_beers_from_brewery(brewery_id):
 
 class BeerInfo(object):
 
-    def __init__(self, beer_id, brewery_id, item_json, brewery_name):
-        self.id = beer_id
-        self.brewery_id = brewery_id
+    def __init__(self, beer_id, brewery_name, item_json):
+        self._id = beer_id
         self.parent_style = item_json[1][1]
         self.base_style = item_json[1][0]
         self.name = item_json[0]
         self.abv = item_json[2]
         self.brewer = brewery_name
         self.num_reviews = item_json[3]
-        self.drinks_like = get_drinks_like(brewery_id + '-' + beer_id)
-
+        self.drinks_like = get_drinks_like(self._id)
+        self.link ="/brewery/" + beer_id.split('-')[0] + '/' + beer_id.split('-')[1]
 
 class Brewery(object):