diff --git a/twitter_video_tools/__init__.py b/twitter_video_tools/__init__.py index e69de29..5d2713c 100644 --- a/twitter_video_tools/__init__.py +++ b/twitter_video_tools/__init__.py @@ -0,0 +1,4 @@ +# pylint: disable=useless-import-alias + +from .twitter_crawler import TwitterCrawler as TwitterCrawler +from .video_downloader import VideoDownloader as VideoDownloader diff --git a/twitter_video_tools/utils/monsnode_parser.py b/twitter_video_tools/monsnode_parser.py similarity index 100% rename from twitter_video_tools/utils/monsnode_parser.py rename to twitter_video_tools/monsnode_parser.py diff --git a/twitter_video_tools/utils/platform_video_downloader.py b/twitter_video_tools/platform_video_downloader.py similarity index 97% rename from twitter_video_tools/utils/platform_video_downloader.py rename to twitter_video_tools/platform_video_downloader.py index 0a96035..714f0dc 100644 --- a/twitter_video_tools/utils/platform_video_downloader.py +++ b/twitter_video_tools/platform_video_downloader.py @@ -5,7 +5,7 @@ from .monsnode_parser import MonsnodeParser from .twitter_crawler import TwitterCrawler -from .youtube_dl_wrapper import youtube_dl_wrapper +from .utils.youtube_dl_wrapper import youtube_dl_wrapper class PlatformVideoDownloader: diff --git a/twitter_video_tools/utils/tests/__init__.py b/twitter_video_tools/tests/__init__.py similarity index 100% rename from twitter_video_tools/utils/tests/__init__.py rename to twitter_video_tools/tests/__init__.py diff --git a/twitter_video_tools/utils/tests/test_monsnode_parser.py b/twitter_video_tools/tests/test_monsnode_parser.py similarity index 95% rename from twitter_video_tools/utils/tests/test_monsnode_parser.py rename to twitter_video_tools/tests/test_monsnode_parser.py index ec4cd0d..4697d8b 100644 --- a/twitter_video_tools/utils/tests/test_monsnode_parser.py +++ b/twitter_video_tools/tests/test_monsnode_parser.py @@ -2,7 +2,7 @@ import pytest import requests -from twitter_video_tools.utils import MonsnodeParser +from ..monsnode_parser import MonsnodeParser def test_is_target_reachable(monsnode_parser: MonsnodeParser) -> None: diff --git a/twitter_video_tools/utils/twitter_crawler.py b/twitter_video_tools/twitter_crawler.py similarity index 100% rename from twitter_video_tools/utils/twitter_crawler.py rename to twitter_video_tools/twitter_crawler.py diff --git a/twitter_video_tools/utils/__init__.py b/twitter_video_tools/utils/__init__.py index 6b5fa17..bc486f5 100644 --- a/twitter_video_tools/utils/__init__.py +++ b/twitter_video_tools/utils/__init__.py @@ -1,5 +1,4 @@ # pylint: disable=useless-import-alias -from .monsnode_parser import MonsnodeParser as MonsnodeParser -from .twitter_crawler import TwitterCrawler as TwitterCrawler -from .video_downloader import VideoDownloader as VideoDownloader +from .execute_parallel import execute_parallel as execute_parallel +from .youtube_dl_wrapper import youtube_dl_wrapper as youtube_dl_wrapper diff --git a/twitter_video_tools/utils/video_downloader.py b/twitter_video_tools/video_downloader.py similarity index 88% rename from twitter_video_tools/utils/video_downloader.py rename to twitter_video_tools/video_downloader.py index ede860d..c3967a1 100644 --- a/twitter_video_tools/utils/video_downloader.py +++ b/twitter_video_tools/video_downloader.py @@ -2,9 +2,11 @@ from typing import Optional -from .execute_parallel import execute_parallel +from twitter_video_tools.platform_video_downloader import \ + PlatformVideoDownloader +from twitter_video_tools.utils import execute_parallel + from .monsnode_parser import MonsnodeParser -from .platform_video_downloader import PlatformVideoDownloader class VideoDownloader: