Skip to content

Commit e14f677

Browse files
Added a progress bar for time-consuming imports; Several minor fixes;
1 parent f8b6e16 commit e14f677

2 files changed

Lines changed: 24 additions & 10 deletions

File tree

.github/workflows/release.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,18 @@ jobs:
5555
id: check_files_changed
5656
run: |
5757
git fetch origin master
58-
CHANGED_FILES=$(git diff --name-only HEAD^ HEAD)
58+
CHANGED_FILES=$(git diff --name-only origin/master HEAD)
5959
echo "Changed files: $CHANGED_FILES"
60-
if echo "$CHANGED_FILES" | grep -qE "${{ env.BUILD_PATH }}/CalibreImport.config|${{ env.BUILD_PATH }}/CalibreImport.dll|${{ env.BUILD_PATH }}/Setup.ps1"; then
60+
if echo "$CHANGED_FILES" | grep -qE "CalibreImport/ReleaseFiles/CalibreImport.config|CalibreImport/ReleaseFiles/CalibreImport.dll|CalibreImport/ReleaseFiles/Setup.ps1"; then
6161
echo "FILES_CHANGED=true" >> $GITHUB_ENV
6262
else
6363
echo "FILES_CHANGED=false" >> $GITHUB_ENV
6464
fi
6565
66+
- name: Debugging - Print changed files
67+
run: |
68+
echo "Changed files: $CHANGED_FILES"
69+
6670
- name: Create and push tag (if it doesn't exist and files have changed)
6771
if: env.TAG_EXISTS == 'false' && env.FILES_CHANGED == 'true'
6872
run: |

CalibreImport/InnoSetup/CalibreImportSetup.iss

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[Setup]
22
AppName=YourAppName
33
AppVersion=1.0
4-
DefaultDirName={pf}\YourAppName
5-
DefaultGroupName=YourAppName
4+
DefaultDirName={pf}\CalibreImport
5+
DefaultGroupName=Calibre Import Shell Extension
66
UninstallDisplayIcon={app}\YourApp.exe
7-
OutputDir=.
8-
OutputBaseFilename=SetupYourApp
7+
OutputDir=..\ReleaseFiles
8+
OutputBaseFilename=CalibreImportSetup
99
Compression=lzma
1010
SolidCompression=yes
1111

1212
[Files]
13-
Source: "YourApp.dll"; DestDir: "{app}"; Flags: ignoreversion
14-
Source: "YourSettingsFile.ini"; DestDir: "{userappdata}\YourAppName"; Flags: ignoreversion
13+
Source: "..\ReleaseFiles\CalibreImport.dll"; DestDir: "{app}"; Flags: ignoreversion
14+
Source: "..\ReleaseFiles\CalibreImport.config"; DestDir: "{userappdata}\YourAppName"; Flags: ignoreversion
1515

1616
[Icons]
1717
Name: "{group}\YourAppName"; Filename: "{app}\YourApp.exe"
@@ -23,19 +23,29 @@ var
2323
InstallPath: String;
2424
2525
function IsDotNet48Installed: Boolean;
26+
var
27+
ReleaseVersion: Cardinal;
2628
begin
27-
Result := RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full') and
28-
(RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release') >= 528040);
29+
Result := False;
30+
if RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full') then
31+
begin
32+
if RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', ReleaseVersion) then
33+
begin
34+
Result := (ReleaseVersion >= 528040);
35+
end;
36+
end;
2937
end;
3038
3139
procedure InitializeWizard;
3240
begin
41+
{ Check for .NET Framework 4.8 }
3342
if not IsDotNet48Installed then
3443
begin
3544
MsgBox('This application requires .NET Framework 4.8. Please install it and then run this setup again.', mbError, MB_OK);
3645
Abort;
3746
end;
3847
48+
{ Initialize variables }
3949
PortableMode := False;
4050
RestartExplorer := False;
4151

0 commit comments

Comments
 (0)