Added a progress bar for time-consuming imports; Several minor fixes;

Author: unalignedcoder

.github/workflows/release.yml

@@ -57,7 +57,7 @@ jobs:
         git fetch origin master
         CHANGED_FILES=$(git diff --name-only HEAD^ HEAD)
         echo "Changed files: $CHANGED_FILES"
-        if echo "$CHANGED_FILES" | grep -qE "${{ env.BUILD_PATH }}/CustomSettings.config|${{ env.BUILD_PATH }}/CalibreImport.dll|${{ env.BUILD_PATH }}/Setup.ps1"; then
+        if echo "$CHANGED_FILES" | grep -qE "${{ env.BUILD_PATH }}/CalibreImport.config|${{ env.BUILD_PATH }}/CalibreImport.dll|${{ env.BUILD_PATH }}/Setup.ps1"; then
           echo "FILES_CHANGED=true" >> $GITHUB_ENV
         else
           echo "FILES_CHANGED=false" >> $GITHUB_ENV
@@ -77,7 +77,7 @@ jobs:
       if: env.FILES_CHANGED == 'true'
       run: |
         mkdir -p release
-        cp $BUILD_PATH/CustomSettings.config $BUILD_PATH/CalibreImport.dll $BUILD_PATH/Setup.ps1 release/
+        cp $BUILD_PATH/CalibreImport.config $BUILD_PATH/CalibreImport.dll $BUILD_PATH/Setup.ps1 release/
         zip -r ImportToCalibreExtension-v$NEW_VERSION.zip release/
         echo "ZIP_FILE=ImportToCalibreExtension-v$NEW_VERSION.zip" >> $GITHUB_ENV
 

CalibreImport/CalibreContextMenuExtension.cs

@@ -13,6 +13,7 @@
 using System.Threading;
 using System.Windows.Forms;
 using System;
+using System.Threading.Tasks;
 
 
 namespace CalibreImport
@@ -168,7 +169,9 @@ protected override ContextMenuStrip CreateMenu()
                     foreach (var library in libraries)
                     {
                         var libraryItem = new ToolStripMenuItem(library.Name);
-                        libraryItem.Click += (sender, args) => ExecuteImport(library.Path);
+                        //
+                        //libraryItem.Click += (sender, args) => ExecuteImport(library.Path);
+                        libraryItem.Click += (sender, args) => ExecuteImportWithProgress(library.Path, submenu);
                         libraryItem.Image = GetIconFromBase64(BooksIconBase64);
                         submenu.DropDownItems.Add(libraryItem);
                     }
@@ -202,8 +205,8 @@ protected override ContextMenuStrip CreateMenu()
             return menu;
         }
 
-        // Execute the import process
-        private void ExecuteImport(string selectedLibrary = null)
+        // Handles ebook import
+        private void ExecuteImport(string selectedLibrary = null, Action<int> reportProgress = null)
         {
             try
             {
@@ -235,6 +238,7 @@ private void ExecuteImport(string selectedLibrary = null)
                     }
                     else
                     {
+                        // message prompt on whether to close calibre, otherwise break import
                         if (MessageBox.Show(ResourceStrings.CalibreRunningRes, ResourceStrings.CalibreRunning2Res, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                         {
                             KillCalibre();
@@ -252,7 +256,7 @@ private void ExecuteImport(string selectedLibrary = null)
                     var libraries = GetCalibreLibraries();
                     if (libraries == null || !libraries.Any())
                     {
-                        Logger.LogThis("No Calibre libraries found. Ensure Calibre is configured properly.");
+                        // Logger.LogThis("No Calibre libraries found. Ensure Calibre is configured properly.");
                         return;
                     }
 
@@ -270,19 +274,31 @@ private void ExecuteImport(string selectedLibrary = null)
                     }
                 }
 
+                int totalFiles = filePaths.Count;
+                for (int i = 0; i < totalFiles; i++)
+                {
+                    // Import each file
+                    ImportFileIntoCalibre(selectedLibrary, filePaths[i]);
+
+                    // Report progress
+                    reportProgress?.Invoke((i + 1) * 100 / totalFiles);
+                }
+
                 var importSuccess = ImportFilesIntoCalibre(selectedLibrary, filePaths);
 
                 if (importSuccess)
                 {
-                    var result = MessageBox.Show(ResourceStrings.CalibreRunningRes, ResourceStrings.CalibreRunning2Res, MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+                    // MessageBox after successful import, prompt the user to start calibre
+                    var result = MessageBox.Show(ResourceStrings.ImportSuccessRes, ResourceStrings.NameAppRes, MessageBoxButtons.YesNo, MessageBoxIcon.Question);
                     if (result == DialogResult.Yes)
                     {
                         LaunchCalibre(selectedLibrary);
                     }
                 }
                 else
                 {
-                    MessageBox.Show(ResourceStrings.CalibreRunningRes, ResourceStrings.CalibreRunning2Res, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    // otherwise invite to check log
+                    MessageBox.Show(ResourceStrings.ImportFailureRes, ResourceStrings.NameAppRes, MessageBoxButtons.OK, MessageBoxIcon.Error);
                 }
             }
             catch (Exception ex)
@@ -291,6 +307,26 @@ private void ExecuteImport(string selectedLibrary = null)
             }
         }
 
+        // handles ebook import with progress bar
+        private void ExecuteImportWithProgress(string selectedLibrary, ToolStripMenuItem parentMenu)
+        {
+            var progressForm = new ProgressForm();
+            progressForm.Show();
+
+            Task.Run(() =>
+            {
+                ExecuteImport(selectedLibrary, progress =>
+                {
+                    progressForm.UpdateProgress(progress);
+                });
+
+                progressForm.Invoke(new Action(() =>
+                {
+                    progressForm.Close();
+                }));
+            });
+        }
+
         // Load ebook extensions supported by Calibre from Registry														   
         private void LoadSupportedExtensions()
         {
@@ -423,7 +459,7 @@ public void ShowSettingsForm()
             }
         }
 
-        // Import ebook files into Calibre library										  
+        // Import multiple ebook files into Calibre library										  
         private bool ImportFilesIntoCalibre(string libraryPath, List<string> filePaths)
         {
             try
@@ -462,6 +498,44 @@ private bool ImportFilesIntoCalibre(string libraryPath, List<string> filePaths)
             }
         }
 
+        // Import one single ebook file into Calibre library			
+        private void ImportFileIntoCalibre(string libraryPath, string filePath)
+        {
+            try
+            {
+                Logger.LogThis($"Importing file: {filePath} into library: {libraryPath}", true);
+
+                var arguments = $"add --library-path \"{libraryPath}\" --automerge {automerge} \"{filePath}\"";
+                var startInfo = new ProcessStartInfo
+                {
+                    FileName = calibredbPath,
+                    Arguments = arguments,
+                    UseShellExecute = false,
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
+                    CreateNoWindow = true
+                };
+
+                var process = Process.Start(startInfo);
+                var output = process.StandardOutput.ReadToEnd();
+                var error = process.StandardError.ReadToEnd();
+                process.WaitForExit();
+
+                if (process.ExitCode == 0)
+                {
+                    Logger.LogThis($"Successfully imported file: {filePath}");
+                }
+                else
+                {
+                    Logger.LogThis($"Failed to import file: {filePath}. Error: {error}");
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.LogThis($"Error importing file: {filePath}. Exception: {ex.Message}");
+            }
+        }
+
         // Launch Calibre with specified library
         private void LaunchCalibre(string libraryPath)
         {

CalibreImport/CustomSettings.config CalibreImport/CalibreImport.configCalibreImport/CustomSettings.config renamed to CalibreImport/CalibreImport.config

@@ -36,7 +36,7 @@
   Release Configuration Property Group
   -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -63,7 +63,7 @@
     <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
@@ -121,12 +121,18 @@
     <Compile Include="Locales.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="Program.cs" />
+    <Compile Include="ProgressForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ProgressForm.Designer.cs">
+      <DependentUpon>ProgressForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Compile>
     <Compile Include="ResourceStrings.cs" />
     <Compile Include="SettingsForm.cs">
@@ -144,6 +150,9 @@
       <DependentUpon>ImportForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="ProgressForm.resx">
+      <DependentUpon>ProgressForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SettingsForm.resx">
       <DependentUpon>SettingsForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -153,20 +162,20 @@
   Extra Files included in the Project (some in the Output too)
   -->
   <ItemGroup>
-	<None Include="app.config" />
+    <None Include="app.config" />
     <None Include="CalibreImportKey.snk" />
     <None Include="PostBuild.ps1" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
     <None Include="ReleaseFiles\CalibreImport.dll" />
-    <None Include="ReleaseFiles\CustomSettings.config" />
+    <None Include="ReleaseFiles\CalibreImport.config" />
     <None Include="ReleaseFiles\Setup.ps1" />
     <None Include="Setup.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="CustomSettings.config">
+    <None Include="CalibreImport.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

CalibreImport/CalibreImport.csproj

@@ -1,6 +1,7 @@
-//using System;
+using System;
 using System.Configuration;
 using System.IO;
+using System.Reflection;
 
 namespace CalibreImport
 {
@@ -10,7 +11,24 @@ public static class CustomSettings
 
         static CustomSettings()
         {
-            string configFilePath = Path.Combine(Path.GetDirectoryName(typeof(CalibreContextMenuExtension).Assembly.Location), "CustomSettings.config");
+            string configFilePath;
+            string appDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+            string assemblyFolder = Path.GetDirectoryName(typeof(CalibreContextMenuExtension).Assembly.Location);
+            string assemblyName = Assembly.GetExecutingAssembly().GetName().Name;
+            string configFileName = $"{assemblyName}.config";
+            string portableFilePath = Path.Combine(assemblyFolder, "portable");
+
+            if (File.Exists(portableFilePath))
+            {
+                configFilePath = Path.Combine(assemblyFolder, configFileName);
+                //Logger.LogThis("Portable mode detected. Using configuration file in the same folder as the DLL.", true);
+            }
+            else
+            {
+                configFilePath = Path.Combine(appDataFolder, "YourAppName", configFileName);
+                //Logger.LogThis("Portable mode not detected. Using configuration file in AppData.", true);
+            }
+
             ExeConfigurationFileMap configMap = new ExeConfigurationFileMap { ExeConfigFilename = configFilePath };
 
             if (!File.Exists(configFilePath))
@@ -47,7 +65,5 @@ private static void CreateDefaultConfig(string configFilePath)
             config.Save(ConfigurationSaveMode.Modified);
             ConfigurationManager.RefreshSection(config.AppSettings.SectionInformation.Name);
         }
-
     }
 }
-