Spaces:
Paused
Paused
Update app.py
Browse files
app.py
CHANGED
|
@@ -24,7 +24,9 @@ def load_data():
|
|
| 24 |
try:
|
| 25 |
download_db_from_hf()
|
| 26 |
with open(DATA_FILE, 'r', encoding='utf-8') as file:
|
| 27 |
-
|
|
|
|
|
|
|
| 28 |
except FileNotFoundError:
|
| 29 |
logging.warning("Локальный файл базы данных не найден после скачивания.")
|
| 30 |
return []
|
|
@@ -42,6 +44,8 @@ def save_data(data):
|
|
| 42 |
try:
|
| 43 |
with open(DATA_FILE, 'w', encoding='utf-8') as file:
|
| 44 |
json.dump(data, file, ensure_ascii=False, indent=4)
|
|
|
|
|
|
|
| 45 |
except Exception as e:
|
| 46 |
logging.error(f"Ошибка при сохранении данных: {e}")
|
| 47 |
raise
|
|
@@ -52,6 +56,7 @@ def upload_db_to_hf():
|
|
| 52 |
api.upload_file(
|
| 53 |
path_or_fileobj=DATA_FILE,
|
| 54 |
path_in_repo=DATA_FILE,
|
|
|
|
| 55 |
repo_type="dataset",
|
| 56 |
token=HF_TOKEN_WRITE,
|
| 57 |
commit_message=f"Автоматическое резервное копирование базы данных {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
|
|
@@ -471,7 +476,7 @@ def catalog():
|
|
| 471 |
}
|
| 472 |
|
| 473 |
const quantityInput = document.getElementById('quantityInput');
|
| 474 |
-
const quantity = parseInt(quantityInput.value) || 1;
|
| 475 |
|
| 476 |
if (quantity <= 0) {
|
| 477 |
console.warn("Некорректное количество:", quantity);
|
|
@@ -565,7 +570,6 @@ def catalog():
|
|
| 565 |
}
|
| 566 |
}
|
| 567 |
|
| 568 |
-
// Инициализация
|
| 569 |
console.log("Инициализация страницы, товары:", products);
|
| 570 |
updateCartButton();
|
| 571 |
</script>
|
|
@@ -621,6 +625,9 @@ def admin():
|
|
| 621 |
description = request.form.get('description')
|
| 622 |
photos_files = request.files.getlist('photos')
|
| 623 |
photos_list = []
|
|
|
|
|
|
|
|
|
|
| 624 |
if photos_files:
|
| 625 |
for i, photo in enumerate(photos_files[:2]): # Ограничение до 2 фото
|
| 626 |
if photo and photo.filename:
|
|
@@ -640,34 +647,54 @@ def admin():
|
|
| 640 |
commit_message=f"Добавлено фото для товара {name}"
|
| 641 |
)
|
| 642 |
photos_list.append(photo_filename)
|
|
|
|
| 643 |
except Exception as e:
|
| 644 |
logging.error(f"Ошибка при загрузке фото: {e}")
|
| 645 |
return f"Ошибка при загрузке фото: {e}", 500
|
| 646 |
finally:
|
| 647 |
-
os.
|
| 648 |
-
|
| 649 |
-
|
| 650 |
-
|
| 651 |
-
|
| 652 |
-
|
| 653 |
-
|
| 654 |
-
|
| 655 |
-
|
| 656 |
-
|
| 657 |
-
|
| 658 |
-
|
| 659 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 660 |
save_data(products)
|
|
|
|
| 661 |
return redirect(url_for('admin'))
|
|
|
|
|
|
|
|
|
|
|
|
|
| 662 |
elif action == 'edit':
|
| 663 |
index = int(request.form.get('index'))
|
| 664 |
name = request.form.get('name')
|
| 665 |
price = request.form.get('price')
|
| 666 |
description = request.form.get('description')
|
| 667 |
photos_files = request.files.getlist('photos')
|
|
|
|
|
|
|
|
|
|
| 668 |
if photos_files and any(photo.filename for photo in photos_files):
|
| 669 |
new_photos_list = []
|
| 670 |
-
for i, photo in enumerate(photos_files[:2]):
|
| 671 |
if photo and photo.filename:
|
| 672 |
photo_filename = secure_filename(photo.filename)
|
| 673 |
uploads_dir = 'uploads'
|
|
@@ -685,26 +712,35 @@ def admin():
|
|
| 685 |
commit_message=f"Обновлено фото для товара {name}"
|
| 686 |
)
|
| 687 |
new_photos_list.append(photo_filename)
|
|
|
|
| 688 |
except Exception as e:
|
| 689 |
logging.error(f"Ошибка при загрузке фото: {e}")
|
| 690 |
return f"Ошибка при загрузке фото: {e}", 500
|
| 691 |
finally:
|
| 692 |
-
os.
|
|
|
|
| 693 |
products[index]['photos'] = new_photos_list
|
|
|
|
| 694 |
products[index]['name'] = name
|
| 695 |
try:
|
| 696 |
-
price = float(price.replace(',', '.'))
|
| 697 |
except ValueError:
|
| 698 |
-
|
| 699 |
-
|
| 700 |
products[index]['description'] = description
|
|
|
|
| 701 |
save_data(products)
|
|
|
|
| 702 |
return redirect(url_for('admin'))
|
|
|
|
| 703 |
elif action == 'delete':
|
| 704 |
index = int(request.form.get('index'))
|
|
|
|
| 705 |
del products[index]
|
| 706 |
save_data(products)
|
|
|
|
| 707 |
return redirect(url_for('admin'))
|
|
|
|
| 708 |
admin_html = '''
|
| 709 |
<!DOCTYPE html>
|
| 710 |
<html lang="ru">
|
|
|
|
| 24 |
try:
|
| 25 |
download_db_from_hf()
|
| 26 |
with open(DATA_FILE, 'r', encoding='utf-8') as file:
|
| 27 |
+
data = json.load(file)
|
| 28 |
+
logging.info("Данные успешно загружены из JSON")
|
| 29 |
+
return data
|
| 30 |
except FileNotFoundError:
|
| 31 |
logging.warning("Локальный файл базы данных не найден после скачивания.")
|
| 32 |
return []
|
|
|
|
| 44 |
try:
|
| 45 |
with open(DATA_FILE, 'w', encoding='utf-8') as file:
|
| 46 |
json.dump(data, file, ensure_ascii=False, indent=4)
|
| 47 |
+
logging.info("Данные успешно сохранены в JSON")
|
| 48 |
+
upload_db_to_hf() # Синхронизация с Hugging Face после сохранения
|
| 49 |
except Exception as e:
|
| 50 |
logging.error(f"Ошибка при сохранении данных: {e}")
|
| 51 |
raise
|
|
|
|
| 56 |
api.upload_file(
|
| 57 |
path_or_fileobj=DATA_FILE,
|
| 58 |
path_in_repo=DATA_FILE,
|
| 59 |
+
repo_id=REPO_ID,
|
| 60 |
repo_type="dataset",
|
| 61 |
token=HF_TOKEN_WRITE,
|
| 62 |
commit_message=f"Автоматическое резервное копирование базы данных {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
|
|
|
|
| 476 |
}
|
| 477 |
|
| 478 |
const quantityInput = document.getElementById('quantityInput');
|
| 479 |
+
const quantity = parseInt(quantityInput.value) || 1;
|
| 480 |
|
| 481 |
if (quantity <= 0) {
|
| 482 |
console.warn("Некорректное количество:", quantity);
|
|
|
|
| 570 |
}
|
| 571 |
}
|
| 572 |
|
|
|
|
| 573 |
console.log("Инициализация страницы, товары:", products);
|
| 574 |
updateCartButton();
|
| 575 |
</script>
|
|
|
|
| 625 |
description = request.form.get('description')
|
| 626 |
photos_files = request.files.getlist('photos')
|
| 627 |
photos_list = []
|
| 628 |
+
|
| 629 |
+
logging.info(f"Добавление нового товара: name={name}, price={price}, description={description}")
|
| 630 |
+
|
| 631 |
if photos_files:
|
| 632 |
for i, photo in enumerate(photos_files[:2]): # Ограничение до 2 фото
|
| 633 |
if photo and photo.filename:
|
|
|
|
| 647 |
commit_message=f"Добавлено фото для товара {name}"
|
| 648 |
)
|
| 649 |
photos_list.append(photo_filename)
|
| 650 |
+
logging.info(f"Фото успешно загружено: {photo_filename}")
|
| 651 |
except Exception as e:
|
| 652 |
logging.error(f"Ошибка при загрузке фото: {e}")
|
| 653 |
return f"Ошибка при загрузке фото: {e}", 500
|
| 654 |
finally:
|
| 655 |
+
if os.path.exists(temp_path):
|
| 656 |
+
os.remove(temp_path)
|
| 657 |
+
|
| 658 |
+
if not name or not price or not description:
|
| 659 |
+
logging.error("Ошибка: Не все обязательные поля заполнены")
|
| 660 |
+
return "Ошибка: Заполните все обязательные поля", 400
|
| 661 |
+
|
| 662 |
+
try:
|
| 663 |
+
price = float(price.replace(',', '.'))
|
| 664 |
+
except ValueError:
|
| 665 |
+
logging.error("Ошибка: Цена должна быть числом")
|
| 666 |
+
return "Ошибка: Цена должна быть числом", 400
|
| 667 |
+
|
| 668 |
+
new_product = {
|
| 669 |
+
'name': name,
|
| 670 |
+
'price': price,
|
| 671 |
+
'description': description,
|
| 672 |
+
'photos': photos_list
|
| 673 |
+
}
|
| 674 |
+
|
| 675 |
+
products.append(new_product)
|
| 676 |
+
logging.info(f"Новый товар добавлен в список: {new_product}")
|
| 677 |
+
|
| 678 |
+
try:
|
| 679 |
save_data(products)
|
| 680 |
+
logging.info("Товар успешно сохранен в базе данных")
|
| 681 |
return redirect(url_for('admin'))
|
| 682 |
+
except Exception as e:
|
| 683 |
+
logging.error(f"Ошибка при сохранении товара: {e}")
|
| 684 |
+
return f"Ошибка при сохранении товара: {e}", 500
|
| 685 |
+
|
| 686 |
elif action == 'edit':
|
| 687 |
index = int(request.form.get('index'))
|
| 688 |
name = request.form.get('name')
|
| 689 |
price = request.form.get('price')
|
| 690 |
description = request.form.get('description')
|
| 691 |
photos_files = request.files.getlist('photos')
|
| 692 |
+
|
| 693 |
+
logging.info(f"Редактирование товара с индексом {index}")
|
| 694 |
+
|
| 695 |
if photos_files and any(photo.filename for photo in photos_files):
|
| 696 |
new_photos_list = []
|
| 697 |
+
for i, photo in enumerate(photos_files[:2]):
|
| 698 |
if photo and photo.filename:
|
| 699 |
photo_filename = secure_filename(photo.filename)
|
| 700 |
uploads_dir = 'uploads'
|
|
|
|
| 712 |
commit_message=f"Обновлено фото для товара {name}"
|
| 713 |
)
|
| 714 |
new_photos_list.append(photo_filename)
|
| 715 |
+
logging.info(f"Фото обновлено: {photo_filename}")
|
| 716 |
except Exception as e:
|
| 717 |
logging.error(f"Ошибка при загрузке фото: {e}")
|
| 718 |
return f"Ошибка при загрузке фото: {e}", 500
|
| 719 |
finally:
|
| 720 |
+
if os.path.exists(temp_path):
|
| 721 |
+
os.remove(temp_path)
|
| 722 |
products[index]['photos'] = new_photos_list
|
| 723 |
+
|
| 724 |
products[index]['name'] = name
|
| 725 |
try:
|
| 726 |
+
products[index]['price'] = float(price.replace(',', '.'))
|
| 727 |
except ValueError:
|
| 728 |
+
logging.error("Ошибка: Цена должна быть числом")
|
| 729 |
+
return "Ошибка: Цена должна быть числом", 400
|
| 730 |
products[index]['description'] = description
|
| 731 |
+
|
| 732 |
save_data(products)
|
| 733 |
+
logging.info(f"Товар с индексом {index} успешно отредактирован")
|
| 734 |
return redirect(url_for('admin'))
|
| 735 |
+
|
| 736 |
elif action == 'delete':
|
| 737 |
index = int(request.form.get('index'))
|
| 738 |
+
logging.info(f"Удаление товара с индексом {index}")
|
| 739 |
del products[index]
|
| 740 |
save_data(products)
|
| 741 |
+
logging.info("Товар успешно удален")
|
| 742 |
return redirect(url_for('admin'))
|
| 743 |
+
|
| 744 |
admin_html = '''
|
| 745 |
<!DOCTYPE html>
|
| 746 |
<html lang="ru">
|