efrick/PDF-Merge
efrick/PDF-Merge
2
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request 'issue#4' (#7) from issue#4 into master

Browse Source 
Reviewed-on: ABSC/PDF-Merge#7
This commit is contained in:
efrick 2024-08-08 12:40:26 -04:00
commit 18e904d9ec
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AboutBox1.cs
View File

@ -37,7 +37,7 @@ namespace PDF_Merge
return titleAttribute.Title;
}
}
return Path.GetFileNameWithoutExtension(Assembly.GetExecutingAssembly().CodeBase);
return Path.GetFileNameWithoutExtension(Assembly.GetExecutingAssembly().Location);
}
}
@ -45,7 +45,7 @@ namespace PDF_Merge
{
get
{
return Assembly.GetExecutingAssembly().GetName().Version.ToString();
return Assembly.GetExecutingAssembly()?.GetName()?.Version?.ToString();
}
}

10
ConfForm.cs
View File

@ -17,11 +17,11 @@ namespace PDF_Merge
{
InitializeComponent();
string sourcePath = ConfigurationManager.AppSettings["PDF-Path"];
string outputPath = ConfigurationManager.AppSettings["PDF-Output"];
string outputName = ConfigurationManager.AppSettings["PDF-Name"];
string outputExt = ConfigurationManager.AppSettings["PDF-Extension"];
string dateIndex = ConfigurationManager.AppSettings["dateIndex"];
string sourcePath = ConfigurationManager.AppSettings["PDF-Path"] ?? "";
string outputPath = ConfigurationManager.AppSettings["PDF-Output"] ?? "";
string outputName = ConfigurationManager.AppSettings["PDF-Name"] ?? "merged";
string outputExt = ConfigurationManager.AppSettings["PDF-Extension"] ?? ".pdf";
string dateIndex = ConfigurationManager.AppSettings["dateIndex"] ?? "0";
int dateIndexValue;

2
MainForm.cs
View File

@ -25,7 +25,7 @@ namespace PDF_Merge
}
public void SetPathLable()
{
string sourcePath = ConfigurationManager.AppSettings["PDF-Path"];
string sourcePath = ConfigurationManager.AppSettings["PDF-Path"] ?? "";
if (sourcePath != null)
{

4
MergePDFs.cs
View File

@ -60,7 +60,7 @@
}
public static string[] CollectPdfFiles()
{
string dirPath = ConfigurationManager.AppSettings["PDF-Path"];
string dirPath = ConfigurationManager.AppSettings["PDF-Path"] ?? "";
Console.WriteLine(dirPath);
string[] pdfFiles = Directory.EnumerateFiles(dirPath, "*.pdf").ToArray();
Array.Sort(pdfFiles);
@ -81,7 +81,7 @@
public static string GetDate()
{
DateTime date = DateTime.Now;
string dateFormat = ConfigurationManager.AppSettings["dateFormat"];
string dateFormat = ConfigurationManager.AppSettings["dateFormat"] ?? "yyyy-MM-dd";
return date.ToString(dateFormat);
}
}