From 88e8820e427ebb6d67ef45e872e2b395bd46a3f2 Mon Sep 17 00:00:00 2001 From: morpheus65535 Date: Wed, 8 Sep 2021 08:44:49 -0400 Subject: [PATCH] WIP --- bazarr/get_episodes.py | 10 ---------- bazarr/get_movies.py | 10 ---------- bazarr/get_rootfolder.py | 18 ------------------ bazarr/get_series.py | 1 - .../movies/local}/movies_indexer.py | 2 +- .../series/local}/episodes_indexer.py | 2 +- .../series/local}/series_indexer.py | 0 bazarr/{ => indexer}/video_prop_reader.py | 0 bazarr/main.py | 4 ---- bazarr/scheduler.py | 8 +++----- bazarr/utils.py | 5 ++--- 11 files changed, 7 insertions(+), 53 deletions(-) delete mode 100644 bazarr/get_episodes.py delete mode 100644 bazarr/get_movies.py delete mode 100644 bazarr/get_rootfolder.py delete mode 100644 bazarr/get_series.py rename bazarr/{ => indexer/movies/local}/movies_indexer.py (98%) rename bazarr/{ => indexer/series/local}/episodes_indexer.py (97%) rename bazarr/{ => indexer/series/local}/series_indexer.py (100%) rename bazarr/{ => indexer}/video_prop_reader.py (100%) diff --git a/bazarr/get_episodes.py b/bazarr/get_episodes.py deleted file mode 100644 index db75e3b1e..000000000 --- a/bazarr/get_episodes.py +++ /dev/null @@ -1,10 +0,0 @@ -# coding=utf-8 - -import logging - -from list_subtitles import series_full_scan_subtitles - - -def update_all_episodes(): - series_full_scan_subtitles() - logging.info('BAZARR All existing episode subtitles indexed from disk.') diff --git a/bazarr/get_movies.py b/bazarr/get_movies.py deleted file mode 100644 index d2179a8d3..000000000 --- a/bazarr/get_movies.py +++ /dev/null @@ -1,10 +0,0 @@ -# coding=utf-8 - -import logging - -from list_subtitles import movies_full_scan_subtitles - - -def update_all_movies(): - movies_full_scan_subtitles() - logging.info('BAZARR All existing movie subtitles indexed from disk.') diff --git a/bazarr/get_rootfolder.py b/bazarr/get_rootfolder.py deleted file mode 100644 index 288b56c5c..000000000 --- a/bazarr/get_rootfolder.py +++ /dev/null @@ -1,18 +0,0 @@ -# coding=utf-8 - -from database import TableShowsRootfolder, TableMoviesRootfolder - -def get_series_rootfolder(): - rootfolders = TableShowsRootfolder.select().dicts() - - -def get_movies_rootfolder(): - rootfolders = TableMoviesRootfolder.select().dicts() - - -def check_series_rootfolder(): - pass - - -def check_movies_rootfolder(): - pass diff --git a/bazarr/get_series.py b/bazarr/get_series.py deleted file mode 100644 index 9bad5790a..000000000 --- a/bazarr/get_series.py +++ /dev/null @@ -1 +0,0 @@ -# coding=utf-8 diff --git a/bazarr/movies_indexer.py b/bazarr/indexer/movies/local/movies_indexer.py similarity index 98% rename from bazarr/movies_indexer.py rename to bazarr/indexer/movies/local/movies_indexer.py index c68cdb574..0a80b46ba 100644 --- a/bazarr/movies_indexer.py +++ b/bazarr/indexer/movies/local/movies_indexer.py @@ -5,7 +5,7 @@ import re import logging import tmdbsimple as tmdb from database import TableMoviesRootfolder, TableMovies -from video_prop_reader import VIDEO_EXTENSION, video_prop_reader +from indexer.video_prop_reader import VIDEO_EXTENSION, video_prop_reader from list_subtitles import store_subtitles_movie tmdb.API_KEY = 'e5577e69d409c601acb98d5bfcee31c7' diff --git a/bazarr/episodes_indexer.py b/bazarr/indexer/series/local/episodes_indexer.py similarity index 97% rename from bazarr/episodes_indexer.py rename to bazarr/indexer/series/local/episodes_indexer.py index e9e28b02a..95860b887 100644 --- a/bazarr/episodes_indexer.py +++ b/bazarr/indexer/series/local/episodes_indexer.py @@ -7,7 +7,7 @@ import tmdbsimple as tmdb from guessit import guessit from requests.exceptions import HTTPError from database import TableShowsRootfolder, TableShows, TableEpisodes -from video_prop_reader import VIDEO_EXTENSION, video_prop_reader +from indexer.video_prop_reader import VIDEO_EXTENSION, video_prop_reader from list_subtitles import store_subtitles tmdb.API_KEY = 'e5577e69d409c601acb98d5bfcee31c7' diff --git a/bazarr/series_indexer.py b/bazarr/indexer/series/local/series_indexer.py similarity index 100% rename from bazarr/series_indexer.py rename to bazarr/indexer/series/local/series_indexer.py diff --git a/bazarr/video_prop_reader.py b/bazarr/indexer/video_prop_reader.py similarity index 100% rename from bazarr/video_prop_reader.py rename to bazarr/indexer/video_prop_reader.py diff --git a/bazarr/main.py b/bazarr/main.py index 2184d9fba..6a5ae1d92 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -35,10 +35,6 @@ from get_languages import load_language_in_db from flask import make_response, request, redirect, abort, render_template, Response, session, flash, url_for, \ send_file, stream_with_context -from get_series import * -from get_episodes import * -from get_movies import * - from check_update import apply_update, check_if_new_update, check_releases from server import app, webserver from functools import wraps diff --git a/bazarr/scheduler.py b/bazarr/scheduler.py index ab1cf21d2..7fa2d1d2f 100644 --- a/bazarr/scheduler.py +++ b/bazarr/scheduler.py @@ -1,14 +1,12 @@ # coding=utf-8 -from get_episodes import update_all_episodes -from get_movies import update_all_movies from config import settings from get_subtitle import wanted_search_missing_subtitles_series, wanted_search_missing_subtitles_movies, \ upgrade_subtitles from utils import cache_maintenance, check_health -from series_indexer import index_all_series -from episodes_indexer import index_all_episodes -from movies_indexer import index_all_movies +from indexer.series.local.series_indexer import index_all_series +from indexer.series.local.episodes_indexer import index_all_episodes +from indexer.movies.local.movies_indexer import index_all_movies from get_args import args if not args.no_update: from check_update import check_if_new_update, check_releases diff --git a/bazarr/utils.py b/bazarr/utils.py index 87954e48d..a1c911a4c 100644 --- a/bazarr/utils.py +++ b/bazarr/utils.py @@ -369,12 +369,11 @@ def check_credentials(user, pw): def check_health(): - from get_rootfolder import check_series_rootfolder, check_movies_rootfolder if settings.general.getboolean('use_series'): - check_series_rootfolder() + pass if settings.general.getboolean('use_movies'): check_movies_rootfolder() - event_stream(type='badges') + pass def get_health_issues():