bump version to 5.1.2

leovan · Feb 12, 2022 · 4b1200e · 4b1200e
1 parent 9e2d2a6
commit 4b1200e
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 74 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [5.1.2](https://github.com/leovan/SciHubEVA/compare/v5.1.1...v5.1.2) (2022-02-12)
+
+### Bug Fixes
+
+- Fix error fetching PDF URL from different version sci-hub website mirror.  ([#47](https://github.com/leovan/SciHubEVA/issues/47))
+
 ## [5.1.1](https://github.com/leovan/SciHubEVA/compare/v5.1.0...v5.1.1) (2021-10-16)
 
 ### Bug Fixes

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2021 Leo Van
+Copyright (c) 2018-2022 Leo Van
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/building/README.md b/building/README.md
@@ -23,9 +23,9 @@
 
    # Generate translations source of Python files
    pyside6-lupdate \
-      scihub_eva/api/*.py \
-      scihub_eva/ui/*.py \
-      -ts i18n/SciHubEVA_zh_CN.ts
+     scihub_eva/api/*.py \
+     scihub_eva/ui/*.py \
+     -ts i18n/SciHubEVA_zh_CN.ts
 
    # Do translations with Qt Linguist
    # ......
@@ -50,19 +50,19 @@
    pyside6-rcc SciHubEVA.qrc -o scihub_eva/resources.py
 
    pyinstaller app.py \
-      --workpath "build-macOS" \
-      --distpath "dist-macOS" \
-      --hidden-import "socks" \
-      --hidden-import "PIL" \
-      --add-data "LICENSE:." \
-      --add-data "preferences/qtquickcontrols2.conf:preferences" \
-      --add-data "images/SciHubEVA-icon.png:images" \
-      --add-data "i18n/*.qm:i18n" \
-      --name "SciHubEVA" \
-      --icon "building/macOS/SciHubEVA.icns" \
-      --onedir \
-      --windowed \
-      --noupx
+     --workpath "build-macOS" \
+     --distpath "dist-macOS" \
+     --hidden-import "socks" \
+     --hidden-import "PIL" \
+     --add-data "LICENSE:." \
+     --add-data "preferences/qtquickcontrols2.conf:preferences" \
+     --add-data "images/SciHubEVA-icon.png:images" \
+     --add-data "i18n/*.qm:i18n" \
+     --name "SciHubEVA" \
+     --icon "building/macOS/SciHubEVA.icns" \
+     --onedir \
+     --windowed \
+     --noupx
 
    cp building/macOS/Info.plist dist-macOS/SciHubEVA.app/Contents
 
@@ -75,9 +75,23 @@
 5. Package with `appdmg`. Install [Node.js](https://nodejs.org) first, then run the following commands:
 
    ```bash
-   npm install -g appdmg
-
-   appdmg building/macOS/SciHubEVA.dmg.json dist-macOS/SciHubEVA.dmg
+   brew install create-dmg
+
+   create-dmg \
+     --volname "Sci-Hub EVA" \
+     --volicon "building/macOS/SciHubEVA-dmg.icns" \
+     --background "building/macOS/SciHubEVA-dmg-background.png" \
+     --window-pos 200 120 \
+     --window-size 600 430 \
+     --text-size 14 \
+     --icon-size 100 \
+     --icon "SciHubEVA.app" 100 150 \
+     --hide-extension "SciHubEVA.app" \
+     --app-drop-link 300 150 \
+     --eula "LICENSE" \
+     --format "UDBZ" \
+     "dist-macOS/SciHubEVA.dmg" \
+     "dist-macOS/SciHubEVA.app"
    ```
 
    `SciHubEVA.dmg` will be in `dist-macOS`.
@@ -99,20 +113,20 @@
    pyside6-rcc SciHubEVA.qrc -o scihub_eva/resources.py
 
    pyinstaller app.py ^
-      --workpath "build-Windows" ^
-      --distpath "dist-Windows" ^
-      --hidden-import "socks" ^
-      --hidden-import "PIL" ^
-      --add-data "LICENSE;." ^
-      --add-data "preferences/qtquickcontrols2.conf;preferences" ^
-      --add-data "images/SciHubEVA-icon.png;images" ^
-      --add-data "i18n/*.qm;i18n" ^
-      --name "SciHubEVA" ^
-      --icon "building/Windows/SciHubEVA.ico" ^
-      --version-file "building/Windows/SciHubEVA.win.version" ^
-      --windowed ^
-      --clean ^
-      --noupx
+     --workpath "build-Windows" ^
+     --distpath "dist-Windows" ^
+     --hidden-import "socks" ^
+     --hidden-import "PIL" ^
+     --add-data "LICENSE;." ^
+     --add-data "preferences/qtquickcontrols2.conf;preferences" ^
+     --add-data "images/SciHubEVA-icon.png;images" ^
+     --add-data "i18n/*.qm;i18n" ^
+     --name "SciHubEVA" ^
+     --icon "building/Windows/SciHubEVA.ico" ^
+     --version-file "building/Windows/SciHubEVA.win.version" ^
+     --windowed ^
+     --clean ^
+     --noupx
 
    :: Post process
    python building/post_process.py

diff --git a/building/Windows/SciHubEVA.iss b/building/Windows/SciHubEVA.iss
@@ -1,5 +1,5 @@
 #define MyAppName "Sci-Hub EVA"
-#define MyAppVersion "5.1.1"
+#define MyAppVersion "5.1.2"
 #define MyAppPublisher "Leo Van"
 #define MyAppURL "https://github.com/leovan/SciHubEVA"
 #define MyAppExeName "SciHubEVA.exe"
@@ -12,7 +12,8 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-AppCopyright=Copyright (c) 2018-2021 Leo Van.
+AppCopyright=Copyright (c) 2018-2022 Leo Van.
+VersionInfoVersion={#MyAppVersion}
 DefaultDirName={autopf64}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes

diff --git a/building/Windows/SciHubEVA.win.version b/building/Windows/SciHubEVA.win.version
@@ -1,7 +1,7 @@
 VSVersionInfo(
   ffi=FixedFileInfo(
-    filevers=(5, 1, 1, 0),
-    prodvers=(5, 1, 1, 0),
+    filevers=(5, 1, 2, 0),
+    prodvers=(5, 1, 2, 0),
     mask=0x3f,
     flags=0x0,
     OS=0x4,
@@ -16,12 +16,12 @@ VSVersionInfo(
         u'040904B0',
         [StringStruct(u'CompanyName', u'Leo Van'),
         StringStruct(u'FileDescription', u'Sci-Hub EVA'),
-        StringStruct(u'FileVersion', u'5.1.1.0'),
+        StringStruct(u'FileVersion', u'5.1.2.0'),
         StringStruct(u'InternalName', u'SciHubEVA'),
         StringStruct(u'LegalCopyright', u'\xa9 2018-2020 Leo Van.'),
         StringStruct(u'OriginalFilename', u'SciHubEVA.Exe'),
         StringStruct(u'ProductName', u'Sci-Hub EVA'),
-        StringStruct(u'ProductVersion', u'5.1.1.0')])
+        StringStruct(u'ProductVersion', u'5.1.2.0')])
       ]),
     VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]

diff --git a/building/macOS/Info.plist b/building/macOS/Info.plist
@@ -9,7 +9,7 @@
     <key>CFBundleExecutable</key>
     <string>MacOS/SciHubEVA</string>
     <key>CFBundleShortVersionString</key>
-    <string>5.1.1</string>
+    <string>5.1.2</string>
     <key>LSBackgroundOnly</key>
     <string>0</string>
     <key>CFBundleName</key>

diff --git a/building/macOS/SciHubEVA.dmg.json b/building/macOS/SciHubEVA.dmg.json
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,3 +1,3 @@
-pyinstaller==4.7
+pyinstaller==4.9
 flask==2.0.2
 docopt==0.6.2
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 lxml==4.7.1
 pdfminer.six==20211012
-PySide6==6.2.2.1
-requests==2.26.0
+PySide6==6.2.3
+requests==2.27.1
 PySocks==1.7.1
-Pillow==9.0.0
+Pillow==9.0.1
 darkdetect==0.5.1
diff --git a/scihub_eva/globals/versions.py b/scihub_eva/globals/versions.py
@@ -3,4 +3,4 @@
 ORGANIZATION_NAME = 'LeoVan'
 ORGANIZATION_DOMAIN = 'leovan.me'
 APPLICATION_NAME = 'SciHubEVA'
-APPLICATION_VERSION = 'v5.1.1'
+APPLICATION_VERSION = 'v5.1.2'
diff --git a/ui/About.qml b/ui/About.qml
@@ -32,7 +32,7 @@ Dialog {
                       "<p>" + "<a href=\"https://github.com/leovan/SciHubEVA\">Sci-Hub EVA</a> " +
                       qsTr("is a cross-platform Sci-Hub GUI Application.") + "<br/>" +
                       "Powered By Python " + PYTHON_VERSION + " & Qt " + QT_VERSION + "</p>" +
-                      "<p>Copyright (c) 2018-2020 <a href=\"https://leovan.me\">" + qsTr("Leo Van") +
+                      "<p>Copyright (c) 2018-2022 <a href=\"https://leovan.me\">" + qsTr("Leo Van") +
                       "</a> The MIT License</p>"
 
                 Layout.fillWidth: true