Updating metadata read/write to be more ubiquitous

.github/workflows/build-and-pack.yaml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: binaries
-          path: pub
+          path: pub/FileSorter.*
   choco-pack:
     needs: build
     runs-on: windows-latest

FileSorter.csproj

@@ -1,26 +1,31 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <StartupObject>FileSorter.Program</StartupObject>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>0.0.1</Version>
-    <Authors>bc3tech</Authors>
-    <Company>BC3 Technologies</Company>
-    <Description>Sorts files into datetime subfolders, optionally parsing EXIF data of photos to get accurate date/time information.</Description>
-    <Copyright>(c) BC3 Technologies</Copyright>
-    <PackageProjectUrl>https://github.com/bc3tech/filesorter</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/bc3tech/filesorter</RepositoryUrl>
-    <RepositoryType>GitHub</RepositoryType>
-    <PackageTags>filesorter</PackageTags>
-    <AssemblyVersion>0.0.1</AssemblyVersion>
-    <NeutralLanguage>en-US</NeutralLanguage>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net8.0-windows</TargetFramework>
+		<StartupObject>FileSorter.Program</StartupObject>
+		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+		<Version>0.0.1</Version>
+		<Authors>bc3tech</Authors>
+		<Company>BC3 Technologies</Company>
+		<Description>Sorts files into datetime subfolders, optionally parsing EXIF data of photos to get accurate date/time information.</Description>
+		<Copyright>(c) BC3 Technologies</Copyright>
+		<PackageProjectUrl>https://github.com/bc3tech/filesorter</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/bc3tech/filesorter</RepositoryUrl>
+		<RepositoryType>GitHub</RepositoryType>
+		<PackageTags>filesorter</PackageTags>
+		<AssemblyVersion>0.0.1</AssemblyVersion>
+		<NeutralLanguage>en-US</NeutralLanguage>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="PowerArgs" Version="4.0.3" />
-    <PackageReference Include="WindowsAPICodePack" Version="8.0.4" />
-  </ItemGroup>
+	<ItemGroup>
+	  <Compile Remove="choco\**" />
+	  <EmbeddedResource Remove="choco\**" />
+	  <None Remove="choco\**" />
+	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="PowerArgs" Version="4.0.3" />
+		<PackageReference Include="WindowsAPICodePack" Version="8.0.4" />
+	</ItemGroup>
 </Project>

Program.cs

@@ -6,6 +6,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 
+using Microsoft.WindowsAPICodePack.Shell;
+using Microsoft.WindowsAPICodePack.Shell.PropertySystem;
 
 using PowerArgs;
 
@@ -141,8 +143,6 @@ private static void ProcessFile(FileInfo fi, ProgramArgs input, string outputDir
                 {
                     setTimestamp();
                 }
-
-                }
             }
 
             if (!input.NoMove && !input.Recurse)
@@ -186,7 +186,7 @@ DateTime determineTimeToUse(out DateTime fileTime, out DateTime embeddedTime)
 
             static DateTime getEmbeddedTimestamp(string fileName)
             {
-                var ps = Microsoft.WindowsAPICodePack.Shell.ShellFile.FromFilePath(fileName);
+                var ps = ShellFile.FromFilePath(fileName);
                 return ps.Properties.System.Photo.DateTaken.Value ?? ps.Properties.System.Media.DateEncoded.Value ?? DateTime.MinValue;
             }
 
@@ -210,7 +210,7 @@ void setTimestamp()
 
                 if (getEmbeddedTimestamp(fi.FullName) != timeToUse)
                 {
-                    var ps = Microsoft.WindowsAPICodePack.Shell.ShellFile.FromFilePath(fi.FullName);
+                    var ps = ShellFile.FromFilePath(fi.FullName);
                     Console.WriteLine($@"Updating embedded time on {fi.FullName} -> {timeToUse} ...");
                     if (!input.NoOp)
                     {
@@ -222,7 +222,7 @@ void setTimestamp()
 
                         try
                         {
-                            using var w = ps.Properties.GetPropertyWriter();
+                            using ShellPropertyWriter w = ps.Properties.GetPropertyWriter();
                             w.WriteProperty(ps.Properties.System.Photo.DateTaken, timeToUse);
                         }
                         catch { }
@@ -236,8 +236,5 @@ void setTimestamp()
         }
     }
 
-    {
-    }
-
     private static void PrintUsage() => Console.Write(ArgUsage.GenerateUsageFromTemplate<ProgramArgs>());
 }

Properties/launchSettings.json

@@ -10,6 +10,24 @@
     "Show Help": {
       "commandName": "Project",
       "commandLineArgs": "-h"
+    },
+    "Scenario": {
+      "commandName": "Project",
+      "commandLineArgs": "-p -x -i \"C:\\Users\\hurlburb\\OneDrive - Microsoft\\Pictures\" -n -y",
+      "environmentVariables": {
+        "GPT_ENDPOINT": "https://gpt-four-open-ai.openai.azure.com/",
+        "GPT_DEPLOYMENT": "gpt-4o"
+      }
+    },
+    "Videos": {
+      "commandName": "Project",
+      "commandLineArgs": "-p -u -t -n -y --whatif",
+      "workingDirectory": "C:\\Users\\hurlburb\\Downloads\\v",
+      "environmentVariables": {
+        "GPT_ENDPOINT": "https://gpt-four-open-ai.openai.azure.com/",
+        "GPT_DEPLOYMENT": "gpt-4o",
+        "GPT_API_KEY": "7cbcf6b024954924b927f45696d0a6c1"
+      }
     }
   }
 }