From 8d57245ccf50d5692cd69b5fae9e0d7264f417ff Mon Sep 17 00:00:00 2001
From: "Phyks (Lucas Verney)" <phyks@phyks.me>
Date: Wed, 28 Feb 2018 22:06:21 +0100
Subject: [PATCH] Handle deletion of recipes

---
 .gitignore                                 |   1 +
 cuizin/__pycache__/__init__.cpython-36.pyc | Bin 1074 -> 0 bytes
 cuizin/__pycache__/__main__.cpython-36.pyc | Bin 1079 -> 0 bytes
 cuizin/__pycache__/db.cpython-36.pyc       | Bin 1494 -> 0 bytes
 cuizin/db.py                               |   7 +++--
 cuizin/js_src/components/New.vue           |   3 +-
 cuizin/js_src/components/Recipe.vue        |  34 +++++++++++++++++++--
 cuizin/web.py                              |  26 +++++++++++++---
 requirements.txt                           |   1 +
 9 files changed, 60 insertions(+), 12 deletions(-)
 delete mode 100644 cuizin/__pycache__/__init__.cpython-36.pyc
 delete mode 100644 cuizin/__pycache__/__main__.cpython-36.pyc
 delete mode 100644 cuizin/__pycache__/db.cpython-36.pyc

diff --git a/.gitignore b/.gitignore
index a8af265..55b3c2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 package-lock.json
 yarn.lock
 *.db
+__pycache__
 
 .DS_Store
 node_modules/
diff --git a/cuizin/__pycache__/__init__.cpython-36.pyc b/cuizin/__pycache__/__init__.cpython-36.pyc
deleted file mode 100644
index 99af6d00b64c3375cfcc8d490e1359692ca107ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1074
zcmYjPO>f*b5GAS4)k<pzF>)$;R}bp|MbR7<Mn3FQ3nPe81RxLylt{0sNTNbgb#2I}
z4bb+GLxKE>{3Ts;>R-sIL#=~`0Ecfz6z9#G`7z59E<e&I9zvhdH!A@A6t>}DIO4cL
zEvC37l(Zi8u#1t#r~Z5fG=S4<!ZxDO{LOFTc0m_24w|H0(k0-KM?B^Wo@@h}@{BKe
z`X1AalM9ru{)J2^_of3@8r2L|6teA=w$rNDva`kI&{bBdZaN$~St%}xMp~g+W6pCt
zg|9_<E_*;3Af?K)&fU=vAiSjh&p$oh(u6gQ7M1LUp^IveMs|YT(zs>1l~#2$Gea-5
zRS>sURK!t&<<tO$=50m*7S*^WJB0Vh1K;1`9R@!bF~=Y9-{?<ti8<lk``Cu3Xov5}
zA5TYeirzfA^G2_Z?)(we@#xo!9o8E-lM!ysFZ%To{It$?5UE!#&r9@f^BPnKrF>U!
z+A2OY!W2ETR}}_MZaKmc?1!+;cVM<?L~oAn@L#A#BObAYCq8)pkas>jgmX;8o@v$^
zKxv~GFG^Ou6&=sXMAna|aG%BLdo9XN_Mgy~AC9k7D~|iCo44lp1!#N>O5V!u>roW4
zleQ?<{mqwT(@0}0)%GVxj*{aS2Djfc&Wn8`)|*CE(8Ch|U$5o|+7&@#&MYgL5j3h)
z*NMu~tkQzPXh0l_r{Sx)o7y#Kil0Aw@ypry>BSV4T3s8Vr^HyMt+|%=ibl_$U7Y>)
z>enfD8Qmn&<)v0_0hPhLP`_teL6fbp_tdCw*zY0_s5j_F$1|gQc?^y2kv@dDPQm0@
zFCEUnOv(QhI^R43gK&ZmN#Z3z>?JtFDfo}DcD>5+dA_1a0Yh#FEs8=rrL>zl?Sr9y
zZD8^}b7Sbyp6|L+TCCL|OEr{YR)9XZ|74YF%-a2;L-%*M@6fEOK5&n^q%-Sp%uGDq
X>|1`~M#`+f9N`$pB*iI7$;$f=@6i==

diff --git a/cuizin/__pycache__/__main__.cpython-36.pyc b/cuizin/__pycache__/__main__.cpython-36.pyc
deleted file mode 100644
index ad3accf45bf0e3d340086e8d9d83f193eafcebc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1079
zcmb_a&5qMB5VoB(N&mK`LI`m|a6k%&h7~tdRY=RZ2YQRN3f<V+x=otkqzhY>Q}>Dl
z5--6k@F>1=;uZG9jN5J-;D{wpCZFw@Z@!tA?RMkG{9Aa=2>D5lmJR-E*aZi}38x7O
z@yimLvXD_C$jsu_hH{(NZpem)wm}>~T<#g9W{^4{4c;_}BV68^GxZKmJl^Ifyz?1i
zaXKb`_ZMU$BcE!<FIH|a$z^bL8Y8%0K$4unE<7-tawhSiHPWsUvCKuW>g=8cJK#G}
zSjoZMJ`bi@DuR4^JuiZ@jEf*%%9UK~KT(uU<RXgt`L%8Vhv@1wk_#?AI+z$45KE!|
zSFQ?G3vL*y55YmI+`1tpnb8^BkT;;0p>B^9UW_RiTo@jKG3??#m`k!I=dDk4O=o07
zzOwiBcv}p}<d#{)WnB79v;GV1Y)d|rs%jA6wlPR#QN~%C5AR`AOyQ8#(_Lvho%(|$
zizi7j1ZRKUw-jF1&RZj{b_$V*xI9W=q{S@yq#CY`nedcYj4J$F^{Sl-UP*peHkOZJ
zj9|~e`BSi&Wu&v$WX?A9zsRRt$m27GqonF+4ugVRR0GT-*n7pER7(7(U^OF{YU1-2
z7+w1?6-sC(xldIG;c61yt^|F6>2S7Cwk}m&@U*v|NL@EQnr1~QzdT0r+QuJk=b0+~
zdgxqaWtoW3*-rGfd)B2W&Agg6+=X0BQV~VkQp?2=r$a-%L7MSpB8J$T0*moj%j&tk
Idavox-_aQ58UO$Q

diff --git a/cuizin/__pycache__/db.cpython-36.pyc b/cuizin/__pycache__/db.cpython-36.pyc
deleted file mode 100644
index 7858d235dbbb4d4ae429e808222553c045e03ffa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1494
zcmZuwOK%)S5bmD$&dxf1Bs@igAd1)n_JJtk5TPiJKuBZ{Boe44G@6|*duKh5b$1W3
zSL4(A%8ft4U+OC-{sI@MnjJd{qDTF8Rllab`l`R0OyVETei#3EjQz>pYUs14*!9l{
zl1W}Nu^qYK=sTrTxx%eH;Z?ryt3U)*D8ecd5vP4_IjUk2a|WLDHe8IqW73zwHIo6j
z8&@Qfzhu+!FT9=2rh)ZeG!ja?^YXkb3_Q<FHqSKJ(X+Cde_KE)?dW)ssjZoOUmG}u
z!5h7T3)3%5xt&yWPimS}7P(o+3i4tF`cTeu`qfQy(RhkoUmyS@O2WawnDD@rTspsT
z;X^Q3Aw+{UlCFqhJb1~iHNp8Ei17R!w04oKCw(OAZyd1)`!bN>HN!L<$ViT^nYb%m
zq#xVh$3DJS7`a!sWjT8%N`4dN?mJNmj1W&d>+$yV;R`U?Z0gx4P3x?JG_`S>Vj|j-
z>?BRk+pHW`B01#t52o(mwLSd(;AqiQaI{)np6R1wOyN=97VDzE8RYzMb!k2N(MNbl
zI|vb1dpP72B{eFU5c@H9{S3jd4ZGqO4`uY6{c``xF}!1)vvIE6&Q*zVI^H=Q76WJJ
z$xqC<ORr-~f5VqS$J4MQj-#3NO<_u~LDrf@qwIKvy0!|^R+V;7<CIAy=v);mQ#7^R
zT`5>)DkCQ~MFlp=o93*jPY184wNY(O>v|fheGF6`5ZooWNAMoO`ve~#Od~bI!G@>E
z-WX*=Js6RK^A@zx*2T5{0vqNH7H4g2I0TBixXpYif^8{U|D-Qx|JST+;f(}}G`8at
z)l}(gm^aP*6P(aA%bb8aJmN9;_%43y{XzG)Hs7j1%20LpDm*~LunsHliW|Pfj7$C@
zdP`S28&2L6*5}!ssr$Hh?YHLS%de-NiqNwGy}`$i#AyEb5!5-Bg$*RoICZS2p*#_>
z232Hbu?G2HF5&P9zrd?>jKGkChb&^g-WeDSTc-Ea7}r%oFd^^>-e^O$)kmnP!g`g&
zsGg@QP`asAK$Ewsi7~3JKo%&2?j;ma-c(iZQpwsxqmo5l0hW|hpV8@u1h)@jYf<uh
z?RU`7RQM4OdIBT`5%JLXoE<kA_xq+3^*NpS7(oOpfY$(u6j3CJ>RI&6`hbawI9Qe0
r<)Udd9QMVWw-_^JU(rwdTmLUC8$H=R@Nek(_34eAh=1xOZsh(8Qy*W9

diff --git a/cuizin/db.py b/cuizin/db.py
index 804a870..e1bebea 100644
--- a/cuizin/db.py
+++ b/cuizin/db.py
@@ -1,6 +1,6 @@
 import base64
-import mimetypes
 
+import magic
 import requests
 from peewee import (
     Model, SqliteDatabase,
@@ -9,7 +9,7 @@ from peewee import (
 from playhouse.shortcuts import model_to_dict
 
 
-database = SqliteDatabase('recipes.db', threadlocals=True)
+database = SqliteDatabase('recipes.db')
 database.connect()
 
 
@@ -43,7 +43,8 @@ class Recipe(Model):
     def to_dict(self):
         serialized = model_to_dict(self)
         prepend_info = (
-          'data:%s;base64' % mimetypes.guess_type(serialized['picture'])[0]
+          'data:%s;base64' % magic.from_buffer(serialized['picture'],
+                                               mime=True)
         )
         serialized['picture'] = '%s,%s' % (
             prepend_info,
diff --git a/cuizin/js_src/components/New.vue b/cuizin/js_src/components/New.vue
index 4b6482d..b51bc19 100644
--- a/cuizin/js_src/components/New.vue
+++ b/cuizin/js_src/components/New.vue
@@ -19,7 +19,7 @@
         </v-form>
       </v-flex>
     </v-layout>
-    <v-layout row wrap mt-5>
+    <v-layout row wrap mt-5 v-if="featureAddManually">
       <v-flex xs12>
         <h2>Add manually</h2>
         <v-form v-model="validAdd">
@@ -116,6 +116,7 @@ export default {
           }
         },
       ],
+      featureAddManually: false,
     };
   },
   methods: {
diff --git a/cuizin/js_src/components/Recipe.vue b/cuizin/js_src/components/Recipe.vue
index a0e9ec5..04006a7 100644
--- a/cuizin/js_src/components/Recipe.vue
+++ b/cuizin/js_src/components/Recipe.vue
@@ -1,12 +1,28 @@
 <template>
   <v-container grid-list-md>
     <v-layout row wrap>
-      <v-flex xs12 v-if="this.recipe">
-          <h1>{{ this.recipe.title }}</h1>
-          <p><img :src="this.recipe.picture" height="300px" /></p>
+      <v-flex xs6 offset-xs3>
+          <h1 class="text-xs-center mt-3 mb-3">
+              {{ this.recipe.title }}
+              <v-btn @click="handleDelete">Delete</v-btn>
+          </h1>
+          <p class="text-xs-center">
+              <img :src="this.recipe.picture" />
+          </p>
+          <v-layout row text-xs-center>
+            <v-flex xs6>
+              <p><v-icon>timelapse</v-icon> {{ recipe.preparation_time }} mins</p>
+            </v-flex>
+            <v-flex xs6>
+              <p><v-icon>whatshot</v-icon> {{ recipe.cooking_time }} mins</p>
+            </v-flex>
+          </v-layout>
           <p>{{ this.recipe.short_description }}</p>
           <p>{{ this.recipe.ingredients }}</p>
           <p>{{ this.recipe.instructions }}</p>
+          <p v-if="this.recipe.url">
+              <a :href="this.recipe.url">Original link</a>
+          </p>
       </v-flex>
     </v-layout>
   </v-container>
@@ -40,6 +56,18 @@ export default {
           this.isLoading = false;
         });
     },
+    handleDelete() {
+      fetch(`${constants.API_URL}/api/v1/recipe/${this.$route.params.recipeId}`, {
+        method: 'DELETE',
+      })
+        .then(() => this.$router.replace('/'));
+    },
   },
 };
 </script>
+
+<style scoped>
+img {
+    width: 75%;
+}
+</style>
diff --git a/cuizin/web.py b/cuizin/web.py
index d4d5a8d..3bb7b27 100644
--- a/cuizin/web.py
+++ b/cuizin/web.py
@@ -1,7 +1,6 @@
 import json
 
 import bottle
-import peewee
 
 from cuizin import add_recipe
 from cuizin import db
@@ -55,11 +54,13 @@ def api_v1_recipes_post():
 
     recipes = []
     try:
-        recipes = [add_recipe(data['url']).to_dict()]
-    except peewee.IntegrityError:
-        recipes = [db.Recipe.select().where(
+        recipe = db.Recipe.select().where(
             db.Recipe.url == data['url']
-        ).first().to_dict()]
+        ).first()
+        assert recipe
+        recipes = [recipe.to_dict()]
+    except AssertionError:
+        recipes = [add_recipe(data['url']).to_dict()]
 
     return {
         'recipes': recipes
@@ -81,6 +82,21 @@ def api_v1_recipe(id):
     }
 
 
+@app.delete('/api/v1/recipe/:id', ['DELETE', 'OPTIONS'])
+def api_v1_recipe_delete(id):
+    # CORS
+    if bottle.request.method == 'OPTIONS':
+        return ''
+
+    db.Recipe.delete().where(
+        db.Recipe.id == id
+    ).execute()
+
+    return {
+        'status': 'OK'
+    }
+
+
 @app.get('/static/<filename:path>')
 def get_static_files(filename):
     """Get Static files"""
diff --git a/requirements.txt b/requirements.txt
index 819aa8f..0798778 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 bottle
 peewee
+python-magic
 requests
 https://git.weboob.org/weboob/devel/repository/archive.zip?ref=master
 https://git.weboob.org/weboob/modules/repository/archive.zip?ref=master