Compare commits

...

3 commits

3 changed files with 16 additions and 12 deletions

View file

@ -84,14 +84,22 @@ def convert_datasets_to_db():
def get_title_by_id(films_ids=list):
tt_list = c.executemany("SELECT * FROM titles WHERE tt_id = (?)", films_ids).fetchall()
tt_list = []
for i in films_ids:
tt_film = c.execute("SELECT * FROM titles WHERE tt_id = (?)", (i,)).fetchone()
if tt_film:
tt_list.append(tt_film)
if tt_list != []:
return tt_list
def get_title_by_names_and_year(film_names=list):
tt_list = c.executemany('''SELECT * FROM titles
tt_list = []
for i in film_names:
tt_film = c.execute('''SELECT * FROM titles
WHERE (original_name = (?) OR ru_name = (?))
AND year = (?)''', film_names).fetchall()
AND year = (?)''', i).fetchone()
if tt_film:
tt_list.append(tt_film)
if tt_list != []:
return tt_list

View file

@ -21,7 +21,7 @@ def get_kinopoisk_movie_to_imdb(film=list):
r = requests.get(kinopoisk_api_url + "/films/" + i, headers=headers)
if r.status_code == 200:
film_data = r.json()
logger.debug('КП ответил: ' + film_data)
logger.debug('КП ответил: ' + str(film_data))
films_resolved.append((film_data['nameOriginal'], film_data['nameRu'], film_data['year']))
else:
@ -33,5 +33,5 @@ def get_kinopoisk_movie_to_imdb(film=list):
logger.success('Найдены запрошенные фильмы КП у IMDB')
return parsed_imdb_titles
else:
logger.error('Запрошенные фильмы КП не найдены у IMDB ' + films_resolved)
logger.error('Запрошенные фильмы КП не найдены у IMDB ' + str(films_resolved))

View file

@ -8,23 +8,19 @@ from dateutil.parser import parse as dateutilparse
from dateutil.relativedelta import relativedelta, TU, SU
from loguru import logger
lock = threading.Lock()
def get_control_mention():
while True:
time.sleep(30)
time_now = datetime.now()
now_week = time_now.weekday()
now_hour = time_now.hour
if now_week not in (0, 6):
time.sleep(30)
continue
if now_week == 6 and now_hour <= fmn_next_watching_hour: # Предотвращение работы в холстую до начала сеанса
time.sleep(30)
if now_week == 6 and now_hour < fmn_next_watching_hour: # Предотвращение работы в холстую до начала сеанса
continue
with lock:
post_exists = get_state('last_thread_id')
post_exists = get_state('last_thread_id')
if post_exists:
time.sleep(30)
continue
logger.debug('Wait for from admin mention...')
notif = get_notifications()