Keyss

Sleeping

App Files Files Community

Kgshop commited on Aug 30, 2025

Commit

f50d3cf

verified ·

1 Parent(s): 425c5d0

Update app.py

Browse files

Files changed (1) hide show

app.py +24 -19

app.py CHANGED Viewed

@@ -50,10 +50,10 @@ def initialize_data_structure(data):
         if not isinstance(product['photos'], list):
             product['photos'] = []
-        if 'media' in product:
             del product['media']
-        product.pop('in_stock', None)
         product.pop('is_top', None)
     return data
@@ -151,7 +151,7 @@ def periodic_backup():
             upload_db_to_hf()
         except Exception as e:
             logging.error(f"Ошибка при выполнении периодического резервного копирования: {e}")
-        time.sleep(3600) # Backup every 1 hour
 def allowed_file(filename):
     return '.' in filename and \
@@ -161,7 +161,7 @@ def allowed_file(filename):
 def catalog():
     data = load_data()
     products = data['products']
-    categories = data['categories']
     catalog_html = '''
     <!DOCTYPE html>
@@ -972,7 +972,7 @@ def catalog():
                 let cart = JSON.parse(localStorage.getItem('cart') || '[]');
                 const product = products[selectedProductIndex];
-                const cartItemId = `${product.id}-${color}-${model}`; // Use product ID for better uniqueness
                 const existingItem = cart.find(item => item.id === cartItemId);
                 if (existingItem) {
@@ -980,7 +980,7 @@ def catalog():
                 } else {
                     cart.push({
                         id: cartItemId,
-                        product_id: product.id, // Store original product ID
                         name: product.name,
                         price: product.price,
                         photo: product.photos && product.photos.length > 0 ? product.photos[0] : '',
@@ -1010,15 +1010,15 @@ def catalog():
                 cartContent.innerHTML = cart.length === 0 ? '<p style="text-align: center; color: var(--secondary-text-color-light);">Корзина пуста</p>' : cart.map(item => {
                     const itemTotal = item.price * item.quantity;
                     total += itemTotal;
-                    const photoSrc = item.photo ? `https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/${item.photo}` : 'https://via.placeholder.com/60x60?text=No+Image';
                     return `
                         <div class="cart-item">
                             <img src="${photoSrc}" alt="${item.name}">
                             <div class="cart-item-details">
                                 <strong>${item.name}</strong>
-                                <p>${item.price} с × ${item.quantity} (Цвет: ${item.color}, Модель: ${item.model})</p>
                             </div>
-                            <span class="cart-item-total">${itemTotal} с</span>
                         </div>
                     `;
                 }).join('');
@@ -1038,7 +1038,7 @@ def catalog():
                 cart.forEach((item, index) => {
                     const itemTotal = item.price * item.quantity;
                     total += itemTotal;
-                    orderText += `${index + 1}. ${item.name}%0AКоличество: ${item.quantity}%0AЦена: ${item.price} с%0AЦвет: ${item.color}%0AМодель: ${item.model}%0A--%0A`;
                 });
                 orderText += `*Итого к оплате: ${total.toFixed(2)} с*%0A%0AЖду подтверждения заказа.`;
                 window.open(`https://api.whatsapp.com/send?phone=996705665777&text=${orderText}`, '_blank');
@@ -1131,7 +1131,7 @@ def product_modal_content(index):
 def admin():
     data = load_data()
     products = data['products']
-    categories = data['categories']
     if request.method == 'POST':
         action = request.form.get('action')
@@ -1184,15 +1184,17 @@ def admin():
                 flash('Ошибка: Неверный формат цены.', 'error')
                 return redirect(url_for('admin'))
             if photos_files and any(f.filename for f in photos_files):
-                uploads_dir = 'uploads'
-                os.makedirs(uploads_dir, exist_ok=True)
                 api = HfApi()
                 for i, photo in enumerate(photos_files[:10]):
                     if photo and photo.filename and allowed_file(photo.filename):
                         base, extension = os.path.splitext(photo.filename)
                         unique_filename = secure_filename(f"{name.replace(' ','_')}_{int(time.time())}_{i}{extension}")
-                        temp_path = os.path.join(uploads_dir, unique_filename)
                         try:
                             photo.save(temp_path)
                             api.upload_file(
@@ -1262,16 +1264,17 @@ def admin():
             products[index]['colors'] = colors
             products[index]['models'] = models
             if photos_files and any(f.filename for f in photos_files):
                 new_photos_list = []
-                uploads_dir = 'uploads'
-                os.makedirs(uploads_dir, exist_ok=True)
                 api = HfApi()
                 for i, photo in enumerate(photos_files[:10]):
                     if photo and photo.filename and allowed_file(photo.filename):
                         base, extension = os.path.splitext(photo.filename)
                         unique_filename = secure_filename(f"{name.replace(' ','_')}_{int(time.time())}_{i}{extension}")
-                        temp_path = os.path.join(uploads_dir, unique_filename)
                         try:
                             photo.save(temp_path)
                             api.upload_file(
@@ -1818,8 +1821,10 @@ def download():
         return redirect(url_for('admin'))
 if __name__ == '__main__':
-    uploads_dir = 'uploads'
-    os.makedirs(uploads_dir, exist_ok=True)
     logging.info("Начальная проверка и обновление структуры данных...")
     try:

         if not isinstance(product['photos'], list):
             product['photos'] = []
+        if 'media' in product: # Ensure 'media' field is completely removed if it exists
             del product['media']
+        product.pop('in_stock', None) # Remove obsolete fields
         product.pop('is_top', None)
     return data
             upload_db_to_hf()
         except Exception as e:
             logging.error(f"Ошибка при выполнении периодического резервного копирования: {e}")
+        time.sleep(3600)
 def allowed_file(filename):
     return '.' in filename and \
 def catalog():
     data = load_data()
     products = data['products']
+    categories = sorted(data['categories'])
     catalog_html = '''
     <!DOCTYPE html>
                 let cart = JSON.parse(localStorage.getItem('cart') || '[]');
                 const product = products[selectedProductIndex];
+                const cartItemId = `${product.id}-${color}-${model}`;
                 const existingItem = cart.find(item => item.id === cartItemId);
                 if (existingItem) {
                 } else {
                     cart.push({
                         id: cartItemId,
+                        product_id: product.id,
                         name: product.name,
                         price: product.price,
                         photo: product.photos && product.photos.length > 0 ? product.photos[0] : '',
                 cartContent.innerHTML = cart.length === 0 ? '<p style="text-align: center; color: var(--secondary-text-color-light);">Корзина пуста</p>' : cart.map(item => {
                     const itemTotal = item.price * item.quantity;
                     total += itemTotal;
+                    const photoSrc = item.photo ? `https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/${item.photo}?r={{ random.randint(1,1000) }}` : 'https://via.placeholder.com/60x60?text=No+Image';
                     return `
                         <div class="cart-item">
                             <img src="${photoSrc}" alt="${item.name}">
                             <div class="cart-item-details">
                                 <strong>${item.name}</strong>
+                                <p>${item.price.toFixed(2)} с × ${item.quantity} (Цвет: ${item.color}, Модель: ${item.model})</p>
                             </div>
+                            <span class="cart-item-total">${itemTotal.toFixed(2)} с</span>
                         </div>
                     `;
                 }).join('');
                 cart.forEach((item, index) => {
                     const itemTotal = item.price * item.quantity;
                     total += itemTotal;
+                    orderText += `${index + 1}. ${item.name}%0AКоличество: ${item.quantity}%0AЦена: ${item.price.toFixed(2)} с%0AЦвет: ${item.color}%0AМодель: ${item.model}%0A--%0A`;
                 });
                 orderText += `*Итого к оплате: ${total.toFixed(2)} с*%0A%0AЖду подтверждения заказа.`;
                 window.open(`https://api.whatsapp.com/send?phone=996705665777&text=${orderText}`, '_blank');
 def admin():
     data = load_data()
     products = data['products']
+    categories = sorted(data['categories'])
     if request.method == 'POST':
         action = request.form.get('action')
                 flash('Ошибка: Неверный формат цены.', 'error')
                 return redirect(url_for('admin'))
+            # Change UPLOAD_FOLDER to /tmp for temporary file storage
+            UPLOAD_TEMP_DIR = '/tmp'
+            os.makedirs(UPLOAD_TEMP_DIR, exist_ok=True)
             if photos_files and any(f.filename for f in photos_files):
                 api = HfApi()
                 for i, photo in enumerate(photos_files[:10]):
                     if photo and photo.filename and allowed_file(photo.filename):
                         base, extension = os.path.splitext(photo.filename)
                         unique_filename = secure_filename(f"{name.replace(' ','_')}_{int(time.time())}_{i}{extension}")
+                        temp_path = os.path.join(UPLOAD_TEMP_DIR, unique_filename)
                         try:
                             photo.save(temp_path)
                             api.upload_file(
             products[index]['colors'] = colors
             products[index]['models'] = models
+            UPLOAD_TEMP_DIR = '/tmp'
+            os.makedirs(UPLOAD_TEMP_DIR, exist_ok=True)
             if photos_files and any(f.filename for f in photos_files):
                 new_photos_list = []
                 api = HfApi()
                 for i, photo in enumerate(photos_files[:10]):
                     if photo and photo.filename and allowed_file(photo.filename):
                         base, extension = os.path.splitext(photo.filename)
                         unique_filename = secure_filename(f"{name.replace(' ','_')}_{int(time.time())}_{i}{extension}")
+                        temp_path = os.path.join(UPLOAD_TEMP_DIR, unique_filename)
                         try:
                             photo.save(temp_path)
                             api.upload_file(
         return redirect(url_for('admin'))
 if __name__ == '__main__':
+    # UPLOAD_FOLDER is no longer used, but let's keep this if other parts need a generic 'uploads' folder
+    # For temporary file storage, we now use '/tmp' directly in the admin functions.
+    # uploads_dir = 'uploads'
+    # os.makedirs(uploads_dir, exist_ok=True)
     logging.info("Начальная проверка и обновление структуры данных...")
     try: