Elminated ILRepack, as it seems to create problems; readjusted all post-build, post-push scripts; removed portable mode from setup (portability is achieved through the ps script;) several minor fixes.

Author: unalignedcoder

.github/workflows/release.yml

@@ -34,20 +34,12 @@ jobs:
     - name: List root directory contents
       run: ls -R ${{ github.workspace }}
 
-    - name: Log timestamps of last changes to relevant files
-      run: |
-        echo "Timestamps of last changes to relevant files:"
-        git log -1 --format="%ci" -- CalibreImport/ReleaseFiles/CalibreImport.config
-        git log -1 --format="%ci" -- CalibreImport/ReleaseFiles/CalibreImport.dll
-        git log -1 --format="%ci" -- CalibreImport/ReleaseFiles/Setup.ps1
-        git log -1 --format="%ci" -- CalibreImport/ReleaseFiles/CalibreImportSetup.exe
-
     - name: Check if relevant files have changed
       id: check_files_changed
       run: |
         git fetch origin master
         git checkout master
-        CHANGED_FILES=$(git diff --name-only HEAD~1 HEAD -- CalibreImport/ReleaseFiles/CalibreImport.config CalibreImport/ReleaseFiles/CalibreImport.dll CalibreImport/ReleaseFiles/Setup.ps1 CalibreImport/ReleaseFiles/CalibreImportSetup.exe)
+        CHANGED_FILES=$(git diff --name-only HEAD~1 HEAD -- CalibreImport/ReleaseFiles/CalibreImport.config CalibreImport/ReleaseFiles/*.dll CalibreImport/ReleaseFiles/Setup.ps1 CalibreImport/ReleaseFiles/CalibreImportSetup.exe)
         echo "Changed files: $CHANGED_FILES"
         if [ -n "$CHANGED_FILES" ]; then
           echo "FILES_CHANGED=true" >> $GITHUB_ENV
@@ -110,7 +102,7 @@ jobs:
       if: env.FILES_CHANGED == 'true'
       run: |
         mkdir -p release
-        cp $BUILD_PATH/CalibreImport.config $BUILD_PATH/CalibreImport.dll $BUILD_PATH/Setup.ps1 release/
+        cp $BUILD_PATH/*.dll $BUILD_PATH/CalibreImport.config $BUILD_PATH/Setup.ps1 release/
         zip -r ImportToCalibreExtension-v${{ env.NEW_VERSION }}.zip release/
         echo "ZIP_FILE=ImportToCalibreExtension-v${{ env.NEW_VERSION }}.zip" >> $GITHUB_ENV
 
@@ -133,6 +125,10 @@ jobs:
         COMMIT_MESSAGE=$(git log -1 --pretty=%B --no-merges)
         echo "COMMIT_MESSAGE=$COMMIT_MESSAGE" >> $GITHUB_ENV
 
+    - name: Log commit message
+      run: |
+        echo "Commit message: ${{ env.COMMIT_MESSAGE }}"
+
     - name: Create Release
       if: env.TAG_EXISTS == 'false' && env.FILES_CHANGED == 'true'
       id: create_release
@@ -147,14 +143,3 @@ jobs:
         prerelease: false
         files: ${{ env.ZIP_FILE }},${{ env.SETUP_FILE }}
         token: ${{ secrets.PAT_GITHUB }}
-
-    # - name: Create pull request
-    #   if: env.FILES_CHANGED == 'true'
-    #   uses: peter-evans/create-pull-request@v4
-    #   with:
-    #     token: ${{ secrets.PAT_GITHUB }}
-    #     commit-message: "Increment version to ${{ env.NEW_VERSION }}"
-    #     branch: version-increment
-    #     title: "Increment version to ${{ env.NEW_VERSION }}"
-    #     body: "This pull request increments the version to ${{ env.NEW_VERSION }} and updates AssemblyInfo.cs."
-    #     base: master

CalibreImport/CalibreContextMenuExtension.cs

@@ -18,8 +18,9 @@
 
 namespace CalibreImport
 {
-    [ComVisible(true)]
+    //[ComVisible(true)]
     [ClassInterface(ClassInterfaceType.None)]
+    [Guid("8E5CD5CA-64E0-479A-B62F-B1FC00FF0227"), ComVisible(true)]
     [DisplayName("Calibre Import Shell Extension")]
     [COMServerAssociation(AssociationType.AllFiles)] //needed for Directory Opus, apparently.
     [COMServerAssociation(AssociationType.ClassOfExtension, ".epub", ".pdf", ".mobi", ".azw", ".azw3", ".fb2", ".djvu", ".lrf", ".rtf", ".txt", ".doc", ".docx", ".odt", ".htm", ".html", ".cbz", ".cbr", ".pdb", ".snb", ".tcr", ".zip", ".rar")]
@@ -607,7 +608,6 @@ public static void RegisterExtension(Guid guid, string menuName, List<string> ex
             Logger.LogThis("Starting RegisterExtension...", true);
             try
             {
-                // Registering the CLSID is not needed as it is done by SharpShell
                 // Register the context menu handler for each extension
                 foreach (var ext in extensions)
                 {
@@ -653,12 +653,12 @@ public static void UnregisterExtension(Guid guid, List<string> extensions)
                     try
                     {
                         Registry.CurrentUser.DeleteSubKeyTree(shellExKeyPath, false);
-                        Logger.LogThis($"Unregistered context menu handler for extension: {ext}", true);
+                        //Logger.LogThis($"Unregistered context menu handler for extension: {ext}", true);
                     }
                     catch (ArgumentException)
                     {
                         // Key does not exist, ignore
-                        Logger.LogThis($"Registry key does not exist for extension: {ext}", true);
+                        //Logger.LogThis($"Registry key does not exist for extension: {ext}", true);
                     }
                 }
 
@@ -688,4 +688,5 @@ public static void UnregisterExtension(Guid guid, List<string> extensions)
             }
         }
     }
+
 }

CalibreImport/CalibreImport.csproj

@@ -165,6 +165,7 @@
     <None Include="app.config" />
     <None Include="CalibreImportKey.snk" />
     <None Include="PostBuild.ps1" />
+    <None Include="PostBuild2.ps1" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -173,14 +174,19 @@
     <None Include="ReleaseFiles\CalibreImport.config" />
     <None Include="ReleaseFiles\Setup.ps1" />
     <None Include="ReleaseFiles\CalibreImportSetup.exe" />
-	<None Include="InnoSetup\CalibreImportSetup.iss" />
+    <None Include="InnoSetup\CalibreImportSetup.iss" />
     <None Include="Setup.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="CalibreImport.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="ReleaseFiles\Newtonsoft.Json.dll" />
+    <Content Include="ReleaseFiles\SharpShell.dll" />
+    <Content Include="ReleaseFiles\System.Configuration.ConfigurationManager.dll" />
+  </ItemGroup>
   <!-- 
   Import CSharp targets 
   -->
@@ -190,7 +196,7 @@
   -->
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Message Text="Running PostBuild script..." Importance="high" />
-    <Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(ProjectDir)PostBuild.ps1&quot; -TargetDir &quot;$(TargetDir.TrimEnd('\&quot;'))&quot; -ProjectDir &quot;$(ProjectDir.TrimEnd('\&quot;'))&quot;" />
+    <Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(ProjectDir)PostBuild2.ps1&quot; -TargetDir &quot;$(TargetDir.TrimEnd('\&quot;'))&quot; -ProjectDir &quot;$(ProjectDir.TrimEnd('\&quot;'))&quot;" />
     <Message Text="PostBuild script completed." Importance="high" />
   </Target>
 </Project>

CalibreImport/InnoSetup/CalibreImportSetup-NoPortable.iss

@@ -0,0 +1,81 @@
+#define ReleaseFilesPath "..\ReleaseFiles\"
+#define AppName "CalibreImport"
+
+[Setup]
+AppName={#AppName}
+AppVersion=1.0
+DefaultDirName={pf}\{#AppName}
+DefaultGroupName={#AppName}
+UninstallDisplayIcon={app}\{#AppName}.dll
+OutputDir={#ReleaseFilesPath}
+OutputBaseFilename=CalibreImportSetup
+Compression=lzma
+SolidCompression=yes
+PrivilegesRequired=admin
+
+[Files]
+; Install all DLLs to application directory
+Source: "{#ReleaseFilesPath}*.dll"; DestDir: "{app}"; Flags: ignoreversion
+; Install config file to AppData
+Source: "{#ReleaseFilesPath}*.config"; DestDir: "{userappdata}\{#AppName}"; Flags: ignoreversion
+
+[Code]
+function IsDotNet48Installed: Boolean;
+var
+  ReleaseVersion: Cardinal;
+begin
+  Result := False;
+  if RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full') then
+  begin
+    if RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', ReleaseVersion) then
+    begin
+      Result := (ReleaseVersion >= 528040);
+    end;
+  end;
+end;
+
+procedure RegisterDLLs;
+var
+  FindRec: TFindRec;
+  RegAsmPath: String;
+  ResultCode: Integer;
+begin
+  RegAsmPath := ExpandConstant('{win}\Microsoft.NET\Framework\v4.0.30319\regasm.exe');
+  if not FileExists(RegAsmPath) then
+    RegAsmPath := ExpandConstant('{win}\Microsoft.NET\Framework64\v4.0.30319\regasm.exe');
+
+  if FindFirst(ExpandConstant('{app}\*.dll'), FindRec) then
+  begin
+    try
+      repeat
+        if (FindRec.Name <> '.') and (FindRec.Name <> '..') then
+        begin
+          if not Exec(RegAsmPath, ExpandConstant('"{app}\' + FindRec.Name + '" /codebase'), '', 
+             SW_HIDE, ewWaitUntilTerminated, ResultCode) then
+            MsgBox('Failed to register ' + FindRec.Name + ': ' + SysErrorMessage(ResultCode), mbError, MB_OK)
+          else if ResultCode <> 0 then
+            MsgBox('Registration failed for ' + FindRec.Name + ' with code: ' + IntToStr(ResultCode), mbError, MB_OK);
+        end;
+      until not FindNext(FindRec);
+    finally
+      FindClose(FindRec);
+    end;
+  end;
+end;
+
+procedure InitializeWizard;
+begin
+  if not IsDotNet48Installed then
+  begin
+    MsgBox('This application requires .NET Framework 4.8. Please install it and then run this setup again.', mbError, MB_OK);
+    Abort;
+  end;
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssPostInstall then
+  begin
+    RegisterDLLs;
+  end;
+end;

CalibreImport/InnoSetup/CalibreImportSetup.iss

@@ -1,30 +1,31 @@
 #define AppDll "CalibreImport.dll"
 #define ConfigFile "CalibreImport.config"
 #define ReleaseFilesPath "..\ReleaseFiles\"
+#define AppName "CalibreImport"
 
 [Setup]
-AppName=YourAppName
+AppName={#AppName}
 AppVersion=1.0
-DefaultDirName={pf}\CalibreImport
-DefaultGroupName=Calibre Import Shell Extension
-UninstallDisplayIcon={app}\YourApp.exe
+DefaultDirName={pf}\{#AppName}
+DefaultGroupName={#AppName}
+UninstallDisplayIcon={app}\{#AppDll}
 OutputDir={#ReleaseFilesPath}
 OutputBaseFilename=CalibreImportSetup
 Compression=lzma
 SolidCompression=yes
+PrivilegesRequired=admin
 
 [Files]
-Source: "{#ReleaseFilesPath}{#AppDll}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#ReleaseFilesPath}{#ConfigFile}"; DestDir: "{userappdata}\YourAppName"; Flags: ignoreversion
-
-[Icons]
-Name: "{group}\YourAppName"; Filename: "{app}\YourApp.exe"
+; These will only be used in non-portable mode
+Source: "{#ReleaseFilesPath}{#AppDll}"; DestDir: "{app}"; Flags: ignoreversion; Check: ShouldInstallToProgramFiles
+Source: "{#ReleaseFilesPath}{#ConfigFile}"; DestDir: "{userappdata}\{#AppName}"; Flags: ignoreversion; Check: ShouldInstallToAppData
 
 [Code]
 const
-  AppDll = '{#AppDll}'; // Use preprocessor variable
-  ConfigFile = '{#ConfigFile}'; // Use preprocessor variable
-  ReleaseFilesPath = '{#ReleaseFilesPath}'; // Use preprocessor variable
+  AppDll = '{#AppDll}'; 
+  ConfigFile = '{#ConfigFile}'; 
+  ReleaseFilesPath = '{#ReleaseFilesPath}';
+  AppName = '{#AppName}';
 
 var
   PortableMode: Boolean;
@@ -47,6 +48,21 @@ begin
   end;
 end;
 
+function ShouldInstallToProgramFiles: Boolean;
+begin
+  Result := not PortableMode;
+end;
+
+function ShouldInstallToAppData: Boolean;
+begin
+  Result := not PortableMode;
+end;
+
+procedure UpdatePortableMode(Sender: TObject);
+begin
+  PortableMode := PortableModeCheck.Checked;
+end;
+
 procedure InitializeWizard;
 begin
   { Check for .NET Framework 4.8 }
@@ -59,18 +75,17 @@ begin
   { Initialize variables }
   PortableMode := False;
   RestartExplorer := False;
-  
-    { Initialize InstallPath with a default directory }
-  InstallPath := ExpandConstant('{sd}'); // Default to the system drive (e.g., C:\)
+  InstallPath := ExpandConstant('{sd}');
 
   { Create a checkbox for portable mode }
   PortableModeCheck := TNewCheckBox.Create(WizardForm);
   PortableModeCheck.Parent := WizardForm.SelectDirPage;
-  PortableModeCheck.Left := WizardForm.DirEdit.Left; // Use DirEdit instead of SelectDirLabel
+  PortableModeCheck.Left := WizardForm.DirEdit.Left;
   PortableModeCheck.Top := WizardForm.DirEdit.Top + WizardForm.DirEdit.Height + 10;
-  PortableModeCheck.Width := WizardForm.DirEdit.Width; // Use DirEdit instead of SelectDirLabel
+  PortableModeCheck.Width := WizardForm.DirEdit.Width;
   PortableModeCheck.Caption := 'Install in portable mode';
   PortableModeCheck.Checked := PortableMode;
+  PortableModeCheck.OnClick := @UpdatePortableMode;
 
   { Create a checkbox for restarting Explorer }
   RestartExplorerCheck := TNewCheckBox.Create(WizardForm);
@@ -85,34 +100,60 @@ end;
 procedure CurStepChanged(CurStep: TSetupStep);
 var
   SourceAppDll, SourceConfigFile: String;
-  ResultCode: Integer; // Declare ResultCode variable
+  ResultCode: Integer;
+  RegAsmPath: String;
 begin
   if CurStep = ssPostInstall then
   begin
+    { Update checkbox states }
+    PortableMode := PortableModeCheck.Checked;
+    RestartExplorer := RestartExplorerCheck.Checked;
+
     { Resolve the full paths to the source files }
     SourceAppDll := ExpandConstant('{src}\' + ReleaseFilesPath + AppDll);
     SourceConfigFile := ExpandConstant('{src}\' + ReleaseFilesPath + ConfigFile);
 
     if PortableMode then
     begin
+      { Create directory if it doesn't exist }
+      if not DirExists(InstallPath) then
+        ForceDirectories(InstallPath);
+      
       { Copy files to the selected folder }
-      FileCopy(SourceAppDll, InstallPath + '\' + AppDll, False);
-      FileCopy(SourceConfigFile, InstallPath + '\' + ConfigFile, False);
+      if not FileCopy(SourceAppDll, InstallPath + '\' + AppDll, False) then
+        MsgBox('Failed to copy DLL to portable location', mbError, MB_OK);
+      if not FileCopy(SourceConfigFile, InstallPath + '\' + ConfigFile, False) then
+        MsgBox('Failed to copy config to portable location', mbError, MB_OK);
+
+      { Register DLL from portable location }
+      RegAsmPath := ExpandConstant('{win}\Microsoft.NET\Framework\v4.0.30319\regasm.exe');
+      if not FileExists(RegAsmPath) then
+        RegAsmPath := ExpandConstant('{win}\Microsoft.NET\Framework64\v4.0.30319\regasm.exe');
+      
+      if not Exec(RegAsmPath, '"' + InstallPath + '\' + AppDll + '" /codebase', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
+        MsgBox('Failed to register DLL: ' + SysErrorMessage(ResultCode), mbError, MB_OK)
+      else if ResultCode <> 0 then
+        MsgBox('DLL registration failed with code: ' + IntToStr(ResultCode), mbError, MB_OK);
     end
     else
     begin
-      { Copy files to Program Files and AppData }
-      FileCopy(SourceAppDll, ExpandConstant('{pf}\YourAppName\' + AppDll), False);
-      FileCopy(SourceConfigFile, ExpandConstant('{userappdata}\YourAppName\' + ConfigFile), False);
+      { For non-portable mode, files are already installed by the [Files] section }
+      { Register DLL from installation directory }
+      RegAsmPath := ExpandConstant('{win}\Microsoft.NET\Framework\v4.0.30319\regasm.exe');
+      if not FileExists(RegAsmPath) then
+        RegAsmPath := ExpandConstant('{win}\Microsoft.NET\Framework64\v4.0.30319\regasm.exe');
+      
+      if not Exec(RegAsmPath, ExpandConstant('"{app}\' + AppDll + '" /codebase'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
+        MsgBox('Failed to register DLL: ' + SysErrorMessage(ResultCode), mbError, MB_OK)
+      else if ResultCode <> 0 then
+        MsgBox('DLL registration failed with code: ' + IntToStr(ResultCode), mbError, MB_OK);
     end;
 
-    { Register the DLL using regasm }
-    Exec(ExpandConstant('{win}\Microsoft.NET\Framework\v4.0.30319\regasm.exe'), ExpandConstant('"{app}\' + AppDll + '" /codebase'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
-
     if RestartExplorer then
     begin
       { Restart Windows Explorer }
-      Exec('taskkill.exe', '/f /im explorer.exe', '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
+      if not Exec('taskkill.exe', '/f /im explorer.exe', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
+        MsgBox('Failed to kill explorer: ' + SysErrorMessage(ResultCode), mbError, MB_OK);
       Exec('explorer.exe', '', '', SW_HIDE, ewNoWait, ResultCode);
     end;
   end;