More refactoring

cps/__init__.py

@@ -4,32 +4,56 @@
 # import logging
 # from logging.handlers import SMTPHandler, RotatingFileHandler
 # import os
-
-from flask import Flask# , request, current_app
+import mimetypes
+from flask import Flask, request, g
 from flask_login import LoginManager
-from flask_babel import Babel # , lazy_gettext as _l
+from flask_babel import Babel
 import cache_buster
 from reverseproxy import ReverseProxied
 import logging
 from logging.handlers import RotatingFileHandler
 from flask_principal import Principal
-# from flask_sqlalchemy import SQLAlchemy
+from babel.core import UnknownLocaleError
+from babel import Locale as LC
+from babel import negotiate_locale
 import os
 import ub
 from ub import Config, Settings
-import cPickle
+try:
+    import cPickle
+except ImportError:
+    import pickle as cPickle
 
 
-# Normal
-babel = Babel()
+
+
+
+mimetypes.init()
+mimetypes.add_type('application/xhtml+xml', '.xhtml')
+mimetypes.add_type('application/epub+zip', '.epub')
+mimetypes.add_type('application/fb2+zip', '.fb2')
+mimetypes.add_type('application/x-mobipocket-ebook', '.mobi')
+mimetypes.add_type('application/x-mobipocket-ebook', '.prc')
+mimetypes.add_type('application/vnd.amazon.ebook', '.azw')
+mimetypes.add_type('application/x-cbr', '.cbr')
+mimetypes.add_type('application/x-cbz', '.cbz')
+mimetypes.add_type('application/x-cbt', '.cbt')
+mimetypes.add_type('image/vnd.djvu', '.djvu')
+mimetypes.add_type('application/mpeg', '.mpeg')
+mimetypes.add_type('application/mpeg', '.mp3')
+mimetypes.add_type('application/mp4', '.m4a')
+mimetypes.add_type('application/mp4', '.m4b')
+mimetypes.add_type('application/ogg', '.ogg')
+mimetypes.add_type('application/ogg', '.oga')
+
+app = Flask(__name__)
+
 lm = LoginManager()
 lm.login_view = 'web.login'
 lm.anonymous_user = ub.Anonymous
 
 
-
-ub_session = ub.session
-# ub_session.start()
+ub.init_db()
 config = Config()
 
 
@@ -42,15 +66,14 @@ searched_ids = {}
 
 
 from worker import WorkerThread
-
 global_WorkerThread = WorkerThread()
 
 from server import server
 Server = server()
 
+babel = Babel()
 
 def create_app():
-    app = Flask(__name__)
     app.wsgi_app = ReverseProxied(app.wsgi_app)
     cache_buster.init_cache_busting(app)
 
@@ -71,15 +94,38 @@ def create_app():
     logging.getLogger("book_formats").setLevel(config.config_log_level)
     Principal(app)
     lm.init_app(app)
-    babel.init_app(app)
     app.secret_key = os.getenv('SECRET_KEY', 'A0Zr98j/3yX R~XHH!jmN]LWX/,?RT')
     Server.init_app(app)
     db.setup_db()
+    babel.init_app(app)
     global_WorkerThread.start()
 
-    # app.config.from_object(config_class)
-    # db.init_app(app)
-    # login.init_app(app)
-
-
     return app
+
+@babel.localeselector
+def get_locale():
+    # if a user is logged in, use the locale from the user settings
+    user = getattr(g, 'user', None)
+    # user = None
+    if user is not None and hasattr(user, "locale"):
+        if user.nickname != 'Guest':   # if the account is the guest account bypass the config lang settings
+            return user.locale
+    translations = [str(item) for item in babel.list_translations()] + ['en']
+    preferred = list()
+    for x in request.accept_languages.values():
+        try:
+            preferred.append(str(LC.parse(x.replace('-', '_'))))
+        except (UnknownLocaleError, ValueError) as e:
+            app.logger.debug("Could not parse locale: %s", e)
+            preferred.append('en')
+    return negotiate_locale(preferred, translations)
+
+
+@babel.timezoneselector
+def get_timezone():
+    user = getattr(g, 'user', None)
+    if user is not None:
+        return user.timezone
+
+from updater import Updater
+updater_thread = Updater()