From 17c4a7ebd412feecd2bd59f2d8ef5be709c9fb81 Mon Sep 17 00:00:00 2001
From: ache <ache@ache.one>
Date: Sun, 5 Sep 2021 01:15:32 +0200
Subject: Last rename dicofr => dfr

---
 Makefile |  6 +++---
 web.py   | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index ab4165e..4dd9a31 100644
--- a/Makefile
+++ b/Makefile
@@ -14,18 +14,18 @@ install:
 	cp -r download ${DIR_INSTALL_PATH}/download
 	cp -r assets ${DIR_INSTALL_PATH}/assets
 	@[ -f frwiktionary-latest-pages-meta-current.xml.bz2 ] && \
-		cp -u frwiktionary-latest-pages-meta-current.xml.bz2 ${DIR_INSTALL_PATH}/
+		cp -u frwiktionary-latest-pages-meta-current.xml.bz2 ${DIR_INSTALL_PATH}/ || true
 	#
 	# Disabled DEBUG in production
 	sed -i 's/DEBUG = True/DEBUG = False/' ${DIR_INSTALL_PATH}/*.py
 	# Get the external assets if needed
 	cd ${DIR_INSTALL_PATH}; python ${DIR_INSTALL_PATH}/download/download.py -d -o "${DIR_INSTALL_PATH}/assets/dfr.db"
 	# Set permission and install command
-	chmod +x ${DIR_INSTALL_PATH}/dicofr.py
+	chmod +x ${DIR_INSTALL_PATH}/dfr.py
 	# delete symlink if it exists
 	[ -h ${DIR_BIN}/dfr ] && unlink ${DIR_BIN}/dfr
 	# create it
-	ln -s ${DIR_INSTALL_PATH}/dicofr.py ${DIR_BIN}/dfr
+	ln -s ${DIR_INSTALL_PATH}/dfr.py ${DIR_BIN}/dfr
 	chmod +x ${DIR_BIN}/dfr
 	@echo 'Enjoy dfr !'
 
diff --git a/web.py b/web.py
index 82ad696..d268771 100644
--- a/web.py
+++ b/web.py
@@ -1,12 +1,12 @@
 """
-A simple Web application to serve dicofr
+A simple Web application to serve dfr
 """
 
 from flask import Flask, request, Response, send_file
 import msgpack
 # from flask_cors import CORS
 
-import dicofr
+import dfr
 
 
 # configuration
@@ -33,15 +33,15 @@ def get_def_reg(w):
     """
         Search a word, can deal with regex and casse problem.
     """
-    if res := dicofr.get_def_sql_reg(w):
+    if res := dfr.get_def_sql_reg(w):
         return msgpack.packb(res)
 
     # Recherche du mot en minuscule
-    elif res := dicofr.get_def_sql_reg(w.lower()):
+    elif res := dfr.get_def_sql_reg(w.lower()):
         return msgpack.packb(res)
 
     # Recherche du mot en nom propre
-    elif res := dicofr.get_def_sql_reg(w.title()):
+    elif res := dfr.get_def_sql_reg(w.title()):
         return msgpack.packb(res)
 
     else:
@@ -60,13 +60,13 @@ def get_def():
         return get_def_reg(w);
 
     # Recherche du mot tapé
-    if res := dicofr.get_def_sql(w):
+    if res := dfr.get_def_sql(w):
         return msgpack.packb(res)
     # Recherche du mot en minuscule
-    elif res := dicofr.get_def_sql(w.lower()):
+    elif res := dfr.get_def_sql(w.lower()):
         return msgpack.packb(res)
     # Recherche du mot en nom propre
-    elif res := dicofr.get_def_sql(w.title()):
+    elif res := dfr.get_def_sql(w.title()):
         return msgpack.packb(res)
     else:
         return Response("", status=404)
-- 
cgit v1.2.3