Working for pip and "normal" start for python3 and python2

2019-06-02 09:33:45 +02:00
parent f5b335e8e9
commit bb0d5c5538
27 changed files with 114 additions and 91 deletions
@@ -18,7 +18,7 @@
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.

 import os
-from cps import uploader
+from constants import BookMeta
 from cps import app
 from iso639 import languages as isoLanguages

@@ -94,7 +94,7 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension):
        else:
             loadedMetadata.language = ""

-        return uploader.BookMeta(
+        return BookMeta(
                file_path=tmp_file_path,
                extension=original_file_extension,
                title=loadedMetadata.title or original_file_name,
@@ -107,7 +107,7 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension):
                languages=loadedMetadata.language)
    else:

-        return uploader.BookMeta(
+        return BookMeta(
            file_path=tmp_file_path,
            extension=original_file_extension,
            title=original_file_name,