From bc0dcb8331991ad57ac31b9224e7db49ebdd54f6 Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Tue, 31 Dec 2019 13:17:46 -0500 Subject: [PATCH 01/16] ajout fonction recherche prix sur site Babac --- .gitignore | 5 + README.md | 13 +- biciklo/biciklo.py | 32 ++++ biciklo/recherche_babac2.py | 254 +++++++++++++++++++++++++ biciklo/templates/layout.html | 1 + biciklo/templates/recherche_babac.html | 48 +++++ config.example.yml | 4 + setup.py | 5 + 8 files changed, 358 insertions(+), 4 deletions(-) create mode 100644 biciklo/recherche_babac2.py create mode 100644 biciklo/templates/recherche_babac.html create mode 100644 config.example.yml diff --git a/.gitignore b/.gitignore index 85e3024..6ac9d8a 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,8 @@ pip-log.txt # sass static/css sass/.sass-cache + +# virtualenv +biciklo-env/ + +config.yml diff --git a/README.md b/README.md index 3172590..15edaf0 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,12 @@ installation pour le développement $ cd biciklo $ pip install -e . -4. Lancer l'inventaire: +4. Pour pouvoir utiliser le module de recherche sur le site de Cycle Babac, entrer ses informations de connexion au site de Babac dans le fichier `config.example.yml` et en renommant le fichier pour `config.yml`: + + $ nano config.yml + $ mv config.example.yml config.yml + +5. Lancer l'inventaire: $ BICIKLO_DEBUG=1 biciklo-inventaire @@ -49,16 +54,16 @@ Exemples d'utilisation de cURL pour déboguer l'API HTTP. ### Liste de factures $ curl -X GET http://0.0.0.0:8888/api/factures - + ### Liste de membres $ curl -X GET http://0.0.0.0:8888/api/membres - + ### Ajout d'un membre $ curl -X POST --data "prenom=bob&nom=leponge" http://0.0.0.0:8888/api/membres - + ### Suppression d'un membre $ curl -X DELETE http://0.0.0.0:8888/api/membres/6 diff --git a/biciklo/biciklo.py b/biciklo/biciklo.py index 5cff774..68e952b 100644 --- a/biciklo/biciklo.py +++ b/biciklo/biciklo.py @@ -19,10 +19,18 @@ from flask import request from flask import render_template from flask import url_for +from flask import flash + +from wtforms import Form +from wtforms import TextField +from wtforms import validators from biciklo import db +from biciklo import recherche_babac2 as rb2 app = Flask(__name__) +app.config.from_object(__name__) +app.config['SECRET_KEY'] = '7d441f27d441f27567d441f2b6176a' # numéro de pièce des abonnements et durées abonnements = { @@ -1048,6 +1056,30 @@ def ObtenirProchainNumeroDeFacture(): else: return d.factures.find().sort('numero', pymongo.DESCENDING).limit(1)[0]['numero'] + 1 +# api recherche_babac +class ReusableForm(Form): + search_text = TextField('Indiquer le nom d\'une pièce pour obtenir son prix chez Cycle Babac: ', validators=[validators.required()]) + + @app.route("/recherche_babac", methods=['GET', 'POST']) + def RechercheBabac(): + form = ReusableForm(request.form) + + print(form.errors) + if request.method == 'POST': + search_text = request.form['search_text'] + print(search_text) + + if form.validate(): + flash('Résultats pour ' + search_text) + list_products = rb2.do_the_search(search_text) + #for product in list_products: + #flash('{} {} {} {}'.format(product['sku'], product['name'], product['price'], product['stock'])) + else: + flash('All the form fields are required. ') + list_products = [] + + return render_template('recherche_babac.html', form=form, list_products=list_products) + def main(): if 'BICIKLO_DEBUG' in os.environ: diff --git a/biciklo/recherche_babac2.py b/biciklo/recherche_babac2.py new file mode 100644 index 0000000..2b28d45 --- /dev/null +++ b/biciklo/recherche_babac2.py @@ -0,0 +1,254 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +import requests +from bs4 import BeautifulSoup +import re +import yaml +import argparse + + +config_file = 'config.yml' +base_url = 'https://cyclebabac.com/' + +sku_pattern = re.compile('\d{2}[-]?\d{3}$') # accept 12-345 or 12345, but not 123456 or 1234 +text_pattern = re.compile('[\w0-9 \"()]+') # accept text, numbers and special characters ", ( and ) +price_pattern = re.compile('\d*[.]\d{2}') + + +def do_the_search(search_text): + + username, password, login_url = load_config(config_file) + session = create_session(username, password, login_url, base_url) + result_page, single_result = search_item(session, search_text, base_url) + soup_results = make_soup(result_page) + + list_products, search_type = parse_results(soup_results, single_result, search_text, sku_pattern, text_pattern, price_pattern) + + return list_products + + +def load_config(config_file): + + with open(config_file, 'r') as config: + yml_file = yaml.safe_load(config) + + username = yml_file['login']['username'] + password = yml_file['login']['password'] + login_url = yml_file['login']['url'] + + return username, password, login_url + + +def create_session(username, password, login_url, base_url): + + loggedin_confirmation = 'wordpress_logged_in_' + + with requests.Session() as session: + headers = {'Cookie': 'wordpress_test_cookie=WP+Cookie+check', + 'Referer': base_url, + 'User-Agent': 'Atelier Biciklo' + } + data={ + 'log':username, 'pwd':password, 'wp-submit':'Log In', + } + response = session.post(login_url, headers=headers, data=data, allow_redirects=False) + + if loggedin_confirmation in response.headers['Set-Cookie']: + return session + else: + print('Could not log in. Exiting.') + exit(0) + + +def search_item(session, search_text, base_url): + + product_cat = '' + post_type = 'product' + + if search_text != None: + search_dict = {'product_cat': product_cat, 'post_type': post_type, 's': search_text} + else: + search_dict = {} + + result_page = session.get(base_url, params=search_dict ) + + if result_page.history: + single_result = True + else: + single_result = False + + return result_page, single_result + + +def make_soup(result_page): + + soup_results = BeautifulSoup(result_page.text, 'lxml') + + return soup_results + + +def parse_results(soup_results, single_result, search_text, sku_pattern, text_pattern, price_pattern): + + if single_result == True: + if sku_pattern.match(search_text): + search_type = 'sku_only' + search_text = search_text[:2] + '-' + search_text[-3:] + elif text_pattern.match(search_text): + search_type = 'single_text' + else: + search_type = 'error' + list_products = None + # do something to stop the parsing + + list_products = parse_single_result(soup_results, search_text, sku_pattern, price_pattern) + + else: + if text_pattern.match(search_text): + search_type = 'multiple_text' + list_products = parse_multiple_results(soup_results, search_text, sku_pattern, price_pattern) + else: + search_type = 'error' + list_products = None + # do something to stop the parsing + + return list_products, search_type + + +def parse_single_result(soup_results, search_text, sku_pattern, price_pattern): + + list_products = [] + + item_sku = soup_results.find('span', {'class': 'sku'}).text + item_name = soup_results.title.text[:-14] + item_prices = soup_results.find('p', {'class': 'price'}) + + if item_prices.find('del') == None: + item_rebate = False + item_price = item_prices.find('span', {'class': 'woocommerce-Price-amount amount'}).text + + else: + item_rebate = True + price_pattern = re.compile('\d*[.]\d{2}') + item_price = item_prices.find_all('span', {'class': 'woocommerce-Price-amount amount'})[1].text + item_price = re.findall(price_pattern, item_price)[0] + + is_instock = soup_results.find('span', {'class': 'stock_wrapper'}).span.text.lstrip().rstrip() + + if is_instock == 'In stock': + item_instock = 'Yes' + elif is_instock == 'Out of stock': + item_instock = 'No' + else: + item_instock = 'Don\'t know' + + product_info = build_product_info(item_sku, item_name, item_price, item_instock, item_rebate) + + list_products.append(product_info) + + return list_products + + +def parse_multiple_results(soup_results, search_text, sku_pattern, price_pattern): + + list_products = [] + + section_products = soup_results.find_all('div', {'class': 'kw-details clearfix'}) + + for item in section_products: + product_info = parse_info(item, sku_pattern, soup_results) + list_products.append(product_info) + + return list_products + + +def parse_info(item, sku_pattern, soup_results): + + item_sku = item.find('div', {'class': 'mg-brand-wrapper mg-brand-wrapper-sku'}).text.lstrip().rstrip() + item_sku = re.findall(sku_pattern, item_sku)[0] + item_name = item.find('h3', {'class': 'kw-details-title text-custom-child'}).text.lstrip().rstrip() + item_prices = item.find('span', {'class': 'price'}) + + if item_prices.find('del') == None: + item_rebate = False + item_price = item_prices.find('span', {'class': 'woocommerce-Price-amount amount'}).text.strip('$') + + else: + item_rebate = True + price_pattern = re.compile('\d*[.]\d{2}') + item_price = item_prices.find_all('span', {'class': 'woocommerce-Price-amount amount'})[1].text.strip('$') + item_price = re.findall(price_pattern, item_price)[0] + + item_instock = 'Don\'t know' + + is_instock = soup_results.find('div', {'class': 'mg-brand-wrapper mg-brand-wrapper-stock'}).text.lstrip().rstrip()[20:] + if is_instock == 'In stock': + item_instock = 'Yes' + elif is_instock == 'Out of stock': + item_instock = 'No' + else: + item_instock = 'Don\'t know' + + product_info = build_product_info(item_sku, item_name, item_price, item_instock, item_rebate) + + return product_info + + +def build_product_info(item_sku, item_name, item_price, item_instock, item_rebate): + + product_info = {'sku': item_sku, + 'name': item_name, + 'price': item_price, + 'stock': item_instock, + 'rebate': str(item_rebate) + } + + return(product_info) + + +def print_results(list_products): + + if len(list_products) > 1: + print('{} items were found'.format(len(list_products))) + + elif len(list_products) == 1: + print('A single item was found') + + else: + print('No product found') + exit(0) + + print('| #Babac | ' + 'Description'.ljust(45, ' ') + ' | Price | In stock? |') + print('| ------ | ' + '-'*45 + ' | -------- | --------- |') + + for item in list_products: + print('| {} | {} | {}$ | {} |'.format( + item['sku'], + item['name'].ljust(45, ' ')[:45], + item['price'].rjust(7), + item['stock'].ljust(9) + ) + ) + + +def main(): + + parser = argparse.ArgumentParser() + parser.add_argument('search_text', help='indicate which term(s) you are using to search in the Babac catalogue', default='') + args = parser.parse_args() + + + search_text = args.search_text + + username, password, login_url = load_config(config_file) + session = create_session(username, password, login_url, base_url) + result_page, single_result = search_item(session, search_text, base_url) + soup_results = make_soup(result_page) + + list_products, search_type = parse_results(soup_results, single_result, search_text, sku_pattern, text_pattern, price_pattern) + + print_results(list_products) + + +if __name__ == '__main__': + main() diff --git a/biciklo/templates/layout.html b/biciklo/templates/layout.html index 49b3a1f..cfddce6 100644 --- a/biciklo/templates/layout.html +++ b/biciklo/templates/layout.html @@ -40,6 +40,7 @@
  • Membres
  • Pièces
  • Factures
    • +
  • Recherche Babac
  • Admin diff --git a/biciklo/templates/recherche_babac.html b/biciklo/templates/recherche_babac.html new file mode 100644 index 0000000..45652a9 --- /dev/null +++ b/biciklo/templates/recherche_babac.html @@ -0,0 +1,48 @@ +{% extends "layout.html" %} +{% block head_extra %} + +{% endblock %} + +{% block content %} +

    Recherche Babac

    + + +
    + {{ form.csrf }} +
    + {{ form.search_text.label }} {{ form.search_text }}
    +
    +
    +
    + + {% with messages = get_flashed_messages(with_categories=true) %} + {% if messages %} + {% for message in messages %} +

    {{ message[1] }}

    + {% endfor %} + {% endif %} + {% endwith %} +
    + + + + + + + + + {% for product in list_products %} + + + + + + + {% endfor %} + + + +
    # BabacNomPrixEn stock?
    {{ product['sku'] }}{{ product['name'] }}{{ product['price'] }} ${{ product['stock'] }}
    +
    + +{% endblock %} diff --git a/config.example.yml b/config.example.yml new file mode 100644 index 0000000..5b662de --- /dev/null +++ b/config.example.yml @@ -0,0 +1,4 @@ +login: + url: https://cyclebabac.com/wp-login.php + username: abc123 + password: 987654 diff --git a/setup.py b/setup.py index 89d9c94..4992c9c 100644 --- a/setup.py +++ b/setup.py @@ -10,6 +10,11 @@ install_requires=[ 'pymongo', 'flask', + 'wtforms', + 'requests', + 'bs4', + 'pyyaml', + 'lxml', ], zip_safe=False, include_package_data=True, From 2220eec703d224d56a8bcedf50ac5e2882b11dd2 Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Tue, 31 Dec 2019 13:34:56 -0500 Subject: [PATCH 02/16] =?UTF-8?q?gestion=20des=20caract=C3=A8res=20ill?= =?UTF-8?q?=C3=A9gaux=20dans=20la=20recherche?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- biciklo/recherche_babac2.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/biciklo/recherche_babac2.py b/biciklo/recherche_babac2.py index 2b28d45..ff8e627 100644 --- a/biciklo/recherche_babac2.py +++ b/biciklo/recherche_babac2.py @@ -71,7 +71,7 @@ def search_item(session, search_text, base_url): else: search_dict = {} - result_page = session.get(base_url, params=search_dict ) + result_page = session.get(base_url, params=search_dict) if result_page.history: single_result = True @@ -98,7 +98,7 @@ def parse_results(soup_results, single_result, search_text, sku_pattern, text_pa search_type = 'single_text' else: search_type = 'error' - list_products = None + list_products = [] # do something to stop the parsing list_products = parse_single_result(soup_results, search_text, sku_pattern, price_pattern) @@ -109,7 +109,7 @@ def parse_results(soup_results, single_result, search_text, sku_pattern, text_pa list_products = parse_multiple_results(soup_results, search_text, sku_pattern, price_pattern) else: search_type = 'error' - list_products = None + list_products = [] # do something to stop the parsing return list_products, search_type From 86edda136f986faa31b4f0aee61d8fbf0d8b8ea1 Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Tue, 31 Dec 2019 13:51:08 -0500 Subject: [PATCH 03/16] ajuster ordre des commandes pour configuration Babac --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 15edaf0..af61067 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ installation pour le développement 4. Pour pouvoir utiliser le module de recherche sur le site de Cycle Babac, entrer ses informations de connexion au site de Babac dans le fichier `config.example.yml` et en renommant le fichier pour `config.yml`: - $ nano config.yml $ mv config.example.yml config.yml + $ nano config.yml 5. Lancer l'inventaire: From e4077dde62426ebd0a65a575bdcab5ab0173ce51 Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Tue, 21 Jan 2020 13:58:52 -0500 Subject: [PATCH 04/16] utiliser le module PyPi recherche_babac2 pour obtenir les prix du fournisseur --- README.md | 7 +- biciklo/biciklo.py | 5 +- biciklo/recherche_babac2.py | 254 ------------------------------------ config.example.yml | 4 - setup.py | 1 + 5 files changed, 7 insertions(+), 264 deletions(-) delete mode 100644 biciklo/recherche_babac2.py delete mode 100644 config.example.yml diff --git a/README.md b/README.md index af61067..8b45594 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,11 @@ installation pour le développement $ cd biciklo $ pip install -e . -4. Pour pouvoir utiliser le module de recherche sur le site de Cycle Babac, entrer ses informations de connexion au site de Babac dans le fichier `config.example.yml` et en renommant le fichier pour `config.yml`: +4. Pour pouvoir utiliser le module de recherche sur le site de Cycle Babac, entrer ses informations de connexion au site de Babac dans le fichier `.env.example` et en renommant le fichier pour `.env`, puis en éditant le fichier `.env` pour refléter les informations de connexion au site de Babac: - $ mv config.example.yml config.yml - $ nano config.yml + $ cd biciklo-env/lib/python3.5/site-packages/recherche_babac2 + $ cp .env.example .env + $ nano .env 5. Lancer l'inventaire: diff --git a/biciklo/biciklo.py b/biciklo/biciklo.py index 68e952b..2929d6c 100644 --- a/biciklo/biciklo.py +++ b/biciklo/biciklo.py @@ -26,7 +26,8 @@ from wtforms import validators from biciklo import db -from biciklo import recherche_babac2 as rb2 +from recherche_babac2 import recherche_babac2 as rb2 + app = Flask(__name__) app.config.from_object(__name__) @@ -1072,8 +1073,6 @@ def RechercheBabac(): if form.validate(): flash('Résultats pour ' + search_text) list_products = rb2.do_the_search(search_text) - #for product in list_products: - #flash('{} {} {} {}'.format(product['sku'], product['name'], product['price'], product['stock'])) else: flash('All the form fields are required. ') list_products = [] diff --git a/biciklo/recherche_babac2.py b/biciklo/recherche_babac2.py deleted file mode 100644 index ff8e627..0000000 --- a/biciklo/recherche_babac2.py +++ /dev/null @@ -1,254 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -import requests -from bs4 import BeautifulSoup -import re -import yaml -import argparse - - -config_file = 'config.yml' -base_url = 'https://cyclebabac.com/' - -sku_pattern = re.compile('\d{2}[-]?\d{3}$') # accept 12-345 or 12345, but not 123456 or 1234 -text_pattern = re.compile('[\w0-9 \"()]+') # accept text, numbers and special characters ", ( and ) -price_pattern = re.compile('\d*[.]\d{2}') - - -def do_the_search(search_text): - - username, password, login_url = load_config(config_file) - session = create_session(username, password, login_url, base_url) - result_page, single_result = search_item(session, search_text, base_url) - soup_results = make_soup(result_page) - - list_products, search_type = parse_results(soup_results, single_result, search_text, sku_pattern, text_pattern, price_pattern) - - return list_products - - -def load_config(config_file): - - with open(config_file, 'r') as config: - yml_file = yaml.safe_load(config) - - username = yml_file['login']['username'] - password = yml_file['login']['password'] - login_url = yml_file['login']['url'] - - return username, password, login_url - - -def create_session(username, password, login_url, base_url): - - loggedin_confirmation = 'wordpress_logged_in_' - - with requests.Session() as session: - headers = {'Cookie': 'wordpress_test_cookie=WP+Cookie+check', - 'Referer': base_url, - 'User-Agent': 'Atelier Biciklo' - } - data={ - 'log':username, 'pwd':password, 'wp-submit':'Log In', - } - response = session.post(login_url, headers=headers, data=data, allow_redirects=False) - - if loggedin_confirmation in response.headers['Set-Cookie']: - return session - else: - print('Could not log in. Exiting.') - exit(0) - - -def search_item(session, search_text, base_url): - - product_cat = '' - post_type = 'product' - - if search_text != None: - search_dict = {'product_cat': product_cat, 'post_type': post_type, 's': search_text} - else: - search_dict = {} - - result_page = session.get(base_url, params=search_dict) - - if result_page.history: - single_result = True - else: - single_result = False - - return result_page, single_result - - -def make_soup(result_page): - - soup_results = BeautifulSoup(result_page.text, 'lxml') - - return soup_results - - -def parse_results(soup_results, single_result, search_text, sku_pattern, text_pattern, price_pattern): - - if single_result == True: - if sku_pattern.match(search_text): - search_type = 'sku_only' - search_text = search_text[:2] + '-' + search_text[-3:] - elif text_pattern.match(search_text): - search_type = 'single_text' - else: - search_type = 'error' - list_products = [] - # do something to stop the parsing - - list_products = parse_single_result(soup_results, search_text, sku_pattern, price_pattern) - - else: - if text_pattern.match(search_text): - search_type = 'multiple_text' - list_products = parse_multiple_results(soup_results, search_text, sku_pattern, price_pattern) - else: - search_type = 'error' - list_products = [] - # do something to stop the parsing - - return list_products, search_type - - -def parse_single_result(soup_results, search_text, sku_pattern, price_pattern): - - list_products = [] - - item_sku = soup_results.find('span', {'class': 'sku'}).text - item_name = soup_results.title.text[:-14] - item_prices = soup_results.find('p', {'class': 'price'}) - - if item_prices.find('del') == None: - item_rebate = False - item_price = item_prices.find('span', {'class': 'woocommerce-Price-amount amount'}).text - - else: - item_rebate = True - price_pattern = re.compile('\d*[.]\d{2}') - item_price = item_prices.find_all('span', {'class': 'woocommerce-Price-amount amount'})[1].text - item_price = re.findall(price_pattern, item_price)[0] - - is_instock = soup_results.find('span', {'class': 'stock_wrapper'}).span.text.lstrip().rstrip() - - if is_instock == 'In stock': - item_instock = 'Yes' - elif is_instock == 'Out of stock': - item_instock = 'No' - else: - item_instock = 'Don\'t know' - - product_info = build_product_info(item_sku, item_name, item_price, item_instock, item_rebate) - - list_products.append(product_info) - - return list_products - - -def parse_multiple_results(soup_results, search_text, sku_pattern, price_pattern): - - list_products = [] - - section_products = soup_results.find_all('div', {'class': 'kw-details clearfix'}) - - for item in section_products: - product_info = parse_info(item, sku_pattern, soup_results) - list_products.append(product_info) - - return list_products - - -def parse_info(item, sku_pattern, soup_results): - - item_sku = item.find('div', {'class': 'mg-brand-wrapper mg-brand-wrapper-sku'}).text.lstrip().rstrip() - item_sku = re.findall(sku_pattern, item_sku)[0] - item_name = item.find('h3', {'class': 'kw-details-title text-custom-child'}).text.lstrip().rstrip() - item_prices = item.find('span', {'class': 'price'}) - - if item_prices.find('del') == None: - item_rebate = False - item_price = item_prices.find('span', {'class': 'woocommerce-Price-amount amount'}).text.strip('$') - - else: - item_rebate = True - price_pattern = re.compile('\d*[.]\d{2}') - item_price = item_prices.find_all('span', {'class': 'woocommerce-Price-amount amount'})[1].text.strip('$') - item_price = re.findall(price_pattern, item_price)[0] - - item_instock = 'Don\'t know' - - is_instock = soup_results.find('div', {'class': 'mg-brand-wrapper mg-brand-wrapper-stock'}).text.lstrip().rstrip()[20:] - if is_instock == 'In stock': - item_instock = 'Yes' - elif is_instock == 'Out of stock': - item_instock = 'No' - else: - item_instock = 'Don\'t know' - - product_info = build_product_info(item_sku, item_name, item_price, item_instock, item_rebate) - - return product_info - - -def build_product_info(item_sku, item_name, item_price, item_instock, item_rebate): - - product_info = {'sku': item_sku, - 'name': item_name, - 'price': item_price, - 'stock': item_instock, - 'rebate': str(item_rebate) - } - - return(product_info) - - -def print_results(list_products): - - if len(list_products) > 1: - print('{} items were found'.format(len(list_products))) - - elif len(list_products) == 1: - print('A single item was found') - - else: - print('No product found') - exit(0) - - print('| #Babac | ' + 'Description'.ljust(45, ' ') + ' | Price | In stock? |') - print('| ------ | ' + '-'*45 + ' | -------- | --------- |') - - for item in list_products: - print('| {} | {} | {}$ | {} |'.format( - item['sku'], - item['name'].ljust(45, ' ')[:45], - item['price'].rjust(7), - item['stock'].ljust(9) - ) - ) - - -def main(): - - parser = argparse.ArgumentParser() - parser.add_argument('search_text', help='indicate which term(s) you are using to search in the Babac catalogue', default='') - args = parser.parse_args() - - - search_text = args.search_text - - username, password, login_url = load_config(config_file) - session = create_session(username, password, login_url, base_url) - result_page, single_result = search_item(session, search_text, base_url) - soup_results = make_soup(result_page) - - list_products, search_type = parse_results(soup_results, single_result, search_text, sku_pattern, text_pattern, price_pattern) - - print_results(list_products) - - -if __name__ == '__main__': - main() diff --git a/config.example.yml b/config.example.yml deleted file mode 100644 index 5b662de..0000000 --- a/config.example.yml +++ /dev/null @@ -1,4 +0,0 @@ -login: - url: https://cyclebabac.com/wp-login.php - username: abc123 - password: 987654 diff --git a/setup.py b/setup.py index 4992c9c..7f25c37 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,7 @@ 'bs4', 'pyyaml', 'lxml', + 'recherche_babac2', ], zip_safe=False, include_package_data=True, From 7730d7958a64b45f26378ad0653dfb331a3c898d Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Tue, 21 Jan 2020 14:00:45 -0500 Subject: [PATCH 05/16] =?UTF-8?q?sp=C3=A9cifier=20version=20de=20recherche?= =?UTF-8?q?=5Fbabac2=20=C3=A0=20utiliser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7f25c37..5f5c1de 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ 'bs4', 'pyyaml', 'lxml', - 'recherche_babac2', + 'recherche_babac2==0.0.5', ], zip_safe=False, include_package_data=True, From ae2a121eed273cb5788a43eb439c9379e32b77f6 Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Tue, 21 Jan 2020 23:21:34 -0500 Subject: [PATCH 06/16] get rid of the default secret_key --- biciklo/biciklo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/biciklo/biciklo.py b/biciklo/biciklo.py index 2929d6c..f8854fb 100644 --- a/biciklo/biciklo.py +++ b/biciklo/biciklo.py @@ -31,7 +31,7 @@ app = Flask(__name__) app.config.from_object(__name__) -app.config['SECRET_KEY'] = '7d441f27d441f27567d441f2b6176a' +app.config['SECRET_KEY'] = os.urandom(24) # numéro de pièce des abonnements et durées abonnements = { From d072c43ea7f43980666c85f9b5e354a48907808b Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Tue, 21 Jan 2020 23:52:03 -0500 Subject: [PATCH 07/16] =?UTF-8?q?gestion=20des=20r=C3=A9sultats=20vides=20?= =?UTF-8?q?pour=20recherche=20babac2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + biciklo/biciklo.py | 5 ++- biciklo/templates/recherche_babac.html | 49 ++++++++++++++------------ 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 8b45594..ddc472a 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ dépendances * MongoDB * Ruby * Paquet `compass`, seulement nécessaire pour regénérer les fichiers css +* [Recherche Babac2](https://github.com/normcyr/recherche_babac2) pour la recherche dans le catalogue de Babac installation pour le développement ---------------------------------- diff --git a/biciklo/biciklo.py b/biciklo/biciklo.py index f8854fb..4c9eb3a 100644 --- a/biciklo/biciklo.py +++ b/biciklo/biciklo.py @@ -1071,13 +1071,12 @@ def RechercheBabac(): print(search_text) if form.validate(): - flash('Résultats pour ' + search_text) list_products = rb2.do_the_search(search_text) else: - flash('All the form fields are required. ') + flash('Remplir le champ de recherche.') list_products = [] - return render_template('recherche_babac.html', form=form, list_products=list_products) + return render_template('recherche_babac.html', form=form, list_products=list_products, search_text=search_text) def main(): diff --git a/biciklo/templates/recherche_babac.html b/biciklo/templates/recherche_babac.html index 45652a9..56068ef 100644 --- a/biciklo/templates/recherche_babac.html +++ b/biciklo/templates/recherche_babac.html @@ -6,7 +6,6 @@ {% block content %}

    Recherche Babac

    -
    {{ form.csrf }}
    @@ -22,27 +21,31 @@

    Recherche Babac

    {% endfor %} {% endif %} {% endwith %} -
    - - - - - - - - - {% for product in list_products %} - - - - - - - {% endfor %} - - - -
    # BabacNomPrixEn stock?
    {{ product['sku'] }}{{ product['name'] }}{{ product['price'] }} ${{ product['stock'] }}
    -
    + {% if list_products %} +
    + + + + + + + + + + {% for product in list_products %} + + + + + + + {% endfor %} + + +
    # BabacNomPrixEn stock?
    {{ product['sku'] }}{{ product['name'] }}{{ product['price'] }} ${{ product['stock'] }}
    + {% else %} +

    Rien de trouvé pour {{ search_text }}.

    + {% endif %} +
    {% endblock %} From 5bb36020836e12d201aed60171ea58aab3b70bef Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Tue, 21 Jan 2020 23:57:10 -0500 Subject: [PATCH 08/16] utiliser version 0.1.0 de recherche_babac2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5f5c1de..3b08c18 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ 'bs4', 'pyyaml', 'lxml', - 'recherche_babac2==0.0.5', + 'recherche_babac2==0.1.0', ], zip_safe=False, include_package_data=True, From 20a389d7fdd4efd1587fa76bbf270636ab96a9d2 Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Sun, 26 Jan 2020 16:35:22 -0500 Subject: [PATCH 09/16] =?UTF-8?q?gestion=20des=20r=C3=A9sultats=20vides?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- biciklo/biciklo.py | 9 ++-- biciklo/templates/recherche_babac.html | 57 ++++++++++++++------------ 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/biciklo/biciklo.py b/biciklo/biciklo.py index 4c9eb3a..eb43bcd 100644 --- a/biciklo/biciklo.py +++ b/biciklo/biciklo.py @@ -1059,7 +1059,10 @@ def ObtenirProchainNumeroDeFacture(): # api recherche_babac class ReusableForm(Form): - search_text = TextField('Indiquer le nom d\'une pièce pour obtenir son prix chez Cycle Babac: ', validators=[validators.required()]) + search_text = TextField('Indiquer le nom d\'une pièce pour obtenir son prix chez Cycle Babac: ', + validators=[validators.required(), + validators.Regexp('[\w0-9-]+', message='Pas de caractères spéciaux') + ]) @app.route("/recherche_babac", methods=['GET', 'POST']) def RechercheBabac(): @@ -1068,15 +1071,13 @@ def RechercheBabac(): print(form.errors) if request.method == 'POST': search_text = request.form['search_text'] - print(search_text) if form.validate(): list_products = rb2.do_the_search(search_text) else: - flash('Remplir le champ de recherche.') list_products = [] - return render_template('recherche_babac.html', form=form, list_products=list_products, search_text=search_text) + return render_template('recherche_babac.html', form=form, list_products=list_products) def main(): diff --git a/biciklo/templates/recherche_babac.html b/biciklo/templates/recherche_babac.html index 56068ef..c10535d 100644 --- a/biciklo/templates/recherche_babac.html +++ b/biciklo/templates/recherche_babac.html @@ -7,11 +7,11 @@

    Recherche Babac

    - {{ form.csrf }} + {{ form.csrf }}
    - {{ form.search_text.label }} {{ form.search_text }}
    + {{ form.search_text.label }} {{ form.search_text }}
    -
    +
    {% with messages = get_flashed_messages(with_categories=true) %} @@ -22,30 +22,33 @@

    Recherche Babac

    {% endif %} {% endwith %} - {% if list_products %}
    - - - - - - - - - - {% for product in list_products %} - - - - - - - {% endfor %} - - -
    # BabacNomPrixEn stock?
    {{ product['sku'] }}{{ product['name'] }}{{ product['price'] }} ${{ product['stock'] }}
    - {% else %} -

    Rien de trouvé pour {{ search_text }}.

    - {% endif %} + {% if list_products %} +

    {{ list_products|length }} résultats trouvés sur Cycle Babac.

    + {% if list_products|length > 0 %} + + + + + + + + + + {% for product in list_products %} + + + + + + + {% endfor %} + + +
    # BabacNomPrixEn stock?
    {{ product['sku'] }}{{ product['name'] }}{{ product['price'] }} ${{ product['stock'] }}
    + {% endif %} + {% else %} +

    Aucun produit trouvé.

    + {% endif %}
    {% endblock %} From 24fabac35c2271760dec3905b67c37bf8cd38f44 Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Mon, 27 Jan 2020 22:15:58 -0500 Subject: [PATCH 10/16] =?UTF-8?q?gestion=20d'absence=20de=20r=C3=A9sultats?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- biciklo/biciklo.py | 7 ++-- biciklo/templates/recherche_babac.html | 55 ++++++++++++-------------- 2 files changed, 28 insertions(+), 34 deletions(-) diff --git a/biciklo/biciklo.py b/biciklo/biciklo.py index eb43bcd..c063210 100644 --- a/biciklo/biciklo.py +++ b/biciklo/biciklo.py @@ -1061,7 +1061,7 @@ def ObtenirProchainNumeroDeFacture(): class ReusableForm(Form): search_text = TextField('Indiquer le nom d\'une pièce pour obtenir son prix chez Cycle Babac: ', validators=[validators.required(), - validators.Regexp('[\w0-9-]+', message='Pas de caractères spéciaux') + validators.Regexp('[\w0-9 -]+', message='Pas de caractères spéciaux') ]) @app.route("/recherche_babac", methods=['GET', 'POST']) @@ -1074,10 +1074,9 @@ def RechercheBabac(): if form.validate(): list_products = rb2.do_the_search(search_text) + return render_template('recherche_babac.html', form=form, list_products=list_products, search_text=search_text) else: - list_products = [] - - return render_template('recherche_babac.html', form=form, list_products=list_products) + return render_template('recherche_babac.html', form=form) def main(): diff --git a/biciklo/templates/recherche_babac.html b/biciklo/templates/recherche_babac.html index c10535d..6c5667e 100644 --- a/biciklo/templates/recherche_babac.html +++ b/biciklo/templates/recherche_babac.html @@ -21,34 +21,29 @@

    Recherche Babac

    {% endfor %} {% endif %} {% endwith %} - -
    - {% if list_products %} -

    {{ list_products|length }} résultats trouvés sur Cycle Babac.

    - {% if list_products|length > 0 %} - - - - - - - - - - {% for product in list_products %} - - - - - - - {% endfor %} - - -
    # BabacNomPrixEn stock?
    {{ product['sku'] }}{{ product['name'] }}{{ product['price'] }} ${{ product['stock'] }}
    - {% endif %} - {% else %} -

    Aucun produit trouvé.

    - {% endif %} -
    +
    + {% if list_products|length >= 1 %} +

    {{ list_products|length }} résultats trouvés pour {{ search_text }} sur Cycle Babac.

    + + + + + + + + + + {% for product in list_products %} + + + + + + + {% endfor %} + + +
    # BabacNomPrixEn stock?
    {{ product['sku'] }}{{ product['name'] }}{{ product['price'] }} ${{ product['stock'] }}
    + {% endif %} +
    {% endblock %} From 4d3434faa9f358d67a6613d4b9ef9312433ae0fa Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Mon, 27 Jan 2020 22:54:51 -0500 Subject: [PATCH 11/16] ajout lien vers produit sur site de Babac --- biciklo/templates/recherche_babac.html | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/biciklo/templates/recherche_babac.html b/biciklo/templates/recherche_babac.html index 6c5667e..60f3821 100644 --- a/biciklo/templates/recherche_babac.html +++ b/biciklo/templates/recherche_babac.html @@ -35,7 +35,7 @@

    Recherche Babac

    {% for product in list_products %} - {{ product['sku'] }} +     {{ product['sku'] }} {{ product['name'] }} {{ product['price'] }} $ {{ product['stock'] }} diff --git a/setup.py b/setup.py index 3b08c18..b8db013 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='Biciklo', - version='1.0', + version='1.1', packages=['biciklo'], entry_points={ 'console_scripts': ['biciklo-inventaire=biciklo.biciklo:main'], @@ -15,7 +15,7 @@ 'bs4', 'pyyaml', 'lxml', - 'recherche_babac2==0.1.0', + 'recherche_babac2==0.1.2', ], zip_safe=False, include_package_data=True, From 7da788312ec898b52297dbb78486fea6fbd6b6dd Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Mon, 10 Feb 2020 22:59:56 -0500 Subject: [PATCH 12/16] =?UTF-8?q?g=C3=A9rer=20les=20erreurs=20de=20caract?= =?UTF-8?q?=C3=A8res=20sp=C3=A9ciaux=20et=20r=C3=A9ponses=20vides?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- biciklo/biciklo.py | 28 +++++++---- biciklo/templates/recherche_babac.html | 70 +++++++++++++++----------- 2 files changed, 58 insertions(+), 40 deletions(-) diff --git a/biciklo/biciklo.py b/biciklo/biciklo.py index c063210..2b9c0eb 100644 --- a/biciklo/biciklo.py +++ b/biciklo/biciklo.py @@ -6,6 +6,7 @@ import json import os import time +import re if python_major == 2: import httplib @@ -22,7 +23,7 @@ from flask import flash from wtforms import Form -from wtforms import TextField +from wtforms import StringField from wtforms import validators from biciklo import db @@ -1059,24 +1060,29 @@ def ObtenirProchainNumeroDeFacture(): # api recherche_babac class ReusableForm(Form): - search_text = TextField('Indiquer le nom d\'une pièce pour obtenir son prix chez Cycle Babac: ', - validators=[validators.required(), - validators.Regexp('[\w0-9 -]+', message='Pas de caractères spéciaux') - ]) + search_text = StringField('Indiquer le nom d\'une pièce pour obtenir son prix chez Cycle Babac: ', + validators=[ + validators.DataRequired(message='Veuillez entrer un mot'), + validators.Regexp('^[\w0-9 -]+$', message='Veuillez ne pas utiliser de caractères spéciaux.'), + ] + ) @app.route("/recherche_babac", methods=['GET', 'POST']) def RechercheBabac(): form = ReusableForm(request.form) - print(form.errors) + if request.method == 'GET': + return render_template('recherche_babac.html', form=form) + if request.method == 'POST': search_text = request.form['search_text'] - if form.validate(): - list_products = rb2.do_the_search(search_text) - return render_template('recherche_babac.html', form=form, list_products=list_products, search_text=search_text) - else: - return render_template('recherche_babac.html', form=form) + if form.validate(): + list_products = rb2.do_the_search(search_text) + return render_template('recherche_babac.html', form=form, list_products=list_products, search_text=search_text) + else: + flash(form.errors['search_text'][0]) + return render_template('recherche_babac.html', form=form) def main(): diff --git a/biciklo/templates/recherche_babac.html b/biciklo/templates/recherche_babac.html index 60f3821..7f64aa7 100644 --- a/biciklo/templates/recherche_babac.html +++ b/biciklo/templates/recherche_babac.html @@ -1,6 +1,12 @@ {% extends "layout.html" %} -{% block head_extra %} +{% block head_extra %} + {% endblock %} {% block content %} @@ -15,35 +21,41 @@

    Recherche Babac

    {% with messages = get_flashed_messages(with_categories=true) %} - {% if messages %} - {% for message in messages %} -

    {{ message[1] }}

    - {% endfor %} - {% endif %} + {% if messages %} + {% for message in messages %} +

    {{ message[1] }}

    + {% endfor %} + {% endif %} {% endwith %} -
    - {% if list_products|length >= 1 %} + +
    + {% if search_text %} + {% if list_products|length >= 1 %}

    {{ list_products|length }} résultats trouvés pour {{ search_text }} sur Cycle Babac.

    - - - - - - - - - - {% for product in list_products %} - - - - - - - {% endfor %} - - -
    # BabacNomPrixEn stock?
    {{ product['sku'] }}{{ product['name'] }}{{ product['price'] }} ${{ product['stock'] }}
    +

    Vous pouvez cliquer sur le numéro de produit pour accéder à la page du produit sur le site de Cycle Babac.

    + + + + + + + + + + + {% for product in list_products %} + + + + + + + {% endfor %} + +
    # BabacNomPrixEn stock?
    {{ product['sku'] }}{{ product['name'] }}{{ product['price'] }} ${{ product['stock'] }}
    + {% else %} +

    Aucun produit trouvé.

    + {% endif %} {% endif %} -
    +
    {% endblock %} From 79cc6632da3f9210489066553efaadefcf9ff190 Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Mon, 17 Feb 2020 12:51:22 -0500 Subject: [PATCH 13/16] wrap texte trop long --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ddc472a..8e8a85e 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,10 @@ installation pour le développement $ cd biciklo $ pip install -e . -4. Pour pouvoir utiliser le module de recherche sur le site de Cycle Babac, entrer ses informations de connexion au site de Babac dans le fichier `.env.example` et en renommant le fichier pour `.env`, puis en éditant le fichier `.env` pour refléter les informations de connexion au site de Babac: +4. Pour pouvoir utiliser le module de recherche sur le site de Cycle Babac, +entrer ses informations de connexion au site de Babac dans le fichier +`.env.example` et en renommant le fichier pour `.env`, puis en éditant le +fichier `.env` pour refléter les informations de connexion au site de Babac: $ cd biciklo-env/lib/python3.5/site-packages/recherche_babac2 $ cp .env.example .env From 78ad34aeae48bdb00d729e4d0c815bac74c2e996 Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Mon, 17 Feb 2020 13:02:02 -0500 Subject: [PATCH 14/16] nouvelle version pour recherche_babac2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b8db013..c6fe3d0 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ 'bs4', 'pyyaml', 'lxml', - 'recherche_babac2==0.1.2', + 'recherche_babac2==0.1.4', ], zip_safe=False, include_package_data=True, From d4619557f8b5a0d28fd308a17e2640ddaa320182 Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Mon, 24 Feb 2020 23:44:54 -0500 Subject: [PATCH 15/16] Nettoyage du code --- biciklo/biciklo.py | 45 +++++++++++++------------- biciklo/templates/recherche_babac.html | 14 ++++---- setup.py | 4 --- 3 files changed, 29 insertions(+), 34 deletions(-) diff --git a/biciklo/biciklo.py b/biciklo/biciklo.py index 2b9c0eb..23c8cc0 100644 --- a/biciklo/biciklo.py +++ b/biciklo/biciklo.py @@ -1059,30 +1059,29 @@ def ObtenirProchainNumeroDeFacture(): return d.factures.find().sort('numero', pymongo.DESCENDING).limit(1)[0]['numero'] + 1 # api recherche_babac -class ReusableForm(Form): +class FormulaireRechercherBabac(Form): search_text = StringField('Indiquer le nom d\'une pièce pour obtenir son prix chez Cycle Babac: ', - validators=[ - validators.DataRequired(message='Veuillez entrer un mot'), - validators.Regexp('^[\w0-9 -]+$', message='Veuillez ne pas utiliser de caractères spéciaux.'), - ] - ) - - @app.route("/recherche_babac", methods=['GET', 'POST']) - def RechercheBabac(): - form = ReusableForm(request.form) - - if request.method == 'GET': - return render_template('recherche_babac.html', form=form) - - if request.method == 'POST': - search_text = request.form['search_text'] - - if form.validate(): - list_products = rb2.do_the_search(search_text) - return render_template('recherche_babac.html', form=form, list_products=list_products, search_text=search_text) - else: - flash(form.errors['search_text'][0]) - return render_template('recherche_babac.html', form=form) + validators=[validators.DataRequired(message='Veuillez entrer un mot'), + validators.Regexp('^[\w0-9 -]+$', message='Veuillez ne pas utiliser de caractères spéciaux.') + ]) + +@app.route("/recherche_babac", methods=['GET', 'POST']) +def RechercheBabac(): + """Effectue une recherche sur le site de Cycle Babac.""" + form = FormulaireRechercherBabac(request.form) + + if request.method == 'GET': + return render_template('recherche_babac.html', form=form) + + if request.method == 'POST': + search_text = request.form['search_text'] + + if form.validate(): + list_products = rb2.do_the_search(search_text) + return render_template('recherche_babac.html', form=form, list_products=list_products, search_text=search_text) + else: + flash(form.errors['search_text'][0]) + return render_template('recherche_babac.html', form=form) def main(): diff --git a/biciklo/templates/recherche_babac.html b/biciklo/templates/recherche_babac.html index 7f64aa7..3dc457a 100644 --- a/biciklo/templates/recherche_babac.html +++ b/biciklo/templates/recherche_babac.html @@ -13,17 +13,17 @@

    Recherche Babac

    - {{ form.csrf }} -
    - {{ form.search_text.label }} {{ form.search_text }}
    -
    -
    + {{ form.csrf }} +
    + {{ form.search_text.label }} {{ form.search_text }}
    +
    +
    - {% with messages = get_flashed_messages(with_categories=true) %} + {% with messages = get_flashed_messages() %} {% if messages %} {% for message in messages %} -

    {{ message[1] }}

    +

    {{ message }}

    {% endfor %} {% endif %} {% endwith %} diff --git a/setup.py b/setup.py index c6fe3d0..3106865 100644 --- a/setup.py +++ b/setup.py @@ -11,10 +11,6 @@ 'pymongo', 'flask', 'wtforms', - 'requests', - 'bs4', - 'pyyaml', - 'lxml', 'recherche_babac2==0.1.4', ], zip_safe=False, From 92d8ac120757fc22456baea0ec7685a93ad952fb Mon Sep 17 00:00:00 2001 From: Normand Cyr Date: Wed, 4 Mar 2020 16:45:00 -0500 Subject: [PATCH 16/16] Ajout de la fonction de recherche sur Cycle Babac --- README.md | 2 +- biciklo/biciklo.py | 41 +++++++++++++++++++++++++---------------- biciklo/settings.py | 28 ++++++++++++++++++++++++++++ config.yml.example | 5 +++++ setup.py | 6 +++++- 5 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 biciklo/settings.py create mode 100644 config.yml.example diff --git a/README.md b/README.md index 8e8a85e..8fd536d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Système d'inventaire pour l'atelier **Biciklo**. dépendances ----------- -* Python 2 ou 3 +* Python 3 * Paquet `virtualenv` recommandé (`pip install virtualenv`) * MongoDB * Ruby diff --git a/biciklo/biciklo.py b/biciklo/biciklo.py index 23c8cc0..9f229b4 100644 --- a/biciklo/biciklo.py +++ b/biciklo/biciklo.py @@ -8,11 +8,7 @@ import time import re -if python_major == 2: - import httplib -elif python_major == 3: - import http.client as httplib - +import http.client as httplib import pymongo from bson import json_util @@ -26,7 +22,7 @@ from wtforms import StringField from wtforms import validators -from biciklo import db +from biciklo import db, settings from recherche_babac2 import recherche_babac2 as rb2 @@ -1060,10 +1056,10 @@ def ObtenirProchainNumeroDeFacture(): # api recherche_babac class FormulaireRechercherBabac(Form): - search_text = StringField('Indiquer le nom d\'une pièce pour obtenir son prix chez Cycle Babac: ', - validators=[validators.DataRequired(message='Veuillez entrer un mot'), - validators.Regexp('^[\w0-9 -]+$', message='Veuillez ne pas utiliser de caractères spéciaux.') - ]) + search_text = StringField('Indiquer le nom d\'une pièce pour obtenir son prix chez Cycle Babac: ', + validators=[validators.DataRequired(message='Veuillez entrer un mot'), + validators.Regexp('^[\w0-9 -]+$', message='Veuillez ne pas utiliser de caractères spéciaux.') + ]) @app.route("/recherche_babac", methods=['GET', 'POST']) def RechercheBabac(): @@ -1076,12 +1072,25 @@ def RechercheBabac(): if request.method == 'POST': search_text = request.form['search_text'] - if form.validate(): - list_products = rb2.do_the_search(search_text) - return render_template('recherche_babac.html', form=form, list_products=list_products, search_text=search_text) - else: - flash(form.errors['search_text'][0]) - return render_template('recherche_babac.html', form=form) + if form.validate(): + utilisateur_babac, motdepasse_babac = settings.lire_config() + + if utilisateur_babac != None or motdepasse_babac != None: + recherche = rb2.BabacSearch(utilisateur_babac, motdepasse_babac) + list_products, loggedin = recherche.do_the_search(search_text) + + if loggedin: + return render_template('recherche_babac.html', form=form, list_products=list_products, search_text=search_text) + else: + flash('Le nom d\'utilisateur et/ou le mot de passe pour le site de Cycle Babac est incorrect. Veuillez vérifier vos information de connexion dans le fichier de configuration de l\'application.') + return render_template('recherche_babac.html', form=form) + + else: + flash('Veuillez spécifier le nom d\'utilisateur et le mot de passe pour le site de Cycle Babac dans le fichier de configuration de l\'application.') + return render_template('recherche_babac.html', form=form) + else: + flash(form.errors['search_text'][0]) + return render_template('recherche_babac.html', form=form) def main(): diff --git a/biciklo/settings.py b/biciklo/settings.py new file mode 100644 index 0000000..e06d2b0 --- /dev/null +++ b/biciklo/settings.py @@ -0,0 +1,28 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +from pathlib import Path +import yaml + + +def lire_config(): + + fichier_config = Path.home() / '.config' / 'biciklo' / 'config.yml' + + if fichier_config.is_file(): + + with fichier_config.open(mode='r') as fichier: + info_config = yaml.safe_load(fichier) + + utilisateur_babac = info_config['Cycle Babac']['nom utilisateur'] + motdepasse_babac = info_config['Cycle Babac']['mot de passe'] + + + else: + with fichier_config.open(mode='w') as fichier: + yaml.dump({'Cycle Babac': {'nom utilisateur': 'BoblEponge', 'mot de passe': 'BasdeBikini'}}, fichier) + + utilisateur_babac = None + motdepasse_babac = None + + return utilisateur_babac, motdepasse_babac diff --git a/config.yml.example b/config.yml.example new file mode 100644 index 0000000..6bf87ce --- /dev/null +++ b/config.yml.example @@ -0,0 +1,5 @@ +# copier ce fichier vers $HOME/.config/biciklo/ +# modifier le nom d'utilisateur et le mot de passe +Cycle Babac: + nom utilisateur: BoblEponge + mot de passe: BasdeBikini diff --git a/setup.py b/setup.py index 3106865..1a2f78c 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,7 @@ setup( name='Biciklo', + python_requires='>=3', version='1.1', packages=['biciklo'], entry_points={ @@ -11,7 +12,10 @@ 'pymongo', 'flask', 'wtforms', - 'recherche_babac2==0.1.4', + 'recherche_babac2', + ], + data_files=[ + ('.', ['config.yml.example']) ], zip_safe=False, include_package_data=True,