Merge remote-tracking branch 'fixed_layout/kobo-sync-detect-fixed-layout'

# Conflicts:
#	cps/kobo.py

cps/kobo.py

@@ -46,6 +46,7 @@ import requests
 
 from . import config, logger, kobo_auth, db, calibre_db, helper, shelf as shelf_lib, ub, csrf, kobo_sync_status
 from . import isoLanguages
+from .epub import get_epub_layout
 from .constants import sqlalchemy_version2, COVER_THUMBNAIL_SMALL
 from .helper import get_download_link
 from .services import SyncToken as SyncToken
@@ -459,6 +460,8 @@ def get_metadata(book):
             continue
         for kobo_format in KOBO_FORMATS[book_data.format]:
             # log.debug('Id: %s, Format: %s' % (book.id, kobo_format))
+            if get_epub_layout(book, book_data) == 'pre-paginated':
+                kobo_format = 'EPUB3FL'
             download_urls.append(
                 {
                     "Format": kobo_format,