fix answer url

Author: gordienkoas

page_analyzer/app.py

@@ -23,85 +23,104 @@ def get_db_connection():
 def index():
     if request.method == 'POST':
         url = request.form['url']
-        if not validators.url(url) or len(url) > 255:
-            flash('Некорректный URL', 'error')
-            return redirect(url_for('index'))
-
-        # Извлекаем домен из URL
-        domain = urlparse(url).netloc
-
-        conn = get_db_connection()
-        cur = conn.cursor()
-        try:
-            # Проверяем, существует ли уже этот домен
-            cur.execute('SELECT id FROM urls WHERE name = %s', (domain,))
-            existing_url = cur.fetchone()
-
-            if existing_url:
-                # Если домен уже существует, перенаправляем на его детали
-                url_id = existing_url[0]
-                flash('Страница уже существует', 'error')
-                return redirect(url_for('url_detail', url_id=url_id))
-
-            # Если домен не существует, добавляем его
-            cur.execute('INSERT INTO urls (name) VALUES (%s) RETURNING id', (domain,))
-            url_id = cur.fetchone()[0]
-            conn.commit()
-            flash('Страница успешно добавлена', 'success')
-
-            return redirect(url_for('url_detail', url_id=url_id))
-        except Exception as e:
-            conn.rollback()
-            flash(f'Произошла ошибка: {str(e)}', 'error')
-        finally:
-            cur.close()
-            conn.close()
-
+        return redirect(url_for('urls', url=url))
     return render_template('index.html')
 
-
-@app.route('/urls', methods=['GET'])
+@app.route('/urls', methods=['GET', 'POST'])
 def urls():
-    conn = get_db_connection()
-    cur = conn.cursor()
+    if request.method == 'POST':
+        url = request.form['url']
+        if not validators.url(url) or len(url) > 255:
+            flash('Некорректный URL', 'error')
+            return render_template('index.html'), 422  # Возвращаем ошибку 422 с HTML
 
-    # Объединяем запросы для получения всех URL и последней проверки
-    cur.execute('''
-         SELECT u.id, u.name, u.created_at, 
-                uc.status_code, uc.created_at AS last_check,
-                uc.h1, uc.title, uc.description
-         FROM urls u
-         LEFT JOIN url_checks uc ON u.id = uc.url_id
-         AND uc.created_at = (
-             SELECT MAX(created_at) 
-             FROM url_checks 
-             WHERE url_id = u.id
-         )
-         ORDER BY u.created_at DESC
-     ''')
-    urls = cur.fetchall()
-
-    cur.close()
-    conn.close()
+        domain = urlparse(url).netloc
 
-    return render_template('urls.html', urls=urls)
+        with get_db_connection() as conn:
+            with conn.cursor() as cur:
+                try:
+                    cur.execute('SELECT id FROM urls WHERE name = %s', (domain,))
+                    existing_url = cur.fetchone()
+
+                    if existing_url:
+                        url_id = existing_url[0]
+                        flash('Страница уже существует', 'error')
+                        return redirect(url_for('url_detail', url_id=url_id))
+
+                    cur.execute('INSERT INTO urls (name) VALUES (%s) RETURNING id', (domain,))
+                    url_id = cur.fetchone()[0]
+                    conn.commit()
+                    flash('Страница успешно добавлена', 'success')
+
+                    return redirect(url_for('url_detail', url_id=url_id))
+                except Exception as e:
+                    conn.rollback()
+                    flash(f'Произошла ошибка: {str(e)}', 'error')
+
+    else:
+        url = request.args.get('url')
+        if url:
+            if not validators.url(url) or len(url) > 255:
+                flash('Некорректный URL', 'error')
+                return render_template('index.html'), 422  # Возвращаем ошибку 422 с HTML
+
+            domain = urlparse(url).netloc
+
+            with get_db_connection() as conn:
+                with conn.cursor() as cur:
+                    try:
+                        cur.execute('SELECT id FROM urls WHERE name = %s', (domain,))
+                        existing_url = cur.fetchone()
+
+                        if existing_url:
+                            url_id = existing_url[0]
+                            flash('Страница уже существует', 'error')
+                            return redirect(url_for('url_detail', url_id=url_id))
+
+                        cur.execute('INSERT INTO urls (name) VALUES (%s) RETURNING id', (domain,))
+                        url_id = cur.fetchone()[0]
+                        conn.commit()
+                        flash('Страница успешно добавлена', 'success')
+
+                        return redirect(url_for('url_detail', url_id=url_id))
+                    except Exception as e:
+                        conn.rollback()
+                        flash(f'Произошла ошибка: {str(e)}', 'error')
+
+        with get_db_connection() as conn:
+            with conn.cursor() as cur:
+                cur.execute('''
+                    SELECT u.id, u.name, u.created_at,
+                           uc.status_code, uc.created_at AS last_check,
+                           uc.h1, uc.title, uc.description
+                    FROM urls u
+                    LEFT JOIN url_checks uc ON u.id = uc.url_id
+                    AND uc.created_at = (
+                        SELECT MAX(created_at)
+                        FROM url_checks 
+                        WHERE url_id = u.id
+                    )
+                ''')
+                urls = cur.fetchall()
+                return render_template('urls.html', urls=urls)
 
 
 @app.route('/urls/<int:url_id>', methods=['GET'])
 def url_detail(url_id):
     conn = get_db_connection()
     cursor = conn.cursor()
     cursor.execute('SELECT * FROM urls WHERE id = %s', (url_id,))
-    url = cursor.fetchone()
-    cursor.execute('SELECT * FROM url_checks WHERE url_id = %s', (url_id,))
+    url_record = cursor.fetchone()
+    cursor.execute('SELECT * FROM url_checks WHERE url_id = %s ORDER BY created_at DESC', (url_id,))
     checks = cursor.fetchall()
     cursor.close()
     conn.close()
-    if url is None:
+
+    if url_record is None:
         flash('Сайт не найден.', 'error')
         return redirect(url_for('urls'))
-    return render_template('result.html', url=url, checks=checks)
 
+    return render_template('result.html', url=url_record, checks=checks)
 
 
 @app.route('/check_url/<int:url_id>', methods=['POST'])
@@ -110,13 +129,13 @@ def add_check(url_id):
     cur = conn.cursor()
 
     cur.execute('SELECT name FROM urls WHERE id = %s', (url_id,))
-    url = cur.fetchone()
+    url_row = cur.fetchone()
 
-    if url is None:
+    if url_row is None:
         flash('URL не найден.', 'error')
         return redirect(url_for('urls'))
 
-    url_name = url[0]
+    url_name = url_row[0]
 
     # Проверка и добавление схемы к URL, если она отсутствует
     parsed_url = urlparse(url_name)
@@ -140,10 +159,13 @@ def add_check(url_id):
         description_content = description_tag['content'] if description_tag else None
 
         # Записываем код статуса и SEO-данные в базу данных
-        cur.execute('''
+        cur.execute(
+            '''
             INSERT INTO url_checks (url_id, status_code, h1, title, description) 
             VALUES (%s, %s, %s, %s, %s)
-        ''', (url_id, response.status_code, h1_content, title_content, description_content))
+            ''',
+            (url_id, response.status_code, h1_content, title_content, description_content)
+        )
 
         conn.commit()
         flash('Страница успешно проверена', 'success')
@@ -157,8 +179,5 @@ def add_check(url_id):
     return redirect(url_for('url_detail', url_id=url_id))
 
 
-
-
 if __name__ == '__main__':
-    app.run(debug=True)
-
+    app.run(debug=True)