sort extractors by site

phoenixthrush · Nov 8, 2024 · 3e0d0ec · 3e0d0ec
1 parent 17d942c
commit 3e0d0ec
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -415,7 +415,6 @@ These packages are automatically installed when you set up AniWorld Downloader u
   - [x] Fix mpv auto download on Windows 10
 
 ### Upcoming Tasks
-- [ ] Organize extractors by site
 - [ ] Syncplay support for other sites
 - [ ] Fix --only-direct-link language error
 - [ ] Sort argument help section

diff --git a/src/aniworld/common/adventure.py b/src/aniworld/common/adventure.py
@@ -74,8 +74,6 @@ def display_ascii_art():
 
 
 def adventure():
-    from ollama import ResponseError
-
     try:
         import ollama
     except ModuleNotFoundError:

diff --git a/src/aniworld/extractors/__init__.py b/src/aniworld/extractors/__init__.py
@@ -1,6 +1,4 @@
-from .doodstream import doodstream_get_direct_link
-from .streamtape import streamtape_get_direct_link
-from .vidoza import vidoza_get_direct_link
-from .voe import voe_get_direct_link
-
-from .streamkiste import streamkiste_get_direct_link
+from .aniworld.doodstream import doodstream_get_direct_link
+from .aniworld.streamtape import streamtape_get_direct_link
+from .aniworld.vidoza import vidoza_get_direct_link
+from .aniworld.voe import voe_get_direct_link
diff --git a/src/aniworld/extractors/doodstream.py → ...niworld/extractors/aniworld/doodstream.py b/src/aniworld/extractors/doodstream.py → ...niworld/extractors/aniworld/doodstream.py
diff --git a/src/aniworld/extractors/streamtape.py → ...niworld/extractors/aniworld/streamtape.py b/src/aniworld/extractors/streamtape.py → ...niworld/extractors/aniworld/streamtape.py
diff --git a/src/aniworld/extractors/vidoza.py → src/aniworld/extractors/aniworld/vidoza.py b/src/aniworld/extractors/vidoza.py → src/aniworld/extractors/aniworld/vidoza.py
diff --git a/src/aniworld/extractors/voe.py → src/aniworld/extractors/aniworld/voe.py b/src/aniworld/extractors/voe.py → src/aniworld/extractors/aniworld/voe.py
diff --git a/src/aniworld/extractors/nhentai.py → src/aniworld/extractors/nhentai/nhentai.py b/src/aniworld/extractors/nhentai.py → src/aniworld/extractors/nhentai/nhentai.py
diff --git a/src/aniworld/extractors/streamkiste.py → ...d/extractors/streamkistetv/streamkiste.py b/src/aniworld/extractors/streamkiste.py → ...d/extractors/streamkistetv/streamkiste.py