Skip to content

Commit

Permalink
check flake
Browse files Browse the repository at this point in the history
  • Loading branch information
KAnanev committed Jun 21, 2023
1 parent 2eec72a commit 823c7dc
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
7 changes: 5 additions & 2 deletions page_analyzer/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@


def get_db():
"""Функция проверяет наличие объекта соединения с базой данных в контексте приложения Flask"""
"""Функция проверяет наличие объекта соединения
с базой данных в контексте приложения Flask"""
if 'db' not in g:
g.db = psycopg.connect(current_app.config['DATABASE_URL'], row_factory=dict_row)
g.db = psycopg.connect(
current_app.config['DATABASE_URL'], row_factory=dict_row
)
return g.db


Expand Down
13 changes: 9 additions & 4 deletions page_analyzer/services.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from datetime import datetime
from urllib.parse import urlparse, urlunparse
from urllib.parse import urlparse
import validators
from flask import flash


LEN_URL = 255
SELECT_URL_QUERY = 'SELECT * FROM urls WHERE name = (%s)'
INSERT_URL_QUERY = 'INSERT INTO urls (name, created_at) VALUES (%s,%s) ON CONFLICT DO NOTHING RETURNING id'
INSERT_URL_QUERY = 'INSERT INTO urls (name, created_at) ' \
'VALUES (%s,%s) ON CONFLICT DO NOTHING RETURNING id'


def get_date_now():
Expand Down Expand Up @@ -38,7 +39,9 @@ def check_url(normalized_url, db):
url_id = None

try:
url_id = db.execute(SELECT_URL_QUERY, (normalized_url,)).fetchone()['id']
url_id = db.execute(
SELECT_URL_QUERY, (normalized_url,)
).fetchone()['id']
except TypeError:
pass
return url_id
Expand All @@ -52,7 +55,9 @@ def add_url(normalized_url, db):
if url_id:
flash('Страница уже существует', 'info')
else:
url_id = db.execute(INSERT_URL_QUERY, (normalized_url, get_date_now())).fetchone()['id']
url_id = db.execute(
INSERT_URL_QUERY, (normalized_url, get_date_now())
).fetchone()['id']
db.commit()
flash('Страница успешно добавлена', 'success')
return url_id
5 changes: 3 additions & 2 deletions page_analyzer/views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from flask import Blueprint, render_template, request, flash, redirect, url_for

from page_analyzer.db import get_db
from page_analyzer.services import URLParse, get_date_now, add_url
from page_analyzer.services import URLParse, add_url

bp = Blueprint('page_analyzer', __name__)

INSERT_URL_QUERY = 'INSERT INTO urls (name, created_at) VALUES (%s,%s) ON CONFLICT DO NOTHING RETURNING id'
INSERT_URL_QUERY = 'INSERT INTO urls (name, created_at) ' \
'VALUES (%s,%s) ON CONFLICT DO NOTHING RETURNING id'
SELECT_URL_QUERY = 'SELECT * FROM urls WHERE id = (%s)'
SELECT_URLS_QUERY = 'SELECT * FROM urls ORDER BY id DESC'

Expand Down

0 comments on commit 823c7dc

Please sign in to comment.