maintenance: use modules properly

lector/__main__.py

@@ -21,20 +21,19 @@ import sys
 import hashlib
 from PyQt5 import QtWidgets, QtGui, QtCore
 
-import sorter
+from lector import database
-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 resources import mainwindow
-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
 
 
 class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):

lector/library.py

@@ -21,8 +21,8 @@ import pickle
 import pathlib
 from PyQt5 import QtGui, QtCore
 
-import database
+from lector import database
-from models import TableProxyModel, ItemProxyModel
+from lector.models import TableProxyModel, ItemProxyModel
 
 
 class Library:

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):

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):

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

lector/threaded.py

@@ -21,8 +21,8 @@ import pathlib
 from multiprocessing.dummy import Pool
 from PyQt5 import QtCore
 
-import sorter
+from lector import sorter
-import database
+from lector import database
 
 
 class BackGroundTabUpdate(QtCore.QThread):

lector/widgets.py

@@ -26,10 +26,9 @@ import os
 import uuid
 from PyQt5 import QtWidgets, QtGui, QtCore
 
-from resources import pie_chart
+from lector.models import BookmarkProxyModel
-from models import BookmarkProxyModel
+from lector.sorter import resize_image
-from sorter import resize_image
+from lector.delegates import BookmarkDelegate
-from delegates import BookmarkDelegate
 
 
 class Tab(QtWidgets.QWidget):