+# Sci-Hub EVA 
-
+
- '''.format(host_url=host_url, pdf=pdf.split('.')[0])
+ '''
@app.route('/captcha-moment.png', methods=['GET'])
def captcha_img():
- return send_file((IMAGES_DIR / 'captcha-moment.png').resolve().as_posix(), mimetype='image/png')
+ return send_file(
+ (IMAGES_DIR / 'captcha-moment.png').resolve().as_posix(),
+ mimetype='image/png')
if __name__ == '__main__':
diff --git a/scihub_eva/globals/preferences.py b/scihub_eva/globals/preferences.py
index a517f92..b9d3f73 100644
--- a/scihub_eva/globals/preferences.py
+++ b/scihub_eva/globals/preferences.py
@@ -21,7 +21,11 @@
NETWORK_SCIHUB_URL_DEFAULT = 'https://sci-hub.se'
NETWORK_SCIHUB_URLS_KEY = 'Network/SciHubURLs'
-NETWORK_SCIHUB_URLS_DEFAULT = ['https://sci-hub.se', 'https://sci-hub.st', 'https://sci-hub.ru']
+NETWORK_SCIHUB_URLS_DEFAULT = [
+ 'https://sci-hub.se',
+ 'https://sci-hub.st',
+ 'https://sci-hub.ru',
+]
NETWORK_TIMEOUT_KEY = 'Network/Timeout'
NETWORK_TIMEOUT_DEFAULT = 3000
diff --git a/scihub_eva/globals/versions.py b/scihub_eva/globals/versions.py
index 8c26931..1d9efb1 100644
--- a/scihub_eva/globals/versions.py
+++ b/scihub_eva/globals/versions.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
ORGANIZATION_NAME = 'LeoVan'
-ORGANIZATION_DOMAIN = 'leovan.me'
+ORGANIZATION_DOMAIN = 'leovan.tech'
APPLICATION_NAME = 'SciHubEVA'
-APPLICATION_VERSION = 'v6.0.0'
+APPLICATION_VERSION = 'v6.1.0'
diff --git a/scihub_eva/ui/add_scihub_url.py b/scihub_eva/ui/add_scihub_url.py
index b7d53b4..725a351 100644
--- a/scihub_eva/ui/add_scihub_url.py
+++ b/scihub_eva/ui/add_scihub_url.py
@@ -31,7 +31,8 @@ def _connect(self):
@Slot(str)
def add_scihub_url(self, url):
- scihub_available_urls = Preferences.get_or_default(NETWORK_SCIHUB_URLS_KEY, NETWORK_SCIHUB_URLS_DEFAULT)
+ scihub_available_urls = Preferences.get_or_default(
+ NETWORK_SCIHUB_URLS_KEY, NETWORK_SCIHUB_URLS_DEFAULT)
if url not in scihub_available_urls:
scihub_available_urls.append(url)
diff --git a/scihub_eva/ui/preferences.py b/scihub_eva/ui/preferences.py
index 3dce0f9..7fc15e6 100644
--- a/scihub_eva/ui/preferences.py
+++ b/scihub_eva/ui/preferences.py
@@ -50,67 +50,94 @@ def _connect(self):
self._window.saveSystemLanguage.connect(self.save_system_language)
self._window.saveSystemTheme.connect(self.save_system_theme)
- self._window.saveFileFilenamePrefixFormat.connect(self.save_file_filename_prefix_format)
- self._window.saveFileOverwriteExistingFile.connect(self.save_file_overwrite_existing_file)
- self._window.saveNetworkSciHubURLs.connect(self.save_network_scihub_urls)
+ self._window.saveFileFilenamePrefixFormat.connect(
+ self.save_file_filename_prefix_format)
+ self._window.saveFileOverwriteExistingFile.connect(
+ self.save_file_overwrite_existing_file)
+ self._window.saveNetworkSciHubURLs.connect(
+ self.save_network_scihub_urls)
self._window.saveNetworkSciHubURL.connect(self.save_network_scihub_url)
self._window.saveNetworkTimeout.connect(self.save_network_timeout)
- self._window.saveNetworkRetryTimes.connect(self.save_network_retry_times)
- self._window.saveNetworkProxyEnabled.connect(self.save_network_proxy_enabled)
+ self._window.saveNetworkRetryTimes.connect(
+ self.save_network_retry_times)
+ self._window.saveNetworkProxyEnabled.connect(
+ self.save_network_proxy_enabled)
self._window.saveNetworkProxyType.connect(self.save_network_proxy_type)
self._window.saveNetworkProxyHost.connect(self.save_network_proxy_host)
self._window.saveNetworkProxyPort.connect(self.save_network_proxy_port)
- self._window.saveNetworkProxyUsername.connect(self.save_network_proxy_username)
- self._window.saveNetworkProxyPassword.connect(self.save_network_proxy_password)
+ self._window.saveNetworkProxyUsername.connect(
+ self.save_network_proxy_username)
+ self._window.saveNetworkProxyPassword.connect(
+ self.save_network_proxy_password)
self.show.connect(self._window.show)
self.set_system_language.connect(self._window.setSystemLanguage)
self.set_system_theme.connect(self._window.setSystemTheme)
- self.set_file_filename_prefix_format.connect(self._window.setFileFilenamePrefixFormat)
- self.set_file_overwrite_existing_file.connect(self._window.setFileOverwriteExistingFile)
+ self.set_file_filename_prefix_format.connect(
+ self._window.setFileFilenamePrefixFormat)
+ self.set_file_overwrite_existing_file.connect(
+ self._window.setFileOverwriteExistingFile)
self.set_network_scihub_urls.connect(self._window.setNetworkSciHubURLs)
self.set_network_scihub_url.connect(self._window.setNetworkSciHubURL)
self.set_network_timeout.connect(self._window.setNetworkTimeout)
self.set_network_retry_times.connect(self._window.setNetworkRetryTimes)
- self.set_network_proxy_enabled.connect(self._window.setNetworkProxyEnabled)
+ self.set_network_proxy_enabled.connect(
+ self._window.setNetworkProxyEnabled)
self.set_network_proxy_type.connect(self._window.setNetworkProxyType)
self.set_network_proxy_host.connect(self._window.setNetworkProxyHost)
self.set_network_proxy_port.connect(self._window.setNetworkProxyPort)
- self.set_network_proxy_username.connect(self._window.setNetworkProxyUsername)
- self.set_network_proxy_password.connect(self._window.setNetworkProxyPassword)
+ self.set_network_proxy_username.connect(
+ self._window.setNetworkProxyUsername)
+ self.set_network_proxy_password.connect(
+ self._window.setNetworkProxyPassword)
def load_preferences(self):
self.set_system_language.emit(
Preferences.get_or_default(SYSTEM_LANGUAGE_KEY, SYSTEM_LANGUAGE))
self.set_system_theme.emit(
- QT_QUICK_CONTROLS2_CONFIG.get_or_default('Material', 'Theme', SYSTEM_THEME_DEFAULT))
+ QT_QUICK_CONTROLS2_CONFIG.get_or_default(
+ 'Material', 'Theme', SYSTEM_THEME_DEFAULT))
self.set_file_filename_prefix_format.emit(
- Preferences.get_or_default(FILE_FILENAME_PREFIX_FORMAT_KEY, FILE_FILENAME_PREFIX_FORMAT_DEFAULT))
+ Preferences.get_or_default(
+ FILE_FILENAME_PREFIX_FORMAT_KEY,
+ FILE_FILENAME_PREFIX_FORMAT_DEFAULT))
self.set_file_overwrite_existing_file.emit(
Preferences.get_or_default(
- FILE_OVERWRITE_EXISTING_FILE_KEY, FILE_OVERWRITE_EXISTING_FILE_DEFAULT, type=bool))
+ FILE_OVERWRITE_EXISTING_FILE_KEY,
+ FILE_OVERWRITE_EXISTING_FILE_DEFAULT, type=bool))
self.set_network_scihub_urls.emit(
- Preferences.get_or_default(NETWORK_SCIHUB_URLS_KEY, NETWORK_SCIHUB_URLS_DEFAULT))
+ Preferences.get_or_default(
+ NETWORK_SCIHUB_URLS_KEY, NETWORK_SCIHUB_URLS_DEFAULT))
self.set_network_scihub_url.emit(
- Preferences.get_or_default(NETWORK_SCIHUB_URL_KEY, NETWORK_SCIHUB_URL_DEFAULT))
+ Preferences.get_or_default(
+ NETWORK_SCIHUB_URL_KEY, NETWORK_SCIHUB_URL_DEFAULT))
self.set_network_timeout.emit(
- Preferences.get_or_default(NETWORK_TIMEOUT_KEY, NETWORK_TIMEOUT_DEFAULT, type=int))
+ Preferences.get_or_default(
+ NETWORK_TIMEOUT_KEY, NETWORK_TIMEOUT_DEFAULT, type=int))
self.set_network_retry_times.emit(
- Preferences.get_or_default(NETWORK_RETRY_TIMES_KEY, NETWORK_RETRY_TIMES_DEFAULT, type=int))
+ Preferences.get_or_default(
+ NETWORK_RETRY_TIMES_KEY, NETWORK_RETRY_TIMES_DEFAULT, type=int))
self.set_network_proxy_enabled.emit(
- Preferences.get_or_default(NETWORK_PROXY_ENABLE_KEY, NETWORK_PROXY_ENABLE_DEFAULT, type=bool))
+ Preferences.get_or_default(
+ NETWORK_PROXY_ENABLE_KEY,
+ NETWORK_PROXY_ENABLE_DEFAULT, type=bool))
self.set_network_proxy_type.emit(
- Preferences.get_or_default(NETWORK_PROXY_TYPE_KEY, NETWORK_PROXY_TYPE_DEFAULT))
+ Preferences.get_or_default(
+ NETWORK_PROXY_TYPE_KEY, NETWORK_PROXY_TYPE_DEFAULT))
self.set_network_proxy_host.emit(
- Preferences.get_or_default(NETWORK_PROXY_HOST_KEY, NETWORK_PROXY_HOST_DEFAULT))
+ Preferences.get_or_default(
+ NETWORK_PROXY_HOST_KEY, NETWORK_PROXY_HOST_DEFAULT))
self.set_network_proxy_port.emit(
- Preferences.get_or_default(NETWORK_PROXY_PORT_KEY, NETWORK_PROXY_PORT_DEFAULT))
+ Preferences.get_or_default(
+ NETWORK_PROXY_PORT_KEY, NETWORK_PROXY_PORT_DEFAULT))
self.set_network_proxy_username.emit(
- Preferences.get_or_default(NETWORK_PROXY_USERNAME_KEY, NETWORK_PROXY_USERNAME_DEFAULT))
+ Preferences.get_or_default(
+ NETWORK_PROXY_USERNAME_KEY, NETWORK_PROXY_USERNAME_DEFAULT))
self.set_network_proxy_password.emit(
- Preferences.get_or_default(NETWORK_PROXY_PASSWORD_KEY, NETWORK_PROXY_PASSWORD_DEFAULT))
+ Preferences.get_or_default(
+ NETWORK_PROXY_PASSWORD_KEY, NETWORK_PROXY_PASSWORD_DEFAULT))
@property
def window(self):
@@ -123,13 +150,15 @@ def show_ui_add_scihub_url(self):
@Slot(int)
def remove_scihub_url(self, scihub_url_current_index):
- scihub_available_urls = Preferences.get_or_default(NETWORK_SCIHUB_URLS_KEY, NETWORK_SCIHUB_URLS_DEFAULT)
+ scihub_available_urls = Preferences.get_or_default(
+ NETWORK_SCIHUB_URLS_KEY, NETWORK_SCIHUB_URLS_DEFAULT)
del scihub_available_urls[scihub_url_current_index]
Preferences.set(NETWORK_SCIHUB_URLS_KEY, scihub_available_urls)
Preferences.set(NETWORK_SCIHUB_URL_KEY, scihub_available_urls[0])
- scihub_available_urls = Preferences.get_or_default(NETWORK_SCIHUB_URLS_KEY, NETWORK_SCIHUB_URLS_DEFAULT)
+ scihub_available_urls = Preferences.get_or_default(
+ NETWORK_SCIHUB_URLS_KEY, NETWORK_SCIHUB_URLS_DEFAULT)
self.set_network_scihub_urls.emit(scihub_available_urls)
self.set_network_scihub_url.emit(scihub_available_urls[0])
diff --git a/scihub_eva/ui/scihub_eva.py b/scihub_eva/ui/scihub_eva.py
index d99d301..7f1fa57 100644
--- a/scihub_eva/ui/scihub_eva.py
+++ b/scihub_eva/ui/scihub_eva.py
@@ -42,9 +42,12 @@ def __init__(self):
super(UISciHubEVA, self).__init__()
self._engine = QQmlApplicationEngine()
- self._engine.rootContext().setContextProperty('APPLICATION_VERSION', APPLICATION_VERSION)
- self._engine.rootContext().setContextProperty('PYTHON_VERSION', PYTHON_VERSION)
- self._engine.rootContext().setContextProperty('QT_VERSION', QT_VERSION)
+ self._engine.rootContext().setContextProperty(
+ 'APPLICATION_VERSION', APPLICATION_VERSION)
+ self._engine.rootContext().setContextProperty(
+ 'PYTHON_VERSION', PYTHON_VERSION)
+ self._engine.rootContext().setContextProperty(
+ 'QT_VERSION', QT_VERSION)
self._engine.load('qrc:/ui/SciHubEVA.qml')
self._window = self._engine.rootObjects()[0]
@@ -62,7 +65,8 @@ def __init__(self):
self._query_list_length = 0
self._captcha_img_file_path = None
- self._save_to_dir = Preferences.get_or_default(FILE_SAVE_TO_DIR_KEY, FILE_SAVE_TO_DIR_DEFAULT)
+ self._save_to_dir = Preferences.get_or_default(
+ FILE_SAVE_TO_DIR_KEY, FILE_SAVE_TO_DIR_DEFAULT)
self.set_save_to_dir.emit(self._save_to_dir)
@property
@@ -74,7 +78,8 @@ def _connect(self):
self._window.systemOpenSaveToDir.connect(self.system_open_save_to_dir)
self._window.showUIPreference.connect(self.show_ui_preference)
self._window.systemOpenLogFile.connect(self.system_open_log_file)
- self._window.systemOpenLogDirectory.connect(self.system_open_log_directory)
+ self._window.systemOpenLogDirectory.connect(
+ self.system_open_log_directory)
self._window.rampage.connect(self.rampage)
self.set_save_to_dir.connect(self._window.setSaveToDir)
@@ -124,7 +129,8 @@ def rampage(self, query_input):
self.rampage_query_list()
else:
self._logger.error(LOGGER_SEP)
- self._logger.error(self.tr('Query list file is not a text file!'))
+ self._logger.error(
+ self.tr('Query list file is not a text file!'))
elif is_range_query(query_input):
self._query_list = deque(gen_range_query_list(query_input))
self._query_list_length = len(self._query_list)
@@ -136,7 +142,8 @@ def rampage_query_list(self):
if self._query_list and len(self._query_list) > 0:
self._logger.info(LOGGER_SEP)
self._logger.info(self.tr('Dealing with {}/{} query ...').format(
- self._query_list_length - len(self._query_list) + 1, self._query_list_length))
+ self._query_list_length - len(self._query_list) + 1,
+ self._query_list_length))
self.rampage_query(self._query_list.popleft())
@@ -181,7 +188,8 @@ def show_captcha(self, pdf_captcha_response):
logger=self._logger)
_, captcha_img_url = scihub_api.get_captcha_info(pdf_captcha_response)
invert_color = True if is_app_dark_theme() == 1 else False
- captcha_img_file_path = scihub_api.download_captcha_img(captcha_img_url, invert_color=invert_color)
+ captcha_img_file_path = scihub_api.download_captcha_img(
+ captcha_img_url, invert_color=invert_color)
self._captcha_img_file_path = captcha_img_file_path.resolve().as_posix()
captcha_img_local_uri = captcha_img_file_path.as_uri()
@@ -189,5 +197,6 @@ def show_captcha(self, pdf_captcha_response):
center_window(self._ui_captcha.window, self._window)
def remove_captcha_img(self):
- if os.path.exists(self._captcha_img_file_path) and os.path.isfile(self._captcha_img_file_path):
+ if os.path.exists(self._captcha_img_file_path) and os.path.isfile(
+ self._captcha_img_file_path):
os.remove(self._captcha_img_file_path)
diff --git a/scihub_eva/utils/api_utils.py b/scihub_eva/utils/api_utils.py
index 6c7ec0f..86adc30 100644
--- a/scihub_eva/utils/api_utils.py
+++ b/scihub_eva/utils/api_utils.py
@@ -10,7 +10,8 @@
RANGE_QUERY_PATTERN = re.compile(r'\{\d+\-\d+\}')
-DOI_PATTERN = re.compile(r'\b(10[.][0-9]{4,}(?:[.][0-9]+)*/(?:(?!["&\'])\S)+)\b')
+DOI_PATTERN = re.compile(
+ r'\b(10[.][0-9]{4,}(?:[.][0-9]+)*/(?:(?!["&\'])\S)+)\b')
def is_range_query(query_input: str) -> bool:
@@ -29,11 +30,14 @@ def gen_range_query_list(query_input: str) -> List[str]:
if len(range_from) == len(range_to):
digit = len(range_from)
range_item_pattern = '{:0>' + str(digit) + 'd}'
- range_items = [range_item_pattern.format(i) for i in range(int(range_from), int(range_to) + 1)]
+ range_items = [range_item_pattern.format(i) \
+ for i in range(int(range_from), int(range_to) + 1)]
else:
- range_items = [str(i) for i in range(int(range_from), int(range_to) + 1)]
+ range_items = [
+ str(i) for i in range(int(range_from), int(range_to) + 1)]
- return [query_input.replace(range_pattern, range_item) for range_item in range_items]
+ return [query_input.replace(range_pattern, range_item) for range_item in
+ range_items]
def guess_query_type(query):
@@ -76,7 +80,8 @@ def get_pdf_metadata(pdf) -> dict:
if title and title != '':
metadata['title'] = title
- year = pdf_metadata_moddate_to_year(make_pdf_metadata_str(pdf_metadata.get('ModDate', '')))
+ year = pdf_metadata_moddate_to_year(
+ make_pdf_metadata_str(pdf_metadata.get('ModDate', '')))
if year and year != '':
metadata['year'] = year
except Exception as e:
diff --git a/scihub_eva/utils/logging_utils.py b/scihub_eva/utils/logging_utils.py
index 7ec2f56..d021ba2 100644
--- a/scihub_eva/utils/logging_utils.py
+++ b/scihub_eva/utils/logging_utils.py
@@ -12,15 +12,17 @@
DEFAULT_LOG_DIRECTORY = logs_dir()
DEFAULT_LOG_FILE = DEFAULT_LOG_DIRECTORY / 'SciHubEVA.log'
-DEFAULT_LOG_HANDLER = TimedRotatingFileHandler(DEFAULT_LOG_FILE.resolve().as_posix(), when='d', encoding='utf-8')
+DEFAULT_LOG_HANDLER = TimedRotatingFileHandler(
+ DEFAULT_LOG_FILE.resolve().as_posix(), when='d', encoding='utf-8')
DEFAULT_LOG_HANDLER.setLevel(logging.INFO)
-DEFAULT_LOG_FORMATTER = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
+DEFAULT_LOG_FORMATTER = logging.Formatter(
+ '%(asctime)s - %(levelname)s - %(message)s')
DEFAULT_LOG_HANDLER.setFormatter(DEFAULT_LOG_FORMATTER)
DEFAULT_LOGGER.addHandler(DEFAULT_LOG_HANDLER)
-LOGGER_SEP = '-' * 100
+LOGGER_SEP = '–' * 30
def format_log_message(message):
diff --git a/scihub_eva/utils/network_utils.py b/scihub_eva/utils/network_utils.py
index c7c3825..9dd0858 100644
--- a/scihub_eva/utils/network_utils.py
+++ b/scihub_eva/utils/network_utils.py
@@ -14,24 +14,31 @@ def get_session():
'User-Agent':
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) '
'AppleWebKit/537.36 (KHTML, like Gecko) '
- 'Chrome/94.0.4606.81 '
+ 'Chrome/113.0.0.0 '
'Safari/537.36'
}
- retry_times = Preferences.get_or_default(NETWORK_RETRY_TIMES_KEY, NETWORK_RETRY_TIMES_DEFAULT, type=int)
+ retry_times = Preferences.get_or_default(
+ NETWORK_RETRY_TIMES_KEY, NETWORK_RETRY_TIMES_DEFAULT, type=int)
adapter = HTTPAdapter(max_retries=retry_times)
sess.mount('http://', adapter)
sess.mount('https://', adapter)
- proxy_enabled = Preferences.get_or_default(NETWORK_PROXY_ENABLE_KEY, NETWORK_PROXY_ENABLE_DEFAULT, type=bool)
+ proxy_enabled = Preferences.get_or_default(
+ NETWORK_PROXY_ENABLE_KEY, NETWORK_PROXY_ENABLE_DEFAULT, type=bool)
if proxy_enabled:
- proxy_type = Preferences.get_or_default(NETWORK_PROXY_TYPE_KEY, NETWORK_PROXY_TYPE_DEFAULT)
- proxy_host = Preferences.get_or_default(NETWORK_PROXY_HOST_KEY, NETWORK_PROXY_HOST_DEFAULT)
- proxy_port = Preferences.get_or_default(NETWORK_PROXY_PORT_KEY, NETWORK_PROXY_PORT_DEFAULT)
- proxy_username = Preferences.get_or_default(NETWORK_PROXY_USERNAME_KEY, NETWORK_PROXY_USERNAME_DEFAULT)
- proxy_password = Preferences.get_or_default(NETWORK_PROXY_PASSWORD_KEY, NETWORK_PROXY_PASSWORD_DEFAULT)
+ proxy_type = Preferences.get_or_default(
+ NETWORK_PROXY_TYPE_KEY, NETWORK_PROXY_TYPE_DEFAULT)
+ proxy_host = Preferences.get_or_default(
+ NETWORK_PROXY_HOST_KEY, NETWORK_PROXY_HOST_DEFAULT)
+ proxy_port = Preferences.get_or_default(
+ NETWORK_PROXY_PORT_KEY, NETWORK_PROXY_PORT_DEFAULT)
+ proxy_username = Preferences.get_or_default(
+ NETWORK_PROXY_USERNAME_KEY, NETWORK_PROXY_USERNAME_DEFAULT)
+ proxy_password = Preferences.get_or_default(
+ NETWORK_PROXY_PASSWORD_KEY, NETWORK_PROXY_PASSWORD_DEFAULT)
proxy = proxy_type + '://'
diff --git a/scihub_eva/utils/path_utils.py b/scihub_eva/utils/path_utils.py
index 7ae4817..1a7a721 100644
--- a/scihub_eva/utils/path_utils.py
+++ b/scihub_eva/utils/path_utils.py
@@ -18,11 +18,14 @@
def logs_dir():
if is_macos():
- logs_dir_path = Path.home() / 'Library/Logs/' / ORGANIZATION_NAME / APPLICATION_NAME
+ logs_dir_path = Path.home() / 'Library/Logs/' / \
+ ORGANIZATION_NAME / APPLICATION_NAME
elif is_windows():
- logs_dir_path = Path.home() / 'AppData/Local/' / ORGANIZATION_NAME / APPLICATION_NAME / 'logs'
+ logs_dir_path = Path.home() / 'AppData/Local/' / \
+ ORGANIZATION_NAME / APPLICATION_NAME / 'logs'
elif is_linux():
- logs_dir_path = Path.home() / '/var/log/' / ORGANIZATION_NAME / APPLICATION_NAME
+ logs_dir_path = Path.home() / '/var/log/' / \
+ ORGANIZATION_NAME / APPLICATION_NAME
else:
logs_dir_path = LOCAL_LOGS_DIR
diff --git a/scihub_eva/utils/preferences_utils.py b/scihub_eva/utils/preferences_utils.py
index d03bbe8..85a97bf 100644
--- a/scihub_eva/utils/preferences_utils.py
+++ b/scihub_eva/utils/preferences_utils.py
@@ -11,10 +11,18 @@
class Preferences(object):
if is_macos():
QSettings.setDefaultFormat(QSettings.Format.NativeFormat)
- SETTINGS = QSettings(QSettings.NativeFormat, QSettings.UserScope, ORGANIZATION_DOMAIN, APPLICATION_NAME)
+ SETTINGS = QSettings(
+ QSettings.NativeFormat,
+ QSettings.UserScope,
+ ORGANIZATION_DOMAIN,
+ APPLICATION_NAME)
else:
QSettings.setDefaultFormat(QSettings.Format.IniFormat)
- SETTINGS = QSettings(QSettings.IniFormat, QSettings.UserScope, ORGANIZATION_DOMAIN, APPLICATION_NAME)
+ SETTINGS = QSettings(
+ QSettings.IniFormat,
+ QSettings.UserScope,
+ ORGANIZATION_DOMAIN,
+ APPLICATION_NAME)
def __init__(self):
super(Preferences, self).__init__()
@@ -70,7 +78,8 @@ def save(self):
self.write(f, space_around_delimiters=self._space_around_delimiters)
-QT_QUICK_CONTROLS2_CONFIG = Config((PREFERENCES_DIR / 'qtquickcontrols2.conf').resolve().as_posix())
+QT_QUICK_CONTROLS2_CONFIG = Config(
+ (PREFERENCES_DIR / 'qtquickcontrols2.conf').resolve().as_posix())
def is_app_dark_theme():
diff --git a/scihub_eva/utils/sys_utils.py b/scihub_eva/utils/sys_utils.py
index 52949b7..c298230 100644
--- a/scihub_eva/utils/sys_utils.py
+++ b/scihub_eva/utils/sys_utils.py
@@ -64,7 +64,8 @@ def is_system_dark_theme():
if is_windows():
k = winreg.OpenKey(
- winreg.HKEY_CURRENT_USER, 'Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize')
+ winreg.HKEY_CURRENT_USER,
+ 'Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize')
try:
return winreg.QueryValueEx(k, 'AppsUseLightTheme')[0] == 0
except Exception:
diff --git a/ui/About.qml b/ui/About.qml
index 0621fac..ef589ad 100644
--- a/ui/About.qml
+++ b/ui/About.qml
@@ -5,24 +5,28 @@ import QtQuick.Window
import QtQuick.Controls.Material
Dialog {
+ id: dialog
+
x: (parent.width - width) / 2
y: (parent.height - height) / 2
modal: true
+ Material.roundedScale: Material.SmallScale
+
ColumnLayout {
anchors.fill: parent
RowLayout {
Layout.fillWidth: true
- spacing: 10
+ spacing: 8
Image {
Layout.alignment: Qt.AlignTop
- sourceSize.height: 96
- sourceSize.width: 96
+ sourceSize.height: 128
+ sourceSize.width: 128
source: "qrc:/images/SciHubEVA-icon.png"
}
@@ -32,7 +36,7 @@ Dialog {
"" + "Sci-Hub EVA " +
qsTr("is a cross-platform Sci-Hub GUI Application.") + "
" +
"Powered By Python " + PYTHON_VERSION + " & Qt " + QT_VERSION + "
Copyright (c) 2018-2022 " + qsTr("Leo Van") +
+ " Copyright (c) 2018-2023 " + qsTr("Leo Van") +
" The MIT License
" +
- qsTr("{author}: Author, {year}: Year, {title}: Title, {id}: DOI or PMID")
- Layout.columnSpan: 2
- }
+ TextField {
+ id: textFieldPreferencesFileFilenamePrefixFormat
- Label {
- text: qsTr("Overwrite Existing File: ")
- }
+ Layout.fillWidth: true
+
+ selectByMouse: true
+ }
+ }
+
+ RowLayout {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
+
+ Label {
+ text: qsTr("Supported Keywords: ")
+
+ Layout.alignment: Qt.AlignTop
+ }
+
+ ColumnLayout {
+ Label {
+ text: qsTr("{author}: Author")
+ }
+
+ Label {
+ text: qsTr("{year}: Year")
+ }
+
+ Label {
+ text: qsTr("{title}: Title")
+ }
- Switch {
- id: switchPreferencesFileOverwrite
- text: checked ? qsTr("Yes") : qsTr("No")
- display: AbstractButton.TextBesideIcon
+ Label {
+ text: qsTr("{id}: DOI or PMID")
+ }
+ }
+ }
}
}
}
Item {
- id: itemTabPreferencesNetwork
+ id: itemPreferencesNetwork
- Layout.fillHeight: true
- Layout.fillWidth: true
+ ScrollView {
+ id: scrollViewPreferencesNetwork
- GridLayout {
- rowSpacing: 0
- columnSpacing: 3
-
- anchors.right: parent.right
- anchors.left: parent.left
- anchors.top: parent.top
+ anchors.fill: parent
- rows: 9
- columns: 2
+ ColumnLayout {
+ width: Math.max(implicitWidth, scrollViewPreferencesNetwork.width)
- Label {
- text: qsTr("SciHub URL: ")
- }
+ RowLayout {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
- RowLayout {
- Layout.fillWidth: true
+ Label {
+ text: qsTr("SciHub URL: ")
+ }
- ComboBox {
- id: comboBoxPreferencesNetworkSciHubURL
+ ComboBox {
+ id: comboBoxPreferencesNetworkSciHubURL
- Layout.minimumWidth: 160
- Layout.fillWidth: true
- }
+ Layout.fillWidth: true
+ }
- RoundButton {
- id: roundButtonPreferencesNetworkSciHubURLAdd
- text: "+"
+ RoundButton {
+ id: roundButtonPreferencesNetworkSciHubURLAdd
+ text: "+"
- onClicked: {
- showUIAddSciHubURL()
+ onClicked: {
+ showUIAddSciHubURL()
+ }
}
- }
- RoundButton {
- id: roundButtonPreferencesNetworkSciHubURLRemove
- text: "-"
-
- onClicked: {
- if (comboBoxPreferencesNetworkSciHubURL.count <= 1) {
- dialogPreferencesMessage.messageType = "error"
- dialogPreferencesMessage.message = qsTr("Cannot remove the last Sci-Hub URL!")
- dialogPreferencesMessage.open()
- } else {
- var message = qsTr("Delete Sci-Hub URL: ") + comboBoxPreferencesNetworkSciHubURL.currentText + " ?"
- dialogPreferencesRemoveSciHubURLConfirmMessage.messageType = "question"
- dialogPreferencesRemoveSciHubURLConfirmMessage.message = message
- dialogPreferencesRemoveSciHubURLConfirmMessage.open()
+ RoundButton {
+ id: roundButtonPreferencesNetworkSciHubURLRemove
+ text: "-"
+
+ onClicked: {
+ if (comboBoxPreferencesNetworkSciHubURL.count <= 1) {
+ dialogPreferencesMessage.messageType = "error"
+ dialogPreferencesMessage.message = qsTr("Cannot remove the last Sci-Hub URL!")
+ dialogPreferencesMessage.open()
+ } else {
+ var message = qsTr("Delete Sci-Hub URL: ") + comboBoxPreferencesNetworkSciHubURL.currentText + " ?"
+ dialogPreferencesRemoveSciHubURLConfirmMessage.messageType = "question"
+ dialogPreferencesRemoveSciHubURLConfirmMessage.message = message
+ dialogPreferencesRemoveSciHubURLConfirmMessage.open()
+ }
}
}
}
- }
- Label {
- text: qsTr("Timeout: ")
- }
+ RowLayout {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
- RowLayout {
- width: 100
- height: 100
- TextField {
- id: textFieldPreferencesNetworkTimeout
+ Label {
+ text: qsTr("Timeout: ")
+ }
- implicitWidth: 60
- Layout.fillWidth: false
+ TextField {
+ id: textFieldPreferencesNetworkTimeout
- horizontalAlignment: Text.AlignHCenter
- selectByMouse: true
- validator: RegularExpressionValidator {
- regularExpression: /[0-9]+/
+ Layout.fillWidth: true
+
+ horizontalAlignment: Text.AlignHCenter
+ selectByMouse: true
+ validator: RegularExpressionValidator {
+ regularExpression: /[0-9]+/
+ }
}
- }
- Label {
- text: "ms"
- }
- }
+ Label {
+ text: "ms"
+ }
- Label {
- text: qsTr("Retry Times: ")
- }
+ ToolSeparator {}
+
+ Label {
+ text: qsTr("Retry Times: ")
+ }
- TextField {
- id: textFieldPreferencesNetworkRetryTimes
+ TextField {
+ id: textFieldPreferencesNetworkRetryTimes
- implicitWidth: 60
- Layout.fillWidth: false
+ Layout.fillWidth: true
- horizontalAlignment: Text.AlignHCenter
- selectByMouse: true
- validator: RegularExpressionValidator {
- regularExpression: /[0-9]+/
+ horizontalAlignment: Text.AlignHCenter
+ selectByMouse: true
+ validator: RegularExpressionValidator {
+ regularExpression: /[0-9]+/
+ }
+ }
}
- }
- Label {
- text: qsTr("Enable Proxy")
- }
+ RowLayout {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
- Switch {
- id: switchPreferencesNetworkEnableProxy
- text: checked ? qsTr("Yes") : qsTr("No")
- }
+ Label {
+ text: qsTr("Enable Proxy")
+ }
- Label {
- text: qsTr("Proxy Type: ")
- }
+ Switch {
+ id: switchPreferencesNetworkEnableProxy
+ }
- RowLayout {
- width: 100
- height: 100
+ ToolSeparator {}
- RadioButton {
- id: radioButtonPreferencesNetworkProxyTypeHTTP
- text: "HTTP"
- }
+ Label {
+ text: qsTr("Proxy Type: ")
+ }
- RadioButton {
- id: radioButtonPreferencesNetworkProxyTypeSocks5
- text: "SOCKS5"
+ RadioButton {
+ id: radioButtonPreferencesNetworkProxyTypeHTTP
+ text: "HTTP"
+ }
+
+ RadioButton {
+ id: radioButtonPreferencesNetworkProxyTypeSocks5
+ text: "SOCKS5"
+ }
}
- }
+ RowLayout {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
- Label {
- text: qsTr("Proxy Host: ")
- }
+ Label {
+ text: qsTr("Proxy Host: ")
+ }
- TextField {
- id: textFieldPreferencesNetworkProxyHost
+ TextField {
+ id: textFieldPreferencesNetworkProxyHost
- implicitWidth: 200
- Layout.fillWidth: true
+ Layout.fillWidth: true
- selectByMouse: true
- }
+ selectByMouse: true
+ }
+ }
- Label {
- text: qsTr("Proxy Port: ")
- }
+ RowLayout {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
+
+ Label {
+ text: qsTr("Proxy Port: ")
+ }
- TextField {
- id: textFieldPreferencesNetworkProxyPort
+ TextField {
+ id: textFieldPreferencesNetworkProxyPort
- implicitWidth: 200
- Layout.fillWidth: true
+ Layout.fillWidth: true
- selectByMouse: true
- validator: RegularExpressionValidator {
- regularExpression: /[0-9]+/
+ selectByMouse: true
+ validator: RegularExpressionValidator {
+ regularExpression: /[0-9]+/
+ }
+ }
}
- }
- Label {
- text: qsTr("Proxy Username: ")
- }
+ RowLayout {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
- TextField {
- id: textFieldPreferencesNetworkProxyUsername
+ Label {
+ text: qsTr("Proxy Username: ")
+ }
- implicitWidth: 200
- Layout.fillWidth: true
+ TextField {
+ id: textFieldPreferencesNetworkProxyUsername
- selectByMouse: true
- }
+ Layout.fillWidth: true
- Label {
- text: qsTr("Proxy Password: ")
- }
+ selectByMouse: true
+ }
+ }
+
+ RowLayout {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
+
+ Label {
+ text: qsTr("Proxy Password: ")
+ }
- TextField {
- id: textFieldPreferencesNetworkProxyPassword
+ TextField {
+ id: textFieldPreferencesNetworkProxyPassword
- implicitWidth: 200
- Layout.fillWidth: true
+ Layout.fillWidth: true
- echoMode: TextInput.Password
+ echoMode: TextInput.Password
+ }
+ }
}
}
}
@@ -640,5 +670,3 @@ ApplicationWindow {
}
}
}
-
-
diff --git a/ui/SciHubEVA.qml b/ui/SciHubEVA.qml
index 73b40b7..e9e0074 100644
--- a/ui/SciHubEVA.qml
+++ b/ui/SciHubEVA.qml
@@ -16,7 +16,7 @@ ApplicationWindow {
visible: true
- property int margin: 10
+ property int margin: 8
property int theme: Material.theme
width: columnLayoutApplication.implicitWidth + 2 * margin
@@ -165,6 +165,7 @@ ApplicationWindow {
text: qsTr("Rampage")
font.bold: false
+ Layout.minimumWidth: implicitWidth
Layout.fillWidth: true
onClicked: {
@@ -187,6 +188,7 @@ ApplicationWindow {
text: qsTr("Load")
font.bold: false
+ Layout.minimumWidth: implicitWidth
Layout.fillWidth: true
onClicked: fileDialogQueryList.open()
@@ -221,6 +223,7 @@ ApplicationWindow {
text: qsTr("Open")
font.bold: false
+ Layout.minimumWidth: implicitWidth
Layout.fillWidth: true
onClicked: folderDialogSaveTo.open()
@@ -231,6 +234,7 @@ ApplicationWindow {
text: qsTr("Show")
font.bold: false
+ Layout.minimumWidth: implicitWidth
Layout.fillWidth: true
onClicked: systemOpenSaveToDir(textFieldSaveToDir.text.trim())
@@ -256,26 +260,28 @@ ApplicationWindow {
flickableDirection: Flickable.VerticalFlick
- Layout.minimumWidth: 600
Layout.minimumHeight: 200
+ Layout.fillWidth: true
- function scrollToBottom() {
- if (contentHeight > height) {
- contentY = contentHeight - height
- }
+ ScrollBar.vertical: UIElements.ScrollBar {
+ id: scrollBarLogs
}
TextArea.flickable: TextArea {
id: textAreaLogs
- font.pointSize: labelLogs.font.pointSize
textFormat: Text.RichText
wrapMode: Text.WordWrap
readOnly: true
selectByMouse: true
horizontalAlignment: Text.AlignLeft
- onTextChanged: flickableLogs.scrollToBottom()
+ Layout.fillWidth: true
+
+ onTextChanged: {
+ scrollBarLogs.position = 1.0 - scrollBarLogs.size
+ }
+
onLinkActivated: (link) => {
Qt.openUrlExternally(link)
}
diff --git a/ui/elements/IconButton.qml b/ui/elements/IconButton.qml
index bf182d5..b17d6c2 100644
--- a/ui/elements/IconButton.qml
+++ b/ui/elements/IconButton.qml
@@ -6,14 +6,29 @@ Button {
id: button
property string iconSource
- property real iconSize: labelText.font.pointSize * 1.6
+ readonly property real iconSize: 20
+ readonly property bool hasIcon: iconSource.toString().length > 0
+ readonly property bool hasText: button.text.toString().length > 0
+ readonly property bool hasOnlyIcon: hasIcon && !hasText
- implicitWidth: leftPadding + rightPadding + rowContent.implicitWidth
+ topInset: 6
+ bottomInset: 6
+ verticalPadding: 14
+ leftPadding: hasOnlyIcon ? 8 : hasIcon ? 16 : 24
+ rightPadding: hasOnlyIcon ? 8 : 24
+
+ implicitWidth: hasIcon ?
+ Math.min(implicitBackgroundWidth + leftInset + rightInset,
+ implicitContentWidth + leftPadding + rightPadding) :
+ Math.max(implicitBackgroundWidth + leftInset + rightInset,
+ implicitContentWidth + leftPadding + rightPadding)
+ implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+ implicitContentHeight + topPadding + bottomPadding)
contentItem: Row {
id: rowContent
- spacing: 6
+ spacing: 8
anchors.horizontalCenter: parent.horizontalCenter
AnimatedImage {
@@ -21,13 +36,13 @@ Button {
playing: true
source: iconSource
height: iconSize
- width: iconSize
+ width: hasIcon ? iconSize : 0
anchors.verticalCenter: parent.verticalCenter
}
Label {
id: labelText
- text: parent.parent.text
+ text: button.text
anchors.verticalCenter: parent.verticalCenter
}
}
diff --git a/ui/elements/ItemDelegate.qml b/ui/elements/ItemDelegate.qml
new file mode 100644
index 0000000..354fa89
--- /dev/null
+++ b/ui/elements/ItemDelegate.qml
@@ -0,0 +1,60 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Controls.Material
+import QtQuick.Controls.Material.impl
+import QtQml.Models
+
+ItemDelegate {
+ id: control
+
+ readonly property real iconSize: 20
+
+ highlighted: ListView.isCurrentItem
+
+ RowLayout {
+ Layout.fillHeight: true
+ Layout.fillWidth: true
+
+ anchors.fill: parent
+ Layout.alignment: Qt.AlignCenter | Qt.AlignVCenter
+
+ Image {
+ source: iconSource
+
+ sourceSize.height: iconSize
+ sourceSize.width: iconSize
+
+ Layout.leftMargin: 8
+ }
+
+ Label {
+ id: labelDelegateToolsItemText
+
+ text: name
+ font.weight: Font.Medium
+
+ Layout.rightMargin: 8
+ Layout.fillWidth: true
+ }
+ }
+
+ background: Rectangle {
+ implicitHeight: control.Material.delegateHeight
+ color: control.highlighted ? control.Material.listHighlightColor : "transparent"
+ radius: Material.ExtraSmallScale
+
+ Ripple {
+ width: parent.width
+ height: parent.height
+
+ clip: visible
+ pressed: control.pressed
+ anchor: control
+ active: enabled && (control.down || control.visualFocus || control.hovered)
+ color: control.Material.rippleColor
+ clipRadius: Material.ExtraSmallScale
+ }
+ }
+}
diff --git a/ui/elements/Message.qml b/ui/elements/Message.qml
index 05abc0f..98fdfed 100644
--- a/ui/elements/Message.qml
+++ b/ui/elements/Message.qml
@@ -4,18 +4,25 @@ import QtQuick.Controls
import QtQuick.Window
Dialog {
+ id: dialog
+
x: (parent.width - width) / 2
y: (parent.height - height) / 2
modal: true
closePolicy: Popup.NoAutoClose
+ Material.roundedScale: Material.SmallScale
property string message
property string messageType
ColumnLayout {
anchors.fill: parent
+ focus: true
+
+ Keys.onReturnPressed: dialog.accept()
+ Keys.onEscapePressed: dialog.reject()
RowLayout {
Layout.fillWidth: true
diff --git a/ui/elements/ScrollBar.qml b/ui/elements/ScrollBar.qml
new file mode 100644
index 0000000..270501a
--- /dev/null
+++ b/ui/elements/ScrollBar.qml
@@ -0,0 +1,55 @@
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls.Material
+
+T.ScrollBar {
+ id: control
+
+ implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+ implicitContentWidth + leftPadding + rightPadding)
+ implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+ implicitContentHeight + topPadding + bottomPadding)
+
+ padding: control.interactive ? 1 : 2
+ visible: control.policy !== T.ScrollBar.AlwaysOff
+ minimumSize: orientation === Qt.Horizontal ? height / width : width / height
+
+ contentItem: Rectangle {
+ implicitWidth: control.interactive ? 9 : 4
+ implicitHeight: control.interactive ? 9 : 4
+
+ color: control.pressed ? control.Material.scrollBarPressedColor :
+ control.interactive && control.hovered ? control.Material.scrollBarHoveredColor : control.Material.scrollBarColor
+ opacity: 0.0
+ radius: Material.ExtraSmallScale
+ }
+
+ background: Rectangle {
+ implicitWidth: control.interactive ? 12 : 4
+ implicitHeight: control.interactive ? 12 : 4
+ color: "#0e000000"
+ opacity: 0.0
+ radius: Material.ExtraSmallScale
+ visible: control.interactive
+ }
+
+ states: State {
+ name: "active"
+ when: control.policy === T.ScrollBar.AlwaysOn || (control.active && control.size < 1.0)
+ }
+
+ transitions: [
+ Transition {
+ to: "active"
+ NumberAnimation { targets: [control.contentItem, control.background]; property: "opacity"; to: 1.0 }
+ },
+ Transition {
+ from: "active"
+ SequentialAnimation {
+ PropertyAction{ targets: [control.contentItem, control.background]; property: "opacity"; value: 1.0 }
+ PauseAnimation { duration: 2450 }
+ NumberAnimation { targets: [control.contentItem, control.background]; property: "opacity"; to: 0.0 }
+ }
+ }
+ ]
+}