diff --git a/errors.log b/errors.log new file mode 100644 index 0000000..e69de29 diff --git a/noGerFound.log b/noGerFound.log new file mode 100644 index 0000000..e69de29 diff --git a/src/server/app.py b/src/server/app.py index 9c6380e..d68db6d 100644 --- a/src/server/app.py +++ b/src/server/app.py @@ -11,10 +11,10 @@ import atexit sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) from main import SeriesApp -from core.entities.series import Serie -from core.entities import SerieList -from infrastructure.file_system import SerieScanner -from infrastructure.providers.provider_factory import Loaders +from server.core.entities.series import Serie +from server.core.entities import SerieList +from server.infrastructure.file_system import SerieScanner +from server.infrastructure.providers.provider_factory import Loaders from web.controllers.auth_controller import session_manager, require_auth, optional_auth from config import config from application.services.queue_service import download_queue_bp diff --git a/src/server/core/interfaces/providers.py b/src/server/core/interfaces/providers.py index 19990d9..7281a45 100644 --- a/src/server/core/interfaces/providers.py +++ b/src/server/core/interfaces/providers.py @@ -1,7 +1,7 @@ -from infrastructure.providers.streaming.Provider import Provider -from infrastructure.providers.streaming.voe import VOE +from server.infrastructure.providers.streaming.Provider import Provider +from server.infrastructure.providers.streaming.voe import VOE class Providers: diff --git a/src/server/infrastructure/file_system/SerieScanner.py b/src/server/infrastructure/file_system/SerieScanner.py index 5c9d6f9..49a26fd 100644 --- a/src/server/infrastructure/file_system/SerieScanner.py +++ b/src/server/infrastructure/file_system/SerieScanner.py @@ -1,11 +1,11 @@ import os import re import logging -from core.entities.series import Serie +from server.core.entities.series import Serie import traceback -from infrastructure.logging.GlobalLogger import error_logger, noKeyFound_logger -from core.exceptions.Exceptions import NoKeyFoundException, MatchNotFoundError -from infrastructure.providers.base_provider import Loader +from server.infrastructure.logging.GlobalLogger import error_logger, noKeyFound_logger +from server.core.exceptions.Exceptions import NoKeyFoundException, MatchNotFoundError +from server.infrastructure.providers.base_provider import Loader class SerieScanner: @@ -121,7 +121,7 @@ class SerieScanner: episodes_dict = {} for season, expected_count in expected_dict.items(): existing_episodes = filedict.get(season, []) - missing_episodes = [ep for ep in range(1, expected_count + 1) if ep not in existing_episodes] + missing_episodes = [ep for ep in range(1, expected_count + 1) if ep not in existing_episodes and self.loader.IsLanguage(season, ep, key)] if missing_episodes: episodes_dict[season] = missing_episodes diff --git a/src/server/infrastructure/providers/aniworld_provider.py b/src/server/infrastructure/providers/aniworld_provider.py index a487bf2..74ff937 100644 --- a/src/server/infrastructure/providers/aniworld_provider.py +++ b/src/server/infrastructure/providers/aniworld_provider.py @@ -12,8 +12,8 @@ from fake_useragent import UserAgent from requests.adapters import HTTPAdapter from urllib3.util.retry import Retry -from infrastructure.providers.base_provider import Loader -from core.interfaces.providers import Providers +from server.infrastructure.providers.base_provider import Loader +from server.core.interfaces.providers import Providers from yt_dlp import YoutubeDL import shutil diff --git a/src/server/infrastructure/providers/enhanced_provider.py b/src/server/infrastructure/providers/enhanced_provider.py index f7bde27..d7519b5 100644 --- a/src/server/infrastructure/providers/enhanced_provider.py +++ b/src/server/infrastructure/providers/enhanced_provider.py @@ -23,8 +23,8 @@ from urllib3.util.retry import Retry from yt_dlp import YoutubeDL import shutil -from infrastructure.providers.base_provider import Loader -from core.interfaces.providers import Providers +from server.infrastructure.providers.base_provider import Loader +from server.core.interfaces.providers import Providers from error_handler import ( with_error_recovery, recovery_strategies, diff --git a/src/server/infrastructure/providers/provider_factory.py b/src/server/infrastructure/providers/provider_factory.py index d6d6a4a..284fc68 100644 --- a/src/server/infrastructure/providers/provider_factory.py +++ b/src/server/infrastructure/providers/provider_factory.py @@ -1,5 +1,5 @@ -from infrastructure.providers.aniworld_provider import AniworldLoader -from infrastructure.providers.base_provider import Loader +from server.infrastructure.providers.aniworld_provider import AniworldLoader +from server.infrastructure.providers.base_provider import Loader class Loaders: diff --git a/src/server/minimal_app.py b/src/server/minimal_app.py index 06e5621..5e38562 100644 --- a/src/server/minimal_app.py +++ b/src/server/minimal_app.py @@ -12,10 +12,10 @@ from datetime import datetime sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) from main import SeriesApp -from core.entities.series import Serie -from core.entities import SerieList -from infrastructure.file_system import SerieScanner -from infrastructure.providers.provider_factory import Loaders +from server.core.entities.series import Serie +from server.core.entities import SerieList +from server.infrastructure.file_system import SerieScanner +from server.infrastructure.providers.provider_factory import Loaders from web.controllers.auth_controller import session_manager, require_auth, optional_auth from config import config from application.services.queue_service import download_queue_bp