Sync upstream

[chapmanjacobd]

Resolves merge conflicts at imports area

Replaces #376

@holta

[holta]

Great!

@chapmanjacobd Summarize the merge conflict you fixed, to make it more visible if possible?

[chapmanjacobd]

hmm that's weird that clicking on the Merge janeczku/master into sync-upstream commit 32f6f95 shows the whole branch diff 32f6f95

But basically if you look at 32f6f95 directly (ie. git show 32f6f95 you'll see this:

commit 32f6f95b9059ac9190d324d2ab80893d3c9b8fb8
Merge: dc95d968 b549da05
Author: Jacob Chapman <7908073+chapmanjacobd@users.noreply.github.com>
Date:   3 hours ago

    Merge janeczku/master into sync-upstream

diff --cc cps/admin.py
index 12b12a39,3c108b7c..e7c08f78
--- a/cps/admin.py
+++ b/cps/admin.py
@@@ -49,13 -48,13 +49,14 @@@ from . import db, calibre_db, ub, web_s
      kobo_sync_status, schedule
  from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
      valid_email, check_username
  from .embed_helper import get_calibre_binarypath
  from .gdriveutils import is_gdrive_ready, gdrive_support
+ from .binary_helper import resolve_binary_path, SUPPORTED_KEPUBIFY_BINARIES, SUPPORTED_UNRAR_BINARIES
  from .render_template import render_title_template, get_sidebar_config
  from .services.worker import WorkerThread
 +from .subproc_wrapper import process_open
  from .usermanagement import user_login_required
  from .cw_babel import get_available_translations, get_available_locale, get_user_locale_language
  from . import debug_info
  from .string_helper import strip_whitespaces
  
diff --cc cps/editbooks.py
index f47aee02,c13870df..bf529ee0
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@@ -35,17 -35,17 +35,18 @@@ from flask_babel import get_local
  from .cw_login import current_user
  from sqlalchemy.exc import OperationalError, IntegrityError, InterfaceError
  from sqlalchemy.orm.exc import StaleDataError
  from sqlalchemy.sql.expression import func
  
 -from . import constants, logger, isoLanguages, gdriveutils, uploader, helper, kobo_sync_status
 +from . import constants, logger, isoLanguages, gdriveutils, uploader, helper, kobo_sync_status, shelf
  from .clean_html import clean_string
  from . import config, ub, db, calibre_db
  from .services.worker import WorkerThread
  from .tasks.upload import TaskUpload
 +from .tasks.metadata_extract import TaskMetadataExtract
  from .render_template import render_title_template
+ from .binary_helper import resolve_binary_path, SUPPORTED_UNRAR_BINARIES
  from .kobo_sync_status import change_archived_books
  from .redirect import get_redirect_location
  from .file_helper import validate_mime_type
  from .usermanagement import user_login_required, login_required_if_no_ano
  from .string_helper import strip_whitespaces
diff --cc cps/web.py
index 9b98fa3c,5ef40763..b14777a6
--- a/cps/web.py
+++ b/cps/web.py
@@@ -45,12 -44,12 +45,13 @@@ from . import calibre_db, kobo_sync_sta
  from .search import render_search_results, render_adv_search_results
  from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
  from .helper import check_valid_domain, check_email, check_username, \
      get_book_cover, get_series_cover_thumbnail, get_download_link, send_mail, generate_random_password, \
      send_registration_mail, check_send_to_ereader, check_read_formats, tags_filters, reset_password, valid_email, \
 -    edit_book_read_status, valid_password
 +    edit_book_read_status, valid_password, get_browseable_custom_column, format_custom_column_value, \
 +    custom_column_page
+ from .binary_helper import resolve_binary_path, SUPPORTED_UNRAR_BINARIES
  from .pagination import Pagination
  from .redirect import get_redirect_location
  from .cw_babel import get_available_locale
  from .usermanagement import login_required_if_no_ano
  from .kobo_sync_status import remove_synced_book

It's just that some changes upstream also changed the import statements where we also added get_browseable_custom_column, format_custom_column_value