diff --git a/.idea/MangaManagerV2.iml b/.idea/MangaManagerV2.iml index 511aaa0e..a8ff6df5 100644 --- a/.idea/MangaManagerV2.iml +++ b/.idea/MangaManagerV2.iml @@ -2,8 +2,9 @@ - - + + + diff --git a/.idea/runConfigurations/Unittests.xml b/.idea/runConfigurations/Unittests.xml index f4b388b1..bab0214c 100644 --- a/.idea/runConfigurations/Unittests.xml +++ b/.idea/runConfigurations/Unittests.xml @@ -1,10 +1,11 @@ + diff --git a/MangaManager/MangaManagerCuda.spec b/MangaManager/MangaManagerCuda.spec deleted file mode 100644 index df8924e0..00000000 --- a/MangaManager/MangaManagerCuda.spec +++ /dev/null @@ -1,65 +0,0 @@ -# from update_version import update_version_file -# update_version_file() -from MangaManager.MangaManager.__version__ import __version__ as version_ -from platform import system -from datetime import date -from datetime import datetime -build_version = version_.split(":")[-1] -build_date = date.today() -release_name = "_".join( - ["MangaManager", - str(build_date.year), - str(build_date.month).zfill(2), - str(build_date.day).zfill(2), - str(datetime.now().hour).zfill(2), - str(datetime.now().minute).zfill(2), - str(datetime.now().second).zfill(2), - system(), build_version, "_Cuda"]) -# from PyInstaller.utils.hooks import collect_all - -# datas = collect_all('open_clip') -a = Analysis( - ['main.py'], - pathex=[], - binaries=[], - datas=[ - ( 'res/*', 'res'), - ('ExternalSources', 'ExternalSources'), - ('Extensions', 'Extensions'), - # THe following are picked from env variable. Please run python to include possible missing files - ('../.venv/Lib/site-packages/open_clip/model_configs/ViT-B-16-plus-240.json','open_clip/model_configs'), # To save the sv_ttk.tcl file - MISSING IMPORT - ('../.venv/Lib/site-packages/open_clip/bpe_simple_vocab_16e6.txt.gz','open_clip') # To save the sv_ttk.tcl file - MISSING IMPORT - - ], - hiddenimports=['PIL._tkinter_finder','tkinterdnd2.TkinterDnD','slugify'], - hookspath=['MangaManager/pyinstaller_hooks'], - hooksconfig={}, - runtime_hooks=[], - excludes=[], - win_no_prefer_redirects=False, - win_private_assemblies=False, - noarchive=False, - paths=["venv_3.11/Lib/site-packages"] # So it loads libraries from dev env first -# collect_all=True -) - -pyz = PYZ(a.pure, a.zipped_data) - -exe = EXE( - pyz, - a.scripts, - exclude_binaries=True, - name=release_name, - debug=False, - strip=False, - upx=True, - console=False, - icon=['res/icon.ico'], -) - -coll_Cuda = COLLECT(exe, - a.binaries, - a.datas, - strip=None, - upx=True, - name=release_name) \ No newline at end of file diff --git a/MangaManager/MangaManagerNoCuda.spec b/MangaManager/MangaManagerNoCuda.spec deleted file mode 100644 index ea20fc25..00000000 --- a/MangaManager/MangaManagerNoCuda.spec +++ /dev/null @@ -1,70 +0,0 @@ -# from update_version import update_version_file -# update_version_file() -import os -import pathlib -import platform -from MangaManager.MangaManager.__version__ import __version__ as version_ -from platform import system -from datetime import date -from datetime import datetime -build_version = version_.split(":")[-1] -build_date = date.today() -VENV = os.getenv("VIRTUAL_ENV") -if platform.system() == "Windows": - venv_path = VENV + "/Lib" -else: - venv_path = VENV + "/lib/python3.11" - -release_name = "_".join( - ["MangaManager", - str(build_date.year), - str(build_date.month).zfill(2), - str(build_date.day).zfill(2), - str(datetime.now().hour).zfill(2), - str(datetime.now().minute).zfill(2), - str(datetime.now().second).zfill(2), - system(), build_version, "_NoCuda"]) -open_clip_libs = [] - # (venv_path + '/site-packages/open_clip/model_configs/ViT-B-16-plus-240.json','open_clip/model_configs'), # To save the sv_ttk.tcl file - MISSING IMPORT - # (venv_path + '/site-packages/open_clip/bpe_simple_vocab_16e6.txt.gz','open_clip')] if pathlib.Path(venv_path,"site-packages","open_clip").exists() else [] # To save the sv_ttk.tcl file - MISSING IMPORT], -a = Analysis( - ['main.py'], - pathex=[], - binaries=[], - datas=[ - ( 'res/*', 'res'), - ('ExternalSources', 'ExternalSources'), - ('Extensions', 'Extensions'), - ] + open_clip_libs, - hiddenimports=['PIL._tkinter_finder','tkinterdnd2.TkinterDnD','slugify'], - hookspath=['MangaManager/pyinstaller_hooks'], - hooksconfig={}, - runtime_hooks=[], - excludes=['torch','numpy','cv2','open_clip','torchvision','torchaudio','tensorflow'], - win_no_prefer_redirects=False, - win_private_assemblies=False, - noarchive=False, - # paths=[venv_path +"/site-packages"] # So it loads libraries from dev env first -# collect_all=True -) - -pyz = PYZ(a.pure, a.zipped_data) - -exe = EXE( - pyz, - a.scripts, - exclude_binaries=True, - name=release_name, - debug=False, - strip=False, - upx=True, - console=False, - icon=['res/icon.ico'], -) - -coll_NoCuda = COLLECT(exe, - a.binaries, - a.datas, - strip=None, - upx=True, - name=release_name) \ No newline at end of file diff --git a/MangaManager/Extensions/CoverDownloader/CoverData.py b/src/Extensions/CoverDownloader/CoverData.py similarity index 100% rename from MangaManager/Extensions/CoverDownloader/CoverData.py rename to src/Extensions/CoverDownloader/CoverData.py diff --git a/MangaManager/Extensions/CoverDownloader/CoverDownloader.py b/src/Extensions/CoverDownloader/CoverDownloader.py similarity index 100% rename from MangaManager/Extensions/CoverDownloader/CoverDownloader.py rename to src/Extensions/CoverDownloader/CoverDownloader.py diff --git a/MangaManager/Extensions/CoverDownloader/MangaDex.py b/src/Extensions/CoverDownloader/MangaDex.py similarity index 100% rename from MangaManager/Extensions/CoverDownloader/MangaDex.py rename to src/Extensions/CoverDownloader/MangaDex.py diff --git a/MangaManager/Extensions/CoverDownloader/__init__.py b/src/Extensions/CoverDownloader/__init__.py similarity index 100% rename from MangaManager/Extensions/CoverDownloader/__init__.py rename to src/Extensions/CoverDownloader/__init__.py diff --git a/MangaManager/Extensions/CoverDownloader/exceptions.py b/src/Extensions/CoverDownloader/exceptions.py similarity index 100% rename from MangaManager/Extensions/CoverDownloader/exceptions.py rename to src/Extensions/CoverDownloader/exceptions.py diff --git a/MangaManager/Extensions/IExtensionApp.py b/src/Extensions/IExtensionApp.py similarity index 100% rename from MangaManager/Extensions/IExtensionApp.py rename to src/Extensions/IExtensionApp.py diff --git a/MangaManager/Extensions/Template.py b/src/Extensions/Template.py similarity index 100% rename from MangaManager/Extensions/Template.py rename to src/Extensions/Template.py diff --git a/MangaManager/Extensions/WebpConverter/WebpConverter.py b/src/Extensions/WebpConverter/WebpConverter.py similarity index 100% rename from MangaManager/Extensions/WebpConverter/WebpConverter.py rename to src/Extensions/WebpConverter/WebpConverter.py diff --git a/MangaManager/Extensions/WebpConverter/__init__.py b/src/Extensions/WebpConverter/__init__.py similarity index 100% rename from MangaManager/Extensions/WebpConverter/__init__.py rename to src/Extensions/WebpConverter/__init__.py diff --git a/MangaManager/Extensions/WebpConverter/processing.py b/src/Extensions/WebpConverter/processing.py similarity index 100% rename from MangaManager/Extensions/WebpConverter/processing.py rename to src/Extensions/WebpConverter/processing.py diff --git a/MangaManager/Extensions/__init__.py b/src/Extensions/__init__.py similarity index 100% rename from MangaManager/Extensions/__init__.py rename to src/Extensions/__init__.py diff --git a/MangaManager/ExternalSources/CoverSources/MangaDex/MangaDex.py b/src/ExternalSources/CoverSources/MangaDex/MangaDex.py similarity index 100% rename from MangaManager/ExternalSources/CoverSources/MangaDex/MangaDex.py rename to src/ExternalSources/CoverSources/MangaDex/MangaDex.py diff --git a/MangaManager/ExternalSources/CoverSources/MangaDex/__init__.py b/src/ExternalSources/CoverSources/MangaDex/__init__.py similarity index 100% rename from MangaManager/ExternalSources/CoverSources/MangaDex/__init__.py rename to src/ExternalSources/CoverSources/MangaDex/__init__.py diff --git a/MangaManager/ExternalSources/CoverSources/__init__.py b/src/ExternalSources/CoverSources/__init__.py similarity index 100% rename from MangaManager/ExternalSources/CoverSources/__init__.py rename to src/ExternalSources/CoverSources/__init__.py diff --git a/MangaManager/ExternalSources/MetadataSources/MetadataSourceFactory.py b/src/ExternalSources/MetadataSources/MetadataSourceFactory.py similarity index 100% rename from MangaManager/ExternalSources/MetadataSources/MetadataSourceFactory.py rename to src/ExternalSources/MetadataSources/MetadataSourceFactory.py diff --git a/MangaManager/ExternalSources/MetadataSources/Providers/AniList.py b/src/ExternalSources/MetadataSources/Providers/AniList.py similarity index 100% rename from MangaManager/ExternalSources/MetadataSources/Providers/AniList.py rename to src/ExternalSources/MetadataSources/Providers/AniList.py diff --git a/MangaManager/ExternalSources/MetadataSources/Providers/ComicVine.py b/src/ExternalSources/MetadataSources/Providers/ComicVine.py similarity index 100% rename from MangaManager/ExternalSources/MetadataSources/Providers/ComicVine.py rename to src/ExternalSources/MetadataSources/Providers/ComicVine.py diff --git a/MangaManager/ExternalSources/MetadataSources/Providers/MangaUpdates.py b/src/ExternalSources/MetadataSources/Providers/MangaUpdates.py similarity index 100% rename from MangaManager/ExternalSources/MetadataSources/Providers/MangaUpdates.py rename to src/ExternalSources/MetadataSources/Providers/MangaUpdates.py diff --git a/MangaManager/ExternalSources/MetadataSources/Providers/__init__.py b/src/ExternalSources/MetadataSources/Providers/__init__.py similarity index 100% rename from MangaManager/ExternalSources/MetadataSources/Providers/__init__.py rename to src/ExternalSources/MetadataSources/Providers/__init__.py diff --git a/MangaManager/ExternalSources/MetadataSources/__init__.py b/src/ExternalSources/MetadataSources/__init__.py similarity index 100% rename from MangaManager/ExternalSources/MetadataSources/__init__.py rename to src/ExternalSources/MetadataSources/__init__.py diff --git a/MangaManager/ExternalSources/__init__.py b/src/ExternalSources/__init__.py similarity index 100% rename from MangaManager/ExternalSources/__init__.py rename to src/ExternalSources/__init__.py diff --git a/MangaManager/MangaManager/Common/ResourceLoader.py b/src/MangaManager/Common/ResourceLoader.py similarity index 100% rename from MangaManager/MangaManager/Common/ResourceLoader.py rename to src/MangaManager/Common/ResourceLoader.py diff --git a/MangaManager/MangaManager/Common/TkErrorCatcher.py b/src/MangaManager/Common/TkErrorCatcher.py similarity index 100% rename from MangaManager/MangaManager/Common/TkErrorCatcher.py rename to src/MangaManager/Common/TkErrorCatcher.py diff --git a/MangaManager/MangaManager/Common/__init__.py b/src/MangaManager/Common/__init__.py similarity index 100% rename from MangaManager/MangaManager/Common/__init__.py rename to src/MangaManager/Common/__init__.py diff --git a/MangaManager/MangaManager/Common/errors.py b/src/MangaManager/Common/errors.py similarity index 100% rename from MangaManager/MangaManager/Common/errors.py rename to src/MangaManager/Common/errors.py diff --git a/MangaManager/MangaManager/Common/models/ComicInfo.xds b/src/MangaManager/Common/models/ComicInfo.xds similarity index 100% rename from MangaManager/MangaManager/Common/models/ComicInfo.xds rename to src/MangaManager/Common/models/ComicInfo.xds diff --git a/MangaManager/MangaManager/Common/naturalsorter.py b/src/MangaManager/Common/naturalsorter.py similarity index 100% rename from MangaManager/MangaManager/Common/naturalsorter.py rename to src/MangaManager/Common/naturalsorter.py diff --git a/MangaManager/MangaManager/Common/parser.py b/src/MangaManager/Common/parser.py similarity index 100% rename from MangaManager/MangaManager/Common/parser.py rename to src/MangaManager/Common/parser.py diff --git a/MangaManager/MangaManager/Common/progressbar.py b/src/MangaManager/Common/progressbar.py similarity index 100% rename from MangaManager/MangaManager/Common/progressbar.py rename to src/MangaManager/Common/progressbar.py diff --git a/MangaManager/MangaManager/Common/terminalcolors.py b/src/MangaManager/Common/terminalcolors.py similarity index 100% rename from MangaManager/MangaManager/Common/terminalcolors.py rename to src/MangaManager/Common/terminalcolors.py diff --git a/MangaManager/MangaManager/Common/utils.py b/src/MangaManager/Common/utils.py similarity index 100% rename from MangaManager/MangaManager/Common/utils.py rename to src/MangaManager/Common/utils.py diff --git a/MangaManager/MangaManager/DynamicLibController/__init__.py b/src/MangaManager/DynamicLibController/__init__.py similarity index 100% rename from MangaManager/MangaManager/DynamicLibController/__init__.py rename to src/MangaManager/DynamicLibController/__init__.py diff --git a/MangaManager/MangaManager/DynamicLibController/extension_manager.py b/src/MangaManager/DynamicLibController/extension_manager.py similarity index 100% rename from MangaManager/MangaManager/DynamicLibController/extension_manager.py rename to src/MangaManager/DynamicLibController/extension_manager.py diff --git a/MangaManager/MangaManager/DynamicLibController/models/CoverSourceInterface.py b/src/MangaManager/DynamicLibController/models/CoverSourceInterface.py similarity index 100% rename from MangaManager/MangaManager/DynamicLibController/models/CoverSourceInterface.py rename to src/MangaManager/DynamicLibController/models/CoverSourceInterface.py diff --git a/MangaManager/MangaManager/DynamicLibController/models/ExtensionsInterface.py b/src/MangaManager/DynamicLibController/models/ExtensionsInterface.py similarity index 100% rename from MangaManager/MangaManager/DynamicLibController/models/ExtensionsInterface.py rename to src/MangaManager/DynamicLibController/models/ExtensionsInterface.py diff --git a/MangaManager/MangaManager/DynamicLibController/models/IMetadataSource.py b/src/MangaManager/DynamicLibController/models/IMetadataSource.py similarity index 100% rename from MangaManager/MangaManager/DynamicLibController/models/IMetadataSource.py rename to src/MangaManager/DynamicLibController/models/IMetadataSource.py diff --git a/MangaManager/MangaManager/DynamicLibController/models/__init__.py b/src/MangaManager/DynamicLibController/models/__init__.py similarity index 100% rename from MangaManager/MangaManager/DynamicLibController/models/__init__.py rename to src/MangaManager/DynamicLibController/models/__init__.py diff --git a/MangaManager/MangaManager/LoadedComicInfo/ArchiveFile.py b/src/MangaManager/LoadedComicInfo/ArchiveFile.py similarity index 100% rename from MangaManager/MangaManager/LoadedComicInfo/ArchiveFile.py rename to src/MangaManager/LoadedComicInfo/ArchiveFile.py diff --git a/MangaManager/MangaManager/LoadedComicInfo/CoverActions.py b/src/MangaManager/LoadedComicInfo/CoverActions.py similarity index 100% rename from MangaManager/MangaManager/LoadedComicInfo/CoverActions.py rename to src/MangaManager/LoadedComicInfo/CoverActions.py diff --git a/MangaManager/MangaManager/LoadedComicInfo/ILoadedComicInfo.py b/src/MangaManager/LoadedComicInfo/ILoadedComicInfo.py similarity index 100% rename from MangaManager/MangaManager/LoadedComicInfo/ILoadedComicInfo.py rename to src/MangaManager/LoadedComicInfo/ILoadedComicInfo.py diff --git a/MangaManager/MangaManager/LoadedComicInfo/LoadedComicInfo.py b/src/MangaManager/LoadedComicInfo/LoadedComicInfo.py similarity index 100% rename from MangaManager/MangaManager/LoadedComicInfo/LoadedComicInfo.py rename to src/MangaManager/LoadedComicInfo/LoadedComicInfo.py diff --git a/MangaManager/MangaManager/LoadedComicInfo/LoadedFileCoverData.py b/src/MangaManager/LoadedComicInfo/LoadedFileCoverData.py similarity index 100% rename from MangaManager/MangaManager/LoadedComicInfo/LoadedFileCoverData.py rename to src/MangaManager/LoadedComicInfo/LoadedFileCoverData.py diff --git a/MangaManager/MangaManager/LoadedComicInfo/LoadedFileMetadata.py b/src/MangaManager/LoadedComicInfo/LoadedFileMetadata.py similarity index 100% rename from MangaManager/MangaManager/LoadedComicInfo/LoadedFileMetadata.py rename to src/MangaManager/LoadedComicInfo/LoadedFileMetadata.py diff --git a/MangaManager/MangaManager/LoadedComicInfo/__init__.py b/src/MangaManager/LoadedComicInfo/__init__.py similarity index 100% rename from MangaManager/MangaManager/LoadedComicInfo/__init__.py rename to src/MangaManager/LoadedComicInfo/__init__.py diff --git a/MangaManager/MangaManager/MetadataManager/CoverManager/CoverManager.py b/src/MangaManager/MetadataManager/CoverManager/CoverManager.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/CoverManager/CoverManager.py rename to src/MangaManager/MetadataManager/CoverManager/CoverManager.py diff --git a/MangaManager/MangaManager/MetadataManager/CoverManager/__init__.py b/src/MangaManager/MetadataManager/CoverManager/__init__.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/CoverManager/__init__.py rename to src/MangaManager/MetadataManager/CoverManager/__init__.py diff --git a/MangaManager/MangaManager/MetadataManager/CoverManager/torchlib.py b/src/MangaManager/MetadataManager/CoverManager/torchlib.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/CoverManager/torchlib.py rename to src/MangaManager/MetadataManager/CoverManager/torchlib.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/ControlManager.py b/src/MangaManager/MetadataManager/GUI/ControlManager.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/ControlManager.py rename to src/MangaManager/MetadataManager/GUI/ControlManager.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/ExceptionWindow.py b/src/MangaManager/MetadataManager/GUI/ExceptionWindow.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/ExceptionWindow.py rename to src/MangaManager/MetadataManager/GUI/ExceptionWindow.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/FileChooserWindow.py b/src/MangaManager/MetadataManager/GUI/FileChooserWindow.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/FileChooserWindow.py rename to src/MangaManager/MetadataManager/GUI/FileChooserWindow.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/MessageBox.py b/src/MangaManager/MetadataManager/GUI/MessageBox.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/MessageBox.py rename to src/MangaManager/MetadataManager/GUI/MessageBox.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/OneTimeMessageBox.py b/src/MangaManager/MetadataManager/GUI/OneTimeMessageBox.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/OneTimeMessageBox.py rename to src/MangaManager/MetadataManager/GUI/OneTimeMessageBox.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/__init__.py b/src/MangaManager/MetadataManager/GUI/__init__.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/__init__.py rename to src/MangaManager/MetadataManager/GUI/__init__.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/scrolledframe.py b/src/MangaManager/MetadataManager/GUI/scrolledframe.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/scrolledframe.py rename to src/MangaManager/MetadataManager/GUI/scrolledframe.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/utils.py b/src/MangaManager/MetadataManager/GUI/utils.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/utils.py rename to src/MangaManager/MetadataManager/GUI/utils.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/AutocompleteComboboxWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/AutocompleteComboboxWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/AutocompleteComboboxWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/AutocompleteComboboxWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/ButtonWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/ButtonWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/ButtonWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/ButtonWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/CanvasCoverWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/CanvasCoverWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/CanvasCoverWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/CanvasCoverWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/ComboBoxWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/ComboBoxWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/ComboBoxWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/ComboBoxWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/FileMultiSelectWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/FileMultiSelectWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/FileMultiSelectWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/FileMultiSelectWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/FormBundleWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/FormBundleWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/FormBundleWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/FormBundleWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/HyperlinkLabelWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/HyperlinkLabelWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/HyperlinkLabelWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/HyperlinkLabelWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/LongTextWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/LongTextWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/LongTextWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/LongTextWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/MMWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/MMWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/MMWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/MMWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/MessageBoxWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/MessageBoxWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/MessageBoxWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/MessageBoxWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/OptionMenuWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/OptionMenuWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/OptionMenuWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/OptionMenuWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/ProgressBarWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/ProgressBarWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/ProgressBarWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/ProgressBarWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/ScrolledFrameWidget.py b/src/MangaManager/MetadataManager/GUI/widgets/ScrolledFrameWidget.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/ScrolledFrameWidget.py rename to src/MangaManager/MetadataManager/GUI/widgets/ScrolledFrameWidget.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/WidgetManager.py b/src/MangaManager/MetadataManager/GUI/widgets/WidgetManager.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/WidgetManager.py rename to src/MangaManager/MetadataManager/GUI/widgets/WidgetManager.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/__init__.py b/src/MangaManager/MetadataManager/GUI/widgets/__init__.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/widgets/__init__.py rename to src/MangaManager/MetadataManager/GUI/widgets/__init__.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/windows/AboutWindow.py b/src/MangaManager/MetadataManager/GUI/windows/AboutWindow.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/windows/AboutWindow.py rename to src/MangaManager/MetadataManager/GUI/windows/AboutWindow.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/windows/DragAndDrop.py b/src/MangaManager/MetadataManager/GUI/windows/DragAndDrop.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/windows/DragAndDrop.py rename to src/MangaManager/MetadataManager/GUI/windows/DragAndDrop.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/windows/LoadingWindow.py b/src/MangaManager/MetadataManager/GUI/windows/LoadingWindow.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/windows/LoadingWindow.py rename to src/MangaManager/MetadataManager/GUI/windows/LoadingWindow.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/windows/MainWindow.py b/src/MangaManager/MetadataManager/GUI/windows/MainWindow.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/windows/MainWindow.py rename to src/MangaManager/MetadataManager/GUI/windows/MainWindow.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/windows/SettingsWindow.py b/src/MangaManager/MetadataManager/GUI/windows/SettingsWindow.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/windows/SettingsWindow.py rename to src/MangaManager/MetadataManager/GUI/windows/SettingsWindow.py diff --git a/MangaManager/MangaManager/MetadataManager/GUI/windows/__init__.py b/src/MangaManager/MetadataManager/GUI/windows/__init__.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/GUI/windows/__init__.py rename to src/MangaManager/MetadataManager/GUI/windows/__init__.py diff --git a/MangaManager/MangaManager/MetadataManager/MetadataManagerCLI.py b/src/MangaManager/MetadataManager/MetadataManagerCLI.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/MetadataManagerCLI.py rename to src/MangaManager/MetadataManager/MetadataManagerCLI.py diff --git a/MangaManager/MangaManager/MetadataManager/MetadataManagerGUI.py b/src/MangaManager/MetadataManager/MetadataManagerGUI.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/MetadataManagerGUI.py rename to src/MangaManager/MetadataManager/MetadataManagerGUI.py diff --git a/MangaManager/MangaManager/MetadataManager/MetadataManagerLib.py b/src/MangaManager/MetadataManager/MetadataManagerLib.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/MetadataManagerLib.py rename to src/MangaManager/MetadataManager/MetadataManagerLib.py diff --git a/MangaManager/MangaManager/MetadataManager/__init__.py b/src/MangaManager/MetadataManager/__init__.py similarity index 100% rename from MangaManager/MangaManager/MetadataManager/__init__.py rename to src/MangaManager/MetadataManager/__init__.py diff --git a/MangaManager/MangaManager/Settings/SettingControl.py b/src/MangaManager/Settings/SettingControl.py similarity index 100% rename from MangaManager/MangaManager/Settings/SettingControl.py rename to src/MangaManager/Settings/SettingControl.py diff --git a/MangaManager/MangaManager/Settings/SettingSection.py b/src/MangaManager/Settings/SettingSection.py similarity index 100% rename from MangaManager/MangaManager/Settings/SettingSection.py rename to src/MangaManager/Settings/SettingSection.py diff --git a/MangaManager/MangaManager/Settings/Settings.py b/src/MangaManager/Settings/Settings.py similarity index 100% rename from MangaManager/MangaManager/Settings/Settings.py rename to src/MangaManager/Settings/Settings.py diff --git a/MangaManager/MangaManager/Settings/SettingsDefault.py b/src/MangaManager/Settings/SettingsDefault.py similarity index 100% rename from MangaManager/MangaManager/Settings/SettingsDefault.py rename to src/MangaManager/Settings/SettingsDefault.py diff --git a/MangaManager/MangaManager/Settings/__init__.py b/src/MangaManager/Settings/__init__.py similarity index 100% rename from MangaManager/MangaManager/Settings/__init__.py rename to src/MangaManager/Settings/__init__.py diff --git a/MangaManager/MangaManager/__init__.py b/src/MangaManager/__init__.py similarity index 100% rename from MangaManager/MangaManager/__init__.py rename to src/MangaManager/__init__.py diff --git a/MangaManager/MangaManager/__version__.py b/src/MangaManager/__version__.py similarity index 100% rename from MangaManager/MangaManager/__version__.py rename to src/MangaManager/__version__.py diff --git a/MangaManager/logging_setup.py b/src/logging_setup.py similarity index 100% rename from MangaManager/logging_setup.py rename to src/logging_setup.py diff --git a/MangaManager/main.py b/src/main.py similarity index 100% rename from MangaManager/main.py rename to src/main.py diff --git a/MangaManager/pyinstaller_hooks/hook-tkinterdnd2.py b/src/pyinstaller_hooks/hook-tkinterdnd2.py similarity index 100% rename from MangaManager/pyinstaller_hooks/hook-tkinterdnd2.py rename to src/pyinstaller_hooks/hook-tkinterdnd2.py diff --git a/MangaManager/res/clear_icon.png b/src/res/clear_icon.png similarity index 100% rename from MangaManager/res/clear_icon.png rename to src/res/clear_icon.png diff --git a/MangaManager/res/cover_action_template.png b/src/res/cover_action_template.png similarity index 100% rename from MangaManager/res/cover_action_template.png rename to src/res/cover_action_template.png diff --git a/MangaManager/res/fetch_online_ico.png b/src/res/fetch_online_ico.png similarity index 100% rename from MangaManager/res/fetch_online_ico.png rename to src/res/fetch_online_ico.png diff --git a/MangaManager/res/filename_fill_icon.png b/src/res/filename_fill_icon.png similarity index 100% rename from MangaManager/res/filename_fill_icon.png rename to src/res/filename_fill_icon.png diff --git a/MangaManager/res/fox-icon.png b/src/res/fox-icon.png similarity index 100% rename from MangaManager/res/fox-icon.png rename to src/res/fox-icon.png diff --git a/MangaManager/res/icon-bak.ico b/src/res/icon-bak.ico similarity index 100% rename from MangaManager/res/icon-bak.ico rename to src/res/icon-bak.ico diff --git a/MangaManager/res/icon.ico b/src/res/icon.ico similarity index 100% rename from MangaManager/res/icon.ico rename to src/res/icon.ico diff --git a/MangaManager/res/icon.png b/src/res/icon.png similarity index 100% rename from MangaManager/res/icon.png rename to src/res/icon.png diff --git a/MangaManager/res/languages.json b/src/res/languages.json similarity index 100% rename from MangaManager/res/languages.json rename to src/res/languages.json diff --git a/MangaManager/res/maintenance-icon.png b/src/res/maintenance-icon.png similarity index 100% rename from MangaManager/res/maintenance-icon.png rename to src/res/maintenance-icon.png diff --git a/MangaManager/res/open_file.png b/src/res/open_file.png similarity index 100% rename from MangaManager/res/open_file.png rename to src/res/open_file.png diff --git a/MangaManager/res/open_folder.png b/src/res/open_folder.png similarity index 100% rename from MangaManager/res/open_folder.png rename to src/res/open_folder.png diff --git a/MangaManager/res/save_icon.png b/src/res/save_icon.png similarity index 100% rename from MangaManager/res/save_icon.png rename to src/res/save_icon.png diff --git a/MangaManager/res/settings.png b/src/res/settings.png similarity index 100% rename from MangaManager/res/settings.png rename to src/res/settings.png diff --git a/src/test_settings.ini b/src/test_settings.ini new file mode 100644 index 00000000..1470b202 --- /dev/null +++ b/src/test_settings.ini @@ -0,0 +1,18 @@ +[Main] +library_path = test_dir +covers_folder_path = +cache_cover_images = True +create_backup_comicinfo = True +move_to_template = +remove_old_selection_on_drag_drop = True +darkmode_enabled = False + +[Webp Converter] +default_base_path = + +[External Sources] +default_metadata_source = AniList +default_cover_source = MangaDex + +[Message Box] + diff --git a/MangaManager/tests/Common/__init__.py b/src/tests/Common/__init__.py similarity index 100% rename from MangaManager/tests/Common/__init__.py rename to src/tests/Common/__init__.py diff --git a/MangaManager/tests/Common/test_ComicInfo.py b/src/tests/Common/test_ComicInfo.py similarity index 100% rename from MangaManager/tests/Common/test_ComicInfo.py rename to src/tests/Common/test_ComicInfo.py diff --git a/MangaManager/tests/Common/test_utils.py b/src/tests/Common/test_utils.py similarity index 100% rename from MangaManager/tests/Common/test_utils.py rename to src/tests/Common/test_utils.py diff --git a/MangaManager/tests/ExtensionsTests/__init__.py b/src/tests/ExtensionsTests/__init__.py similarity index 100% rename from MangaManager/tests/ExtensionsTests/__init__.py rename to src/tests/ExtensionsTests/__init__.py diff --git a/MangaManager/tests/ExtensionsTests/test_WebpConverter.py b/src/tests/ExtensionsTests/test_WebpConverter.py similarity index 100% rename from MangaManager/tests/ExtensionsTests/test_WebpConverter.py rename to src/tests/ExtensionsTests/test_WebpConverter.py diff --git a/MangaManager/tests/ExternalMetadataTests/__init__.py b/src/tests/ExternalMetadataTests/__init__.py similarity index 100% rename from MangaManager/tests/ExternalMetadataTests/__init__.py rename to src/tests/ExternalMetadataTests/__init__.py diff --git a/MangaManager/tests/ExternalMetadataTests/test_AniList.py b/src/tests/ExternalMetadataTests/test_AniList.py similarity index 100% rename from MangaManager/tests/ExternalMetadataTests/test_AniList.py rename to src/tests/ExternalMetadataTests/test_AniList.py diff --git a/MangaManager/tests/LoadedComicInfo/__init__.py b/src/tests/LoadedComicInfo/__init__.py similarity index 100% rename from MangaManager/tests/LoadedComicInfo/__init__.py rename to src/tests/LoadedComicInfo/__init__.py diff --git a/MangaManager/tests/LoadedComicInfo/test_Covers.py b/src/tests/LoadedComicInfo/test_Covers.py similarity index 100% rename from MangaManager/tests/LoadedComicInfo/test_Covers.py rename to src/tests/LoadedComicInfo/test_Covers.py diff --git a/MangaManager/tests/LoadedComicInfo/test_LoadedCInfo.py b/src/tests/LoadedComicInfo/test_LoadedCInfo.py similarity index 100% rename from MangaManager/tests/LoadedComicInfo/test_LoadedCInfo.py rename to src/tests/LoadedComicInfo/test_LoadedCInfo.py diff --git a/MangaManager/tests/LoadedComicInfo/test_LoadedCInfo_backup.py b/src/tests/LoadedComicInfo/test_LoadedCInfo_backup.py similarity index 100% rename from MangaManager/tests/LoadedComicInfo/test_LoadedCInfo_backup.py rename to src/tests/LoadedComicInfo/test_LoadedCInfo_backup.py diff --git a/MangaManager/tests/LoadedComicInfo/test_moveto.py b/src/tests/LoadedComicInfo/test_moveto.py similarity index 100% rename from MangaManager/tests/LoadedComicInfo/test_moveto.py rename to src/tests/LoadedComicInfo/test_moveto.py diff --git a/MangaManager/tests/MetadataManagerTests/GUI/__init__.py b/src/tests/MetadataManagerTests/GUI/__init__.py similarity index 100% rename from MangaManager/tests/MetadataManagerTests/GUI/__init__.py rename to src/tests/MetadataManagerTests/GUI/__init__.py diff --git a/MangaManager/tests/MetadataManagerTests/GUI/test_MetadataEditorGUI.py b/src/tests/MetadataManagerTests/GUI/test_MetadataEditorGUI.py similarity index 100% rename from MangaManager/tests/MetadataManagerTests/GUI/test_MetadataEditorGUI.py rename to src/tests/MetadataManagerTests/GUI/test_MetadataEditorGUI.py diff --git a/MangaManager/tests/MetadataManagerTests/GUI/test_dinamic_layouts.py b/src/tests/MetadataManagerTests/GUI/test_dinamic_layouts.py similarity index 100% rename from MangaManager/tests/MetadataManagerTests/GUI/test_dinamic_layouts.py rename to src/tests/MetadataManagerTests/GUI/test_dinamic_layouts.py diff --git a/MangaManager/tests/MetadataManagerTests/GUI/test_fetch_metadata.py b/src/tests/MetadataManagerTests/GUI/test_fetch_metadata.py similarity index 100% rename from MangaManager/tests/MetadataManagerTests/GUI/test_fetch_metadata.py rename to src/tests/MetadataManagerTests/GUI/test_fetch_metadata.py diff --git a/MangaManager/tests/MetadataManagerTests/__init__.py b/src/tests/MetadataManagerTests/__init__.py similarity index 100% rename from MangaManager/tests/MetadataManagerTests/__init__.py rename to src/tests/MetadataManagerTests/__init__.py diff --git a/MangaManager/tests/MetadataManagerTests/test_MetadataEditorCore.py b/src/tests/MetadataManagerTests/test_MetadataEditorCore.py similarity index 100% rename from MangaManager/tests/MetadataManagerTests/test_MetadataEditorCore.py rename to src/tests/MetadataManagerTests/test_MetadataEditorCore.py diff --git a/MangaManager/tests/Settings/__init__.py b/src/tests/Settings/__init__.py similarity index 100% rename from MangaManager/tests/Settings/__init__.py rename to src/tests/Settings/__init__.py diff --git a/MangaManager/tests/Settings/test_Settings.py b/src/tests/Settings/test_Settings.py similarity index 100% rename from MangaManager/tests/Settings/test_Settings.py rename to src/tests/Settings/test_Settings.py diff --git a/MangaManager/tests/__init__.py b/src/tests/__init__.py similarity index 100% rename from MangaManager/tests/__init__.py rename to src/tests/__init__.py diff --git a/MangaManager/tests/common.py b/src/tests/common.py similarity index 100% rename from MangaManager/tests/common.py rename to src/tests/common.py diff --git a/MangaManager/tests/data/!00_SAMPLE_FILE.CBZ b/src/tests/data/!00_SAMPLE_FILE.CBZ similarity index 100% rename from MangaManager/tests/data/!00_SAMPLE_FILE.CBZ rename to src/tests/data/!00_SAMPLE_FILE.CBZ diff --git a/MangaManager/tests/data/!00_SAMPLE_FILE.rar b/src/tests/data/!00_SAMPLE_FILE.rar similarity index 100% rename from MangaManager/tests/data/!00_SAMPLE_FILE.rar rename to src/tests/data/!00_SAMPLE_FILE.rar diff --git a/MangaManager/tests/data/test.py b/src/tests/data/test.py similarity index 100% rename from MangaManager/tests/data/test.py rename to src/tests/data/test.py diff --git a/MangaManager/tests/test_comicinfo.py b/src/tests/test_comicinfo.py similarity index 100% rename from MangaManager/tests/test_comicinfo.py rename to src/tests/test_comicinfo.py diff --git a/update_version.py b/update_version.py index a4d4a10a..993bc670 100644 --- a/update_version.py +++ b/update_version.py @@ -6,7 +6,7 @@ def update_version_file(): """Updates the version file with the hash from prev-rev.""" version_file_path = os.path.join( - os.path.dirname(__file__), "MangaManager","src", "__version__.py" + os.path.dirname(__file__), "MangaManager", "__version__.py" ) # Read the version file