diff --git a/src/libprs500/ebooks/__init__.py b/src/libprs500/ebooks/__init__.py index 9337c5d331..07158a0ea5 100644 --- a/src/libprs500/ebooks/__init__.py +++ b/src/libprs500/ebooks/__init__.py @@ -22,4 +22,7 @@ class ConversionError(Exception): pass class UnknownFormatError(Exception): - pass \ No newline at end of file + pass + +BOOK_EXTENSIONS = ['lrf', 'lrx', 'rar', 'zip', 'rtf', 'lit', 'txt', 'htm', + 'html', 'xhtml', 'epub', 'pdf', 'prc', 'mobi', 'azw'] diff --git a/src/libprs500/gui2/__init__.py b/src/libprs500/gui2/__init__.py index 962b81e66a..eb90153bdd 100644 --- a/src/libprs500/gui2/__init__.py +++ b/src/libprs500/gui2/__init__.py @@ -25,8 +25,6 @@ from libprs500 import __author__, islinux, iswindows NONE = QVariant() #: Null value to return from the data function of item models -BOOK_EXTENSIONS = ['lrf', 'lrx', 'rar', 'zip', 'rtf', 'lit', 'txt', 'htm', - 'html', 'xhtml', 'epub', 'pdf'] # Turn off DeprecationWarnings in windows GUI if iswindows: diff --git a/src/libprs500/gui2/dialogs/metadata_single.py b/src/libprs500/gui2/dialogs/metadata_single.py index cbda631328..cb0b375032 100644 --- a/src/libprs500/gui2/dialogs/metadata_single.py +++ b/src/libprs500/gui2/dialogs/metadata_single.py @@ -23,10 +23,11 @@ from PyQt4.QtGui import QPixmap, QListWidgetItem, QErrorMessage, QDialog from libprs500.gui2 import qstring_to_unicode, error_dialog, file_icon_provider, \ - choose_files, pixmap_to_data, BOOK_EXTENSIONS, choose_images + choose_files, pixmap_to_data, choose_images from libprs500.gui2.dialogs.metadata_single_ui import Ui_MetadataSingleDialog from libprs500.gui2.dialogs.fetch_metadata import FetchMetadata from libprs500.ebooks.BeautifulSoup import BeautifulSoup +from libprs500.ebooks import BOOK_EXTENSIONS class Format(QListWidgetItem): def __init__(self, parent, ext, path=None): diff --git a/src/libprs500/gui2/main.py b/src/libprs500/gui2/main.py index c384019739..06396646f7 100644 --- a/src/libprs500/gui2/main.py +++ b/src/libprs500/gui2/main.py @@ -33,7 +33,7 @@ from libprs500.ebooks.lrf.any.convert_from import main as any2lrf from libprs500.devices.errors import FreeSpaceError from libprs500.devices.interface import Device from libprs500.gui2 import APP_UID, warning_dialog, choose_files, error_dialog, \ - initialize_file_icon_provider, BOOK_EXTENSIONS, \ + initialize_file_icon_provider, \ pixmap_to_data, choose_dir, ORG_NAME, \ qstring_to_unicode, set_sidebar_directories from libprs500.gui2.main_window import MainWindow @@ -53,6 +53,7 @@ from libprs500.gui2.lrf_renderer.main import option_parser as lrfviewerop from libprs500.library.database import DatabaseLocked from libprs500.ebooks.metadata.meta import set_metadata from libprs500.ebooks.metadata import MetaInformation +from libprs500.ebooks import BOOK_EXTENSIONS class Main(MainWindow, Ui_MainWindow):