From 79180885b51c2fd75dfe558b0ab779f6d5ce6e5b Mon Sep 17 00:00:00 2001 From: Pau Ruiz i Safont Date: Sat, 10 Mar 2018 19:00:56 +0000 Subject: [PATCH 1/2] feature: enable python packaging --- .gitignore | 105 ++++++++++++++++++ .../KindleUnpack}/__init__.py | 0 .../KindleUnpack}/compatibility_utils.py | 0 .../KindleUnpack}/kindleunpack.py | 0 .../KindleUnpack}/mobi_cover.py | 0 .../KindleUnpack}/mobi_dict.py | 0 .../KindleUnpack}/mobi_header.py | 0 .../KindleUnpack}/mobi_html.py | 0 .../KindleUnpack}/mobi_index.py | 0 .../KindleUnpack}/mobi_k8proc.py | 0 .../KindleUnpack}/mobi_k8resc.py | 0 .../KindleUnpack}/mobi_nav.py | 0 .../KindleUnpack}/mobi_ncx.py | 0 .../KindleUnpack}/mobi_opf.py | 0 .../KindleUnpack}/mobi_pagemap.py | 0 .../KindleUnpack}/mobi_sectioner.py | 0 .../KindleUnpack}/mobi_split.py | 0 .../KindleUnpack}/mobi_uncompress.py | 0 .../KindleUnpack}/mobi_utils.py | 0 .../KindleUnpack}/mobiml2xhtml.py | 0 .../KindleUnpack}/unipath.py | 0 .../KindleUnpack}/unpack_structure.py | 0 __main__.py => lector/__main__.py | 0 database.py => lector/database.py | 0 .../definitionsdialog.py | 0 delegates.py => lector/delegates.py | 0 {ePub => lector/ePub}/__init__.py | 0 {ePub => lector/ePub}/read_epub.py | 0 library.py => lector/library.py | 0 metadatadialog.py => lector/metadatadialog.py | 0 models.py => lector/models.py | 0 {parsers => lector/parsers}/__init__.py | 0 {parsers => lector/parsers}/cbr.py | 0 {parsers => lector/parsers}/cbz.py | 0 {parsers => lector/parsers}/epub.py | 0 {parsers => lector/parsers}/mobi.py | 0 {rarfile => lector/rarfile}/LICENSE | 0 {rarfile => lector/rarfile}/__init__.py | 0 {rarfile => lector/rarfile}/dumprar.py | 0 {rarfile => lector/rarfile}/rarfile.py | 0 {resources => lector/resources}/__init__.py | 0 {resources => lector/resources}/about.html | 0 .../resources}/definitions.py | 0 {resources => lector/resources}/mainwindow.py | 0 {resources => lector/resources}/metadata.py | 0 {resources => lector/resources}/pie_chart.py | 0 .../resources}/raw/NotFound.png | Bin .../resources}/raw/QMPlay2.svg | 0 {resources => lector/resources}/raw/blank.png | Bin .../resources}/raw/checkmark.svg | 0 {resources => lector/resources}/raw/color.svg | 0 .../resources}/raw/definition.ui | 0 {resources => lector/resources}/raw/error.svg | 0 .../resources}/raw/gray-shadow.png | Bin {resources => lector/resources}/raw/main.ui | 0 .../resources}/raw/metadata.ui | 0 .../resources}/raw/resources.qrc | 0 .../resources}/raw/settings.ui | 0 {resources => lector/resources}/resources.py | 0 .../resources}/settingswindow.py | 0 settings.py => lector/settings.py | 0 settingsdialog.py => lector/settingsdialog.py | 0 sorter.py => lector/sorter.py | 0 threaded.py => lector/threaded.py | 0 toolbars.py => lector/toolbars.py | 0 widgets.py => lector/widgets.py | 0 setup.cfg | 5 + setup.py | 80 +++++++++++++ 68 files changed, 190 insertions(+) create mode 100644 .gitignore rename {KindleUnpack => lector/KindleUnpack}/__init__.py (100%) rename {KindleUnpack => lector/KindleUnpack}/compatibility_utils.py (100%) rename {KindleUnpack => lector/KindleUnpack}/kindleunpack.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_cover.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_dict.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_header.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_html.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_index.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_k8proc.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_k8resc.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_nav.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_ncx.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_opf.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_pagemap.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_sectioner.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_split.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_uncompress.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobi_utils.py (100%) rename {KindleUnpack => lector/KindleUnpack}/mobiml2xhtml.py (100%) rename {KindleUnpack => lector/KindleUnpack}/unipath.py (100%) rename {KindleUnpack => lector/KindleUnpack}/unpack_structure.py (100%) rename __main__.py => lector/__main__.py (100%) rename database.py => lector/database.py (100%) rename definitionsdialog.py => lector/definitionsdialog.py (100%) rename delegates.py => lector/delegates.py (100%) rename {ePub => lector/ePub}/__init__.py (100%) rename {ePub => lector/ePub}/read_epub.py (100%) rename library.py => lector/library.py (100%) rename metadatadialog.py => lector/metadatadialog.py (100%) rename models.py => lector/models.py (100%) rename {parsers => lector/parsers}/__init__.py (100%) rename {parsers => lector/parsers}/cbr.py (100%) rename {parsers => lector/parsers}/cbz.py (100%) rename {parsers => lector/parsers}/epub.py (100%) rename {parsers => lector/parsers}/mobi.py (100%) rename {rarfile => lector/rarfile}/LICENSE (100%) rename {rarfile => lector/rarfile}/__init__.py (100%) rename {rarfile => lector/rarfile}/dumprar.py (100%) rename {rarfile => lector/rarfile}/rarfile.py (100%) rename {resources => lector/resources}/__init__.py (100%) rename {resources => lector/resources}/about.html (100%) rename {resources => lector/resources}/definitions.py (100%) rename {resources => lector/resources}/mainwindow.py (100%) rename {resources => lector/resources}/metadata.py (100%) rename {resources => lector/resources}/pie_chart.py (100%) rename {resources => lector/resources}/raw/NotFound.png (100%) rename {resources => lector/resources}/raw/QMPlay2.svg (100%) rename {resources => lector/resources}/raw/blank.png (100%) rename {resources => lector/resources}/raw/checkmark.svg (100%) rename {resources => lector/resources}/raw/color.svg (100%) rename {resources => lector/resources}/raw/definition.ui (100%) rename {resources => lector/resources}/raw/error.svg (100%) rename {resources => lector/resources}/raw/gray-shadow.png (100%) rename {resources => lector/resources}/raw/main.ui (100%) rename {resources => lector/resources}/raw/metadata.ui (100%) rename {resources => lector/resources}/raw/resources.qrc (100%) rename {resources => lector/resources}/raw/settings.ui (100%) rename {resources => lector/resources}/resources.py (100%) rename {resources => lector/resources}/settingswindow.py (100%) rename settings.py => lector/settings.py (100%) rename settingsdialog.py => lector/settingsdialog.py (100%) rename sorter.py => lector/sorter.py (100%) rename threaded.py => lector/threaded.py (100%) rename toolbars.py => lector/toolbars.py (100%) rename widgets.py => lector/widgets.py (100%) create mode 100644 setup.cfg create mode 100644 setup.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b989be6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,105 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +.static_storage/ +.media/ +local_settings.py + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ diff --git a/KindleUnpack/__init__.py b/lector/KindleUnpack/__init__.py similarity index 100% rename from KindleUnpack/__init__.py rename to lector/KindleUnpack/__init__.py diff --git a/KindleUnpack/compatibility_utils.py b/lector/KindleUnpack/compatibility_utils.py similarity index 100% rename from KindleUnpack/compatibility_utils.py rename to lector/KindleUnpack/compatibility_utils.py diff --git a/KindleUnpack/kindleunpack.py b/lector/KindleUnpack/kindleunpack.py similarity index 100% rename from KindleUnpack/kindleunpack.py rename to lector/KindleUnpack/kindleunpack.py diff --git a/KindleUnpack/mobi_cover.py b/lector/KindleUnpack/mobi_cover.py similarity index 100% rename from KindleUnpack/mobi_cover.py rename to lector/KindleUnpack/mobi_cover.py diff --git a/KindleUnpack/mobi_dict.py b/lector/KindleUnpack/mobi_dict.py similarity index 100% rename from KindleUnpack/mobi_dict.py rename to lector/KindleUnpack/mobi_dict.py diff --git a/KindleUnpack/mobi_header.py b/lector/KindleUnpack/mobi_header.py similarity index 100% rename from KindleUnpack/mobi_header.py rename to lector/KindleUnpack/mobi_header.py diff --git a/KindleUnpack/mobi_html.py b/lector/KindleUnpack/mobi_html.py similarity index 100% rename from KindleUnpack/mobi_html.py rename to lector/KindleUnpack/mobi_html.py diff --git a/KindleUnpack/mobi_index.py b/lector/KindleUnpack/mobi_index.py similarity index 100% rename from KindleUnpack/mobi_index.py rename to lector/KindleUnpack/mobi_index.py diff --git a/KindleUnpack/mobi_k8proc.py b/lector/KindleUnpack/mobi_k8proc.py similarity index 100% rename from KindleUnpack/mobi_k8proc.py rename to lector/KindleUnpack/mobi_k8proc.py diff --git a/KindleUnpack/mobi_k8resc.py b/lector/KindleUnpack/mobi_k8resc.py similarity index 100% rename from KindleUnpack/mobi_k8resc.py rename to lector/KindleUnpack/mobi_k8resc.py diff --git a/KindleUnpack/mobi_nav.py b/lector/KindleUnpack/mobi_nav.py similarity index 100% rename from KindleUnpack/mobi_nav.py rename to lector/KindleUnpack/mobi_nav.py diff --git a/KindleUnpack/mobi_ncx.py b/lector/KindleUnpack/mobi_ncx.py similarity index 100% rename from KindleUnpack/mobi_ncx.py rename to lector/KindleUnpack/mobi_ncx.py diff --git a/KindleUnpack/mobi_opf.py b/lector/KindleUnpack/mobi_opf.py similarity index 100% rename from KindleUnpack/mobi_opf.py rename to lector/KindleUnpack/mobi_opf.py diff --git a/KindleUnpack/mobi_pagemap.py b/lector/KindleUnpack/mobi_pagemap.py similarity index 100% rename from KindleUnpack/mobi_pagemap.py rename to lector/KindleUnpack/mobi_pagemap.py diff --git a/KindleUnpack/mobi_sectioner.py b/lector/KindleUnpack/mobi_sectioner.py similarity index 100% rename from KindleUnpack/mobi_sectioner.py rename to lector/KindleUnpack/mobi_sectioner.py diff --git a/KindleUnpack/mobi_split.py b/lector/KindleUnpack/mobi_split.py similarity index 100% rename from KindleUnpack/mobi_split.py rename to lector/KindleUnpack/mobi_split.py diff --git a/KindleUnpack/mobi_uncompress.py b/lector/KindleUnpack/mobi_uncompress.py similarity index 100% rename from KindleUnpack/mobi_uncompress.py rename to lector/KindleUnpack/mobi_uncompress.py diff --git a/KindleUnpack/mobi_utils.py b/lector/KindleUnpack/mobi_utils.py similarity index 100% rename from KindleUnpack/mobi_utils.py rename to lector/KindleUnpack/mobi_utils.py diff --git a/KindleUnpack/mobiml2xhtml.py b/lector/KindleUnpack/mobiml2xhtml.py similarity index 100% rename from KindleUnpack/mobiml2xhtml.py rename to lector/KindleUnpack/mobiml2xhtml.py diff --git a/KindleUnpack/unipath.py b/lector/KindleUnpack/unipath.py similarity index 100% rename from KindleUnpack/unipath.py rename to lector/KindleUnpack/unipath.py diff --git a/KindleUnpack/unpack_structure.py b/lector/KindleUnpack/unpack_structure.py similarity index 100% rename from KindleUnpack/unpack_structure.py rename to lector/KindleUnpack/unpack_structure.py diff --git a/__main__.py b/lector/__main__.py similarity index 100% rename from __main__.py rename to lector/__main__.py diff --git a/database.py b/lector/database.py similarity index 100% rename from database.py rename to lector/database.py diff --git a/definitionsdialog.py b/lector/definitionsdialog.py similarity index 100% rename from definitionsdialog.py rename to lector/definitionsdialog.py diff --git a/delegates.py b/lector/delegates.py similarity index 100% rename from delegates.py rename to lector/delegates.py diff --git a/ePub/__init__.py b/lector/ePub/__init__.py similarity index 100% rename from ePub/__init__.py rename to lector/ePub/__init__.py diff --git a/ePub/read_epub.py b/lector/ePub/read_epub.py similarity index 100% rename from ePub/read_epub.py rename to lector/ePub/read_epub.py diff --git a/library.py b/lector/library.py similarity index 100% rename from library.py rename to lector/library.py diff --git a/metadatadialog.py b/lector/metadatadialog.py similarity index 100% rename from metadatadialog.py rename to lector/metadatadialog.py diff --git a/models.py b/lector/models.py similarity index 100% rename from models.py rename to lector/models.py diff --git a/parsers/__init__.py b/lector/parsers/__init__.py similarity index 100% rename from parsers/__init__.py rename to lector/parsers/__init__.py diff --git a/parsers/cbr.py b/lector/parsers/cbr.py similarity index 100% rename from parsers/cbr.py rename to lector/parsers/cbr.py diff --git a/parsers/cbz.py b/lector/parsers/cbz.py similarity index 100% rename from parsers/cbz.py rename to lector/parsers/cbz.py diff --git a/parsers/epub.py b/lector/parsers/epub.py similarity index 100% rename from parsers/epub.py rename to lector/parsers/epub.py diff --git a/parsers/mobi.py b/lector/parsers/mobi.py similarity index 100% rename from parsers/mobi.py rename to lector/parsers/mobi.py diff --git a/rarfile/LICENSE b/lector/rarfile/LICENSE similarity index 100% rename from rarfile/LICENSE rename to lector/rarfile/LICENSE diff --git a/rarfile/__init__.py b/lector/rarfile/__init__.py similarity index 100% rename from rarfile/__init__.py rename to lector/rarfile/__init__.py diff --git a/rarfile/dumprar.py b/lector/rarfile/dumprar.py similarity index 100% rename from rarfile/dumprar.py rename to lector/rarfile/dumprar.py diff --git a/rarfile/rarfile.py b/lector/rarfile/rarfile.py similarity index 100% rename from rarfile/rarfile.py rename to lector/rarfile/rarfile.py diff --git a/resources/__init__.py b/lector/resources/__init__.py similarity index 100% rename from resources/__init__.py rename to lector/resources/__init__.py diff --git a/resources/about.html b/lector/resources/about.html similarity index 100% rename from resources/about.html rename to lector/resources/about.html diff --git a/resources/definitions.py b/lector/resources/definitions.py similarity index 100% rename from resources/definitions.py rename to lector/resources/definitions.py diff --git a/resources/mainwindow.py b/lector/resources/mainwindow.py similarity index 100% rename from resources/mainwindow.py rename to lector/resources/mainwindow.py diff --git a/resources/metadata.py b/lector/resources/metadata.py similarity index 100% rename from resources/metadata.py rename to lector/resources/metadata.py diff --git a/resources/pie_chart.py b/lector/resources/pie_chart.py similarity index 100% rename from resources/pie_chart.py rename to lector/resources/pie_chart.py diff --git a/resources/raw/NotFound.png b/lector/resources/raw/NotFound.png similarity index 100% rename from resources/raw/NotFound.png rename to lector/resources/raw/NotFound.png diff --git a/resources/raw/QMPlay2.svg b/lector/resources/raw/QMPlay2.svg similarity index 100% rename from resources/raw/QMPlay2.svg rename to lector/resources/raw/QMPlay2.svg diff --git a/resources/raw/blank.png b/lector/resources/raw/blank.png similarity index 100% rename from resources/raw/blank.png rename to lector/resources/raw/blank.png diff --git a/resources/raw/checkmark.svg b/lector/resources/raw/checkmark.svg similarity index 100% rename from resources/raw/checkmark.svg rename to lector/resources/raw/checkmark.svg diff --git a/resources/raw/color.svg b/lector/resources/raw/color.svg similarity index 100% rename from resources/raw/color.svg rename to lector/resources/raw/color.svg diff --git a/resources/raw/definition.ui b/lector/resources/raw/definition.ui similarity index 100% rename from resources/raw/definition.ui rename to lector/resources/raw/definition.ui diff --git a/resources/raw/error.svg b/lector/resources/raw/error.svg similarity index 100% rename from resources/raw/error.svg rename to lector/resources/raw/error.svg diff --git a/resources/raw/gray-shadow.png b/lector/resources/raw/gray-shadow.png similarity index 100% rename from resources/raw/gray-shadow.png rename to lector/resources/raw/gray-shadow.png diff --git a/resources/raw/main.ui b/lector/resources/raw/main.ui similarity index 100% rename from resources/raw/main.ui rename to lector/resources/raw/main.ui diff --git a/resources/raw/metadata.ui b/lector/resources/raw/metadata.ui similarity index 100% rename from resources/raw/metadata.ui rename to lector/resources/raw/metadata.ui diff --git a/resources/raw/resources.qrc b/lector/resources/raw/resources.qrc similarity index 100% rename from resources/raw/resources.qrc rename to lector/resources/raw/resources.qrc diff --git a/resources/raw/settings.ui b/lector/resources/raw/settings.ui similarity index 100% rename from resources/raw/settings.ui rename to lector/resources/raw/settings.ui diff --git a/resources/resources.py b/lector/resources/resources.py similarity index 100% rename from resources/resources.py rename to lector/resources/resources.py diff --git a/resources/settingswindow.py b/lector/resources/settingswindow.py similarity index 100% rename from resources/settingswindow.py rename to lector/resources/settingswindow.py diff --git a/settings.py b/lector/settings.py similarity index 100% rename from settings.py rename to lector/settings.py diff --git a/settingsdialog.py b/lector/settingsdialog.py similarity index 100% rename from settingsdialog.py rename to lector/settingsdialog.py diff --git a/sorter.py b/lector/sorter.py similarity index 100% rename from sorter.py rename to lector/sorter.py diff --git a/threaded.py b/lector/threaded.py similarity index 100% rename from threaded.py rename to lector/threaded.py diff --git a/toolbars.py b/lector/toolbars.py similarity index 100% rename from toolbars.py rename to lector/toolbars.py diff --git a/widgets.py b/lector/widgets.py similarity index 100% rename from widgets.py rename to lector/widgets.py diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..79bc678 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,5 @@ +[bdist_wheel] +# This flag says that the code is written to work on both Python 2 and Python +# 3. If at all possible, it is good practice to do this. If you cannot, you +# will need to generate wheels for each Python version that you support. +universal=1 diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..bf9b22f --- /dev/null +++ b/setup.py @@ -0,0 +1,80 @@ +import codecs +from os import path +from setuptools import setup, find_packages + +HERE = path.abspath(path.dirname(__file__)) + +# Get the long description from the README file +with codecs.open(path.join(HERE, 'README.md'), encoding='utf-8') as f: + LONG_DESC = f.read() + +INSTALL_DEPS = ['PyQt5==5.10.1', + 'requests==2.18.4', + 'beautifulsoup4==4.6.0'] +TEST_DEPS = ['pytest', + 'unittest2'] +DEV_DEPS = [] + +setup( + name='lector', + + # https://pypi.python.org/pypi/setuptools_scm + use_scm_version=True, + + description='Qt-based ebook reader', + long_description=LONG_DESC, + + url='https://github.com/BasioMeusPuga/Lector', + + author='BasioMeusPuga', + author_email='disgruntled.mob@gmail.com', + + license='GPL v3.0', + + # See https://pypi.python.org/pypi?%3Aaction=list_classifiers + classifiers=[ + # How mature is this project? Common values are + # 3 - Alpha + # 4 - Beta + # 5 - Production/Stable + 'Development Status :: 3 - Alpha', + + 'Intended Audience :: End Users/Desktop', + + 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', + + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + ], + + # What does your project relate to? + keywords='qt ebook epub kindle', + + packages=find_packages(), + + entry_points={ + 'console_scripts': [ + 'lector = lector.__main__:main' + ] + }, + # List run-time dependencies here. These will be installed by pip when + # your project is installed. For an analysis of "install_requires" vs pip's + # requirements files see: + # https://packaging.python.org/en/latest/requirements.html + install_requires=INSTALL_DEPS, + + setup_requires=['setuptools_scm'], + + python_requires='>=3.4, <4.0', + + # List additional groups of dependencies here (e.g. development + # dependencies). You can install these using the following syntax, + # for example: + # $ pip install -e .[dev,test] + extras_require={ + 'dev': DEV_DEPS, + 'test': TEST_DEPS + }, +) From 1cd6ff6b581c7b8cb497e0e8c410ea232ec252c6 Mon Sep 17 00:00:00 2001 From: Pau Ruiz i Safont Date: Sat, 10 Mar 2018 19:09:19 +0000 Subject: [PATCH 2/2] maintenance: use modules properly --- .../KindleUnpack => KindleUnpack}/__init__.py | 0 .../compatibility_utils.py | 0 .../kindleunpack.py | 0 .../mobi_cover.py | 0 .../mobi_dict.py | 0 .../mobi_header.py | 0 .../mobi_html.py | 0 .../mobi_index.py | 0 .../mobi_k8proc.py | 0 .../mobi_k8resc.py | 0 .../KindleUnpack => KindleUnpack}/mobi_nav.py | 0 .../KindleUnpack => KindleUnpack}/mobi_ncx.py | 0 .../KindleUnpack => KindleUnpack}/mobi_opf.py | 0 .../mobi_pagemap.py | 0 .../mobi_sectioner.py | 0 .../mobi_split.py | 0 .../mobi_uncompress.py | 0 .../mobi_utils.py | 0 .../mobiml2xhtml.py | 0 .../KindleUnpack => KindleUnpack}/unipath.py | 0 .../unpack_structure.py | 0 {lector/ePub => ePub}/__init__.py | 0 {lector/ePub => ePub}/read_epub.py | 0 lector/{parsers => }/__init__.py | 0 lector/__main__.py | 25 +++++++++--------- lector/library.py | 4 +-- lector/metadatadialog.py | 4 +-- lector/settingsdialog.py | 7 ++--- lector/sorter.py | 2 +- lector/threaded.py | 4 +-- lector/widgets.py | 7 +++-- {lector/rarfile => parsers}/__init__.py | 0 {lector/parsers => parsers}/cbr.py | 0 {lector/parsers => parsers}/cbz.py | 0 {lector/parsers => parsers}/epub.py | 0 {lector/parsers => parsers}/mobi.py | 0 {lector/rarfile => rarfile}/LICENSE | 0 {lector/resources => rarfile}/__init__.py | 0 {lector/rarfile => rarfile}/dumprar.py | 0 {lector/rarfile => rarfile}/rarfile.py | 0 resources/__init__.py | 0 {lector/resources => resources}/about.html | 0 .../resources => resources}/definitions.py | 0 {lector/resources => resources}/mainwindow.py | 0 {lector/resources => resources}/metadata.py | 0 {lector/resources => resources}/pie_chart.py | 0 .../resources => resources}/raw/NotFound.png | Bin .../resources => resources}/raw/QMPlay2.svg | 0 {lector/resources => resources}/raw/blank.png | Bin .../resources => resources}/raw/checkmark.svg | 0 {lector/resources => resources}/raw/color.svg | 0 .../resources => resources}/raw/definition.ui | 0 {lector/resources => resources}/raw/error.svg | 0 .../raw/gray-shadow.png | Bin {lector/resources => resources}/raw/main.ui | 0 .../resources => resources}/raw/metadata.ui | 0 .../resources => resources}/raw/resources.qrc | 0 .../resources => resources}/raw/settings.ui | 0 {lector/resources => resources}/resources.py | 0 .../resources => resources}/settingswindow.py | 0 60 files changed, 26 insertions(+), 27 deletions(-) rename {lector/KindleUnpack => KindleUnpack}/__init__.py (100%) rename {lector/KindleUnpack => KindleUnpack}/compatibility_utils.py (100%) rename {lector/KindleUnpack => KindleUnpack}/kindleunpack.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_cover.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_dict.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_header.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_html.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_index.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_k8proc.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_k8resc.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_nav.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_ncx.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_opf.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_pagemap.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_sectioner.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_split.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_uncompress.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobi_utils.py (100%) rename {lector/KindleUnpack => KindleUnpack}/mobiml2xhtml.py (100%) rename {lector/KindleUnpack => KindleUnpack}/unipath.py (100%) rename {lector/KindleUnpack => KindleUnpack}/unpack_structure.py (100%) rename {lector/ePub => ePub}/__init__.py (100%) rename {lector/ePub => ePub}/read_epub.py (100%) rename lector/{parsers => }/__init__.py (100%) rename {lector/rarfile => parsers}/__init__.py (100%) rename {lector/parsers => parsers}/cbr.py (100%) rename {lector/parsers => parsers}/cbz.py (100%) rename {lector/parsers => parsers}/epub.py (100%) rename {lector/parsers => parsers}/mobi.py (100%) rename {lector/rarfile => rarfile}/LICENSE (100%) rename {lector/resources => rarfile}/__init__.py (100%) rename {lector/rarfile => rarfile}/dumprar.py (100%) rename {lector/rarfile => rarfile}/rarfile.py (100%) create mode 100644 resources/__init__.py rename {lector/resources => resources}/about.html (100%) rename {lector/resources => resources}/definitions.py (100%) rename {lector/resources => resources}/mainwindow.py (100%) rename {lector/resources => resources}/metadata.py (100%) rename {lector/resources => resources}/pie_chart.py (100%) rename {lector/resources => resources}/raw/NotFound.png (100%) rename {lector/resources => resources}/raw/QMPlay2.svg (100%) rename {lector/resources => resources}/raw/blank.png (100%) rename {lector/resources => resources}/raw/checkmark.svg (100%) rename {lector/resources => resources}/raw/color.svg (100%) rename {lector/resources => resources}/raw/definition.ui (100%) rename {lector/resources => resources}/raw/error.svg (100%) rename {lector/resources => resources}/raw/gray-shadow.png (100%) rename {lector/resources => resources}/raw/main.ui (100%) rename {lector/resources => resources}/raw/metadata.ui (100%) rename {lector/resources => resources}/raw/resources.qrc (100%) rename {lector/resources => resources}/raw/settings.ui (100%) rename {lector/resources => resources}/resources.py (100%) rename {lector/resources => resources}/settingswindow.py (100%) diff --git a/lector/KindleUnpack/__init__.py b/KindleUnpack/__init__.py similarity index 100% rename from lector/KindleUnpack/__init__.py rename to KindleUnpack/__init__.py diff --git a/lector/KindleUnpack/compatibility_utils.py b/KindleUnpack/compatibility_utils.py similarity index 100% rename from lector/KindleUnpack/compatibility_utils.py rename to KindleUnpack/compatibility_utils.py diff --git a/lector/KindleUnpack/kindleunpack.py b/KindleUnpack/kindleunpack.py similarity index 100% rename from lector/KindleUnpack/kindleunpack.py rename to KindleUnpack/kindleunpack.py diff --git a/lector/KindleUnpack/mobi_cover.py b/KindleUnpack/mobi_cover.py similarity index 100% rename from lector/KindleUnpack/mobi_cover.py rename to KindleUnpack/mobi_cover.py diff --git a/lector/KindleUnpack/mobi_dict.py b/KindleUnpack/mobi_dict.py similarity index 100% rename from lector/KindleUnpack/mobi_dict.py rename to KindleUnpack/mobi_dict.py diff --git a/lector/KindleUnpack/mobi_header.py b/KindleUnpack/mobi_header.py similarity index 100% rename from lector/KindleUnpack/mobi_header.py rename to KindleUnpack/mobi_header.py diff --git a/lector/KindleUnpack/mobi_html.py b/KindleUnpack/mobi_html.py similarity index 100% rename from lector/KindleUnpack/mobi_html.py rename to KindleUnpack/mobi_html.py diff --git a/lector/KindleUnpack/mobi_index.py b/KindleUnpack/mobi_index.py similarity index 100% rename from lector/KindleUnpack/mobi_index.py rename to KindleUnpack/mobi_index.py diff --git a/lector/KindleUnpack/mobi_k8proc.py b/KindleUnpack/mobi_k8proc.py similarity index 100% rename from lector/KindleUnpack/mobi_k8proc.py rename to KindleUnpack/mobi_k8proc.py diff --git a/lector/KindleUnpack/mobi_k8resc.py b/KindleUnpack/mobi_k8resc.py similarity index 100% rename from lector/KindleUnpack/mobi_k8resc.py rename to KindleUnpack/mobi_k8resc.py diff --git a/lector/KindleUnpack/mobi_nav.py b/KindleUnpack/mobi_nav.py similarity index 100% rename from lector/KindleUnpack/mobi_nav.py rename to KindleUnpack/mobi_nav.py diff --git a/lector/KindleUnpack/mobi_ncx.py b/KindleUnpack/mobi_ncx.py similarity index 100% rename from lector/KindleUnpack/mobi_ncx.py rename to KindleUnpack/mobi_ncx.py diff --git a/lector/KindleUnpack/mobi_opf.py b/KindleUnpack/mobi_opf.py similarity index 100% rename from lector/KindleUnpack/mobi_opf.py rename to KindleUnpack/mobi_opf.py diff --git a/lector/KindleUnpack/mobi_pagemap.py b/KindleUnpack/mobi_pagemap.py similarity index 100% rename from lector/KindleUnpack/mobi_pagemap.py rename to KindleUnpack/mobi_pagemap.py diff --git a/lector/KindleUnpack/mobi_sectioner.py b/KindleUnpack/mobi_sectioner.py similarity index 100% rename from lector/KindleUnpack/mobi_sectioner.py rename to KindleUnpack/mobi_sectioner.py diff --git a/lector/KindleUnpack/mobi_split.py b/KindleUnpack/mobi_split.py similarity index 100% rename from lector/KindleUnpack/mobi_split.py rename to KindleUnpack/mobi_split.py diff --git a/lector/KindleUnpack/mobi_uncompress.py b/KindleUnpack/mobi_uncompress.py similarity index 100% rename from lector/KindleUnpack/mobi_uncompress.py rename to KindleUnpack/mobi_uncompress.py diff --git a/lector/KindleUnpack/mobi_utils.py b/KindleUnpack/mobi_utils.py similarity index 100% rename from lector/KindleUnpack/mobi_utils.py rename to KindleUnpack/mobi_utils.py diff --git a/lector/KindleUnpack/mobiml2xhtml.py b/KindleUnpack/mobiml2xhtml.py similarity index 100% rename from lector/KindleUnpack/mobiml2xhtml.py rename to KindleUnpack/mobiml2xhtml.py diff --git a/lector/KindleUnpack/unipath.py b/KindleUnpack/unipath.py similarity index 100% rename from lector/KindleUnpack/unipath.py rename to KindleUnpack/unipath.py diff --git a/lector/KindleUnpack/unpack_structure.py b/KindleUnpack/unpack_structure.py similarity index 100% rename from lector/KindleUnpack/unpack_structure.py rename to KindleUnpack/unpack_structure.py diff --git a/lector/ePub/__init__.py b/ePub/__init__.py similarity index 100% rename from lector/ePub/__init__.py rename to ePub/__init__.py diff --git a/lector/ePub/read_epub.py b/ePub/read_epub.py similarity index 100% rename from lector/ePub/read_epub.py rename to ePub/read_epub.py diff --git a/lector/parsers/__init__.py b/lector/__init__.py similarity index 100% rename from lector/parsers/__init__.py rename to lector/__init__.py diff --git a/lector/__main__.py b/lector/__main__.py index d03b7d7..1c95d46 100755 --- a/lector/__main__.py +++ b/lector/__main__.py @@ -21,20 +21,19 @@ import sys import hashlib from PyQt5 import QtWidgets, QtGui, QtCore -import sorter -import database +from lector import database +from lector import sorter +from lector.toolbars import LibraryToolBar, BookToolBar +from lector.widgets import Tab +from lector.delegates import LibraryDelegate +from lector.threaded import BackGroundTabUpdate, BackGroundBookAddition, BackGroundBookDeletion +from lector.library import Library +from lector.settings import Settings +from lector.settingsdialog import SettingsUI +from lector.metadatadialog import MetadataUI +from lector.definitionsdialog import DefinitionsUI -from resources import mainwindow, resources -from toolbars import LibraryToolBar, BookToolBar -from widgets import Tab -from delegates import LibraryDelegate -from threaded import BackGroundTabUpdate, BackGroundBookAddition, BackGroundBookDeletion -from library import Library -from settings import Settings - -from settingsdialog import SettingsUI -from metadatadialog import MetadataUI -from definitionsdialog import DefinitionsUI +from resources import mainwindow class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow): diff --git a/lector/library.py b/lector/library.py index 7ee40de..da58235 100644 --- a/lector/library.py +++ b/lector/library.py @@ -21,8 +21,8 @@ import pickle import pathlib from PyQt5 import QtGui, QtCore -import database -from models import TableProxyModel, ItemProxyModel +from lector import database +from lector.models import TableProxyModel, ItemProxyModel class Library: diff --git a/lector/metadatadialog.py b/lector/metadatadialog.py index 990defc..70d1731 100644 --- a/lector/metadatadialog.py +++ b/lector/metadatadialog.py @@ -18,10 +18,10 @@ from PyQt5 import QtWidgets, QtCore, QtGui -import database +from lector import database from resources import metadata -from widgets import PliantQGraphicsScene +from lector.widgets import PliantQGraphicsScene class MetadataUI(QtWidgets.QDialog, metadata.Ui_Dialog): diff --git a/lector/settingsdialog.py b/lector/settingsdialog.py index 7fa284c..55ede21 100644 --- a/lector/settingsdialog.py +++ b/lector/settingsdialog.py @@ -23,10 +23,11 @@ import os import copy from PyQt5 import QtWidgets, QtCore -import database +from lector import database +from lector.models import MostExcellentFileSystemModel +from lector.threaded import BackGroundBookSearch, BackGroundBookAddition + from resources import settingswindow -from models import MostExcellentFileSystemModel, FileSystemProxyModel -from threaded import BackGroundBookSearch, BackGroundBookAddition class SettingsUI(QtWidgets.QDialog, settingswindow.Ui_Dialog): diff --git a/lector/sorter.py b/lector/sorter.py index 1290e0c..ee0f482 100644 --- a/lector/sorter.py +++ b/lector/sorter.py @@ -42,7 +42,7 @@ import threading from multiprocessing import Pool, Manager from PyQt5 import QtCore, QtGui -import database +from lector import database from parsers.cbz import ParseCBZ from parsers.cbr import ParseCBR diff --git a/lector/threaded.py b/lector/threaded.py index b375d56..fa90a46 100644 --- a/lector/threaded.py +++ b/lector/threaded.py @@ -21,8 +21,8 @@ import pathlib from multiprocessing.dummy import Pool from PyQt5 import QtCore -import sorter -import database +from lector import sorter +from lector import database class BackGroundTabUpdate(QtCore.QThread): diff --git a/lector/widgets.py b/lector/widgets.py index 0cf3747..7eeaed1 100644 --- a/lector/widgets.py +++ b/lector/widgets.py @@ -26,10 +26,9 @@ import os import uuid from PyQt5 import QtWidgets, QtGui, QtCore -from resources import pie_chart -from models import BookmarkProxyModel -from sorter import resize_image -from delegates import BookmarkDelegate +from lector.models import BookmarkProxyModel +from lector.sorter import resize_image +from lector.delegates import BookmarkDelegate class Tab(QtWidgets.QWidget): diff --git a/lector/rarfile/__init__.py b/parsers/__init__.py similarity index 100% rename from lector/rarfile/__init__.py rename to parsers/__init__.py diff --git a/lector/parsers/cbr.py b/parsers/cbr.py similarity index 100% rename from lector/parsers/cbr.py rename to parsers/cbr.py diff --git a/lector/parsers/cbz.py b/parsers/cbz.py similarity index 100% rename from lector/parsers/cbz.py rename to parsers/cbz.py diff --git a/lector/parsers/epub.py b/parsers/epub.py similarity index 100% rename from lector/parsers/epub.py rename to parsers/epub.py diff --git a/lector/parsers/mobi.py b/parsers/mobi.py similarity index 100% rename from lector/parsers/mobi.py rename to parsers/mobi.py diff --git a/lector/rarfile/LICENSE b/rarfile/LICENSE similarity index 100% rename from lector/rarfile/LICENSE rename to rarfile/LICENSE diff --git a/lector/resources/__init__.py b/rarfile/__init__.py similarity index 100% rename from lector/resources/__init__.py rename to rarfile/__init__.py diff --git a/lector/rarfile/dumprar.py b/rarfile/dumprar.py similarity index 100% rename from lector/rarfile/dumprar.py rename to rarfile/dumprar.py diff --git a/lector/rarfile/rarfile.py b/rarfile/rarfile.py similarity index 100% rename from lector/rarfile/rarfile.py rename to rarfile/rarfile.py diff --git a/resources/__init__.py b/resources/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/lector/resources/about.html b/resources/about.html similarity index 100% rename from lector/resources/about.html rename to resources/about.html diff --git a/lector/resources/definitions.py b/resources/definitions.py similarity index 100% rename from lector/resources/definitions.py rename to resources/definitions.py diff --git a/lector/resources/mainwindow.py b/resources/mainwindow.py similarity index 100% rename from lector/resources/mainwindow.py rename to resources/mainwindow.py diff --git a/lector/resources/metadata.py b/resources/metadata.py similarity index 100% rename from lector/resources/metadata.py rename to resources/metadata.py diff --git a/lector/resources/pie_chart.py b/resources/pie_chart.py similarity index 100% rename from lector/resources/pie_chart.py rename to resources/pie_chart.py diff --git a/lector/resources/raw/NotFound.png b/resources/raw/NotFound.png similarity index 100% rename from lector/resources/raw/NotFound.png rename to resources/raw/NotFound.png diff --git a/lector/resources/raw/QMPlay2.svg b/resources/raw/QMPlay2.svg similarity index 100% rename from lector/resources/raw/QMPlay2.svg rename to resources/raw/QMPlay2.svg diff --git a/lector/resources/raw/blank.png b/resources/raw/blank.png similarity index 100% rename from lector/resources/raw/blank.png rename to resources/raw/blank.png diff --git a/lector/resources/raw/checkmark.svg b/resources/raw/checkmark.svg similarity index 100% rename from lector/resources/raw/checkmark.svg rename to resources/raw/checkmark.svg diff --git a/lector/resources/raw/color.svg b/resources/raw/color.svg similarity index 100% rename from lector/resources/raw/color.svg rename to resources/raw/color.svg diff --git a/lector/resources/raw/definition.ui b/resources/raw/definition.ui similarity index 100% rename from lector/resources/raw/definition.ui rename to resources/raw/definition.ui diff --git a/lector/resources/raw/error.svg b/resources/raw/error.svg similarity index 100% rename from lector/resources/raw/error.svg rename to resources/raw/error.svg diff --git a/lector/resources/raw/gray-shadow.png b/resources/raw/gray-shadow.png similarity index 100% rename from lector/resources/raw/gray-shadow.png rename to resources/raw/gray-shadow.png diff --git a/lector/resources/raw/main.ui b/resources/raw/main.ui similarity index 100% rename from lector/resources/raw/main.ui rename to resources/raw/main.ui diff --git a/lector/resources/raw/metadata.ui b/resources/raw/metadata.ui similarity index 100% rename from lector/resources/raw/metadata.ui rename to resources/raw/metadata.ui diff --git a/lector/resources/raw/resources.qrc b/resources/raw/resources.qrc similarity index 100% rename from lector/resources/raw/resources.qrc rename to resources/raw/resources.qrc diff --git a/lector/resources/raw/settings.ui b/resources/raw/settings.ui similarity index 100% rename from lector/resources/raw/settings.ui rename to resources/raw/settings.ui diff --git a/lector/resources/resources.py b/resources/resources.py similarity index 100% rename from lector/resources/resources.py rename to resources/resources.py diff --git a/lector/resources/settingswindow.py b/resources/settingswindow.py similarity index 100% rename from lector/resources/settingswindow.py rename to resources/settingswindow.py