First raw-capable pre-release version

Form1.Designer.cs

@@ -33,16 +33,20 @@ namespace photo_sorter
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.openDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectDestinationDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.quitApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.gbox_preview = new System.Windows.Forms.GroupBox();
+            this.lbl_counter = new System.Windows.Forms.Label();
             this.lbl_current_fname = new System.Windows.Forms.Label();
             this.btn_next = new System.Windows.Forms.Button();
             this.btn_prev = new System.Windows.Forms.Button();
             this.btn_sort = new System.Windows.Forms.Button();
             this.img_preview = new System.Windows.Forms.PictureBox();
             this.gbox_info = new System.Windows.Forms.GroupBox();
+            this.btn_reload_src = new System.Windows.Forms.Button();
+            this.btn_open_src_dir = new System.Windows.Forms.Button();
             this.btn_open_dest_dir = new System.Windows.Forms.Button();
             this.tbox_source_dir = new System.Windows.Forms.TextBox();
             this.lbl_source_dir = new System.Windows.Forms.Label();
@@ -59,10 +63,6 @@ namespace photo_sorter
             this.stat_last_action = new System.Windows.Forms.ToolStripStatusLabel();
             this.split_container_main = new System.Windows.Forms.SplitContainer();
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
-            this.btn_open_src_dir = new System.Windows.Forms.Button();
-            this.selectDestinationDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.btn_reload_src = new System.Windows.Forms.Button();
-            this.lbl_counter = new System.Windows.Forms.Label();
             this.menuStrip1.SuspendLayout();
             this.gbox_preview.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.img_preview)).BeginInit();
@@ -103,6 +103,13 @@ namespace photo_sorter
             this.openDirectoryToolStripMenuItem.Text = "&Open Source Directory";
             this.openDirectoryToolStripMenuItem.Click += new System.EventHandler(this.openDirectoryToolStripMenuItem_Click);
             // 
+            // selectDestinationDirectoryToolStripMenuItem
+            // 
+            this.selectDestinationDirectoryToolStripMenuItem.Name = "selectDestinationDirectoryToolStripMenuItem";
+            this.selectDestinationDirectoryToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
+            this.selectDestinationDirectoryToolStripMenuItem.Text = "Select &Destination Directory";
+            this.selectDestinationDirectoryToolStripMenuItem.Click += new System.EventHandler(this.selectDestinationDirectoryToolStripMenuItem_Click);
+            // 
             // quitApplicationToolStripMenuItem
             // 
             this.quitApplicationToolStripMenuItem.Name = "quitApplicationToolStripMenuItem";
@@ -144,6 +151,17 @@ namespace photo_sorter
             this.gbox_preview.TabStop = false;
             this.gbox_preview.Text = "Preview";
             // 
+            // lbl_counter
+            // 
+            this.lbl_counter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.lbl_counter.Location = new System.Drawing.Point(607, 18);
+            this.lbl_counter.Name = "lbl_counter";
+            this.lbl_counter.RightToLeft = System.Windows.Forms.RightToLeft.No;
+            this.lbl_counter.Size = new System.Drawing.Size(95, 23);
+            this.lbl_counter.TabIndex = 9;
+            this.lbl_counter.Text = "1 of 1";
+            this.lbl_counter.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            // 
             // lbl_current_fname
             // 
             this.lbl_current_fname.AutoSize = true;
@@ -224,6 +242,29 @@ namespace photo_sorter
             this.gbox_info.TabStop = false;
             this.gbox_info.Text = "Sorting Info";
             // 
+            // btn_reload_src
+            // 
+            this.btn_reload_src.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btn_reload_src.Enabled = false;
+            this.btn_reload_src.Location = new System.Drawing.Point(273, 481);
+            this.btn_reload_src.Name = "btn_reload_src";
+            this.btn_reload_src.Size = new System.Drawing.Size(75, 23);
+            this.btn_reload_src.TabIndex = 902;
+            this.btn_reload_src.Text = "&Reload";
+            this.btn_reload_src.UseVisualStyleBackColor = true;
+            this.btn_reload_src.Click += new System.EventHandler(this.btn_reload_src_Click);
+            // 
+            // btn_open_src_dir
+            // 
+            this.btn_open_src_dir.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btn_open_src_dir.Location = new System.Drawing.Point(322, 505);
+            this.btn_open_src_dir.Name = "btn_open_src_dir";
+            this.btn_open_src_dir.Size = new System.Drawing.Size(26, 23);
+            this.btn_open_src_dir.TabIndex = 901;
+            this.btn_open_src_dir.Text = "...";
+            this.btn_open_src_dir.UseVisualStyleBackColor = true;
+            this.btn_open_src_dir.Click += new System.EventHandler(this.btn_open_src_dir_Click);
+            // 
             // btn_open_dest_dir
             // 
             this.btn_open_dest_dir.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -382,47 +423,6 @@ namespace photo_sorter
             this.split_container_main.SplitterDistance = 359;
             this.split_container_main.TabIndex = 4;
             // 
-            // btn_open_src_dir
-            // 
-            this.btn_open_src_dir.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btn_open_src_dir.Location = new System.Drawing.Point(322, 505);
-            this.btn_open_src_dir.Name = "btn_open_src_dir";
-            this.btn_open_src_dir.Size = new System.Drawing.Size(26, 23);
-            this.btn_open_src_dir.TabIndex = 901;
-            this.btn_open_src_dir.Text = "...";
-            this.btn_open_src_dir.UseVisualStyleBackColor = true;
-            this.btn_open_src_dir.Click += new System.EventHandler(this.btn_open_src_dir_Click);
-            // 
-            // selectDestinationDirectoryToolStripMenuItem
-            // 
-            this.selectDestinationDirectoryToolStripMenuItem.Name = "selectDestinationDirectoryToolStripMenuItem";
-            this.selectDestinationDirectoryToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
-            this.selectDestinationDirectoryToolStripMenuItem.Text = "Select &Destination Directory";
-            this.selectDestinationDirectoryToolStripMenuItem.Click += new System.EventHandler(this.selectDestinationDirectoryToolStripMenuItem_Click);
-            // 
-            // btn_reload_src
-            // 
-            this.btn_reload_src.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btn_reload_src.Enabled = false;
-            this.btn_reload_src.Location = new System.Drawing.Point(273, 481);
-            this.btn_reload_src.Name = "btn_reload_src";
-            this.btn_reload_src.Size = new System.Drawing.Size(75, 23);
-            this.btn_reload_src.TabIndex = 902;
-            this.btn_reload_src.Text = "&Reload";
-            this.btn_reload_src.UseVisualStyleBackColor = true;
-            this.btn_reload_src.Click += new System.EventHandler(this.btn_reload_src_Click);
-            // 
-            // lbl_counter
-            // 
-            this.lbl_counter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.lbl_counter.Location = new System.Drawing.Point(607, 18);
-            this.lbl_counter.Name = "lbl_counter";
-            this.lbl_counter.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.lbl_counter.Size = new System.Drawing.Size(95, 23);
-            this.lbl_counter.TabIndex = 9;
-            this.lbl_counter.Text = "1 of 1";
-            this.lbl_counter.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            // 
             // form_main
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -431,6 +431,7 @@ namespace photo_sorter
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.menuStrip1);
             this.Controls.Add(this.split_container_main);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MainMenuStrip = this.menuStrip1;
             this.MinimumSize = new System.Drawing.Size(768, 480);
             this.Name = "form_main";

Form1.cs

@@ -8,19 +8,10 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.IO;
+using ImageMagick;
 
 namespace photo_sorter
 {
-    /*public static class Extensions
-    {
-        public static T[] RemoveAt<T>(this T[] source, int index)
-        {
-            var work = new List<T>(source);
-            work.RemoveAt(index);
-            return work.ToArray();
-        }
-    }*/
-
     public partial class form_main : Form
     {
         public form_main()
@@ -122,12 +113,26 @@ namespace photo_sorter
             else
             {
                 fname = global.filenames[global.position];
-                Image img;
+                /*Image img;
                 using (var bmp = new Bitmap(fname))
+                {
+                    img = new Bitmap(bmp);
+                }*/
+                //var profile = fname.GetProfile("dng:thumbnail");
+                using (var jpegThumbnail = new MagickImage(fname))
+                {
+                    // Correct the image orientation
+                    jpegThumbnail.AutoOrient();
+                    //Image img = jpegThumbnail.Write();
+                    jpegThumbnail.Write(global.dest + "\\.tmp.jpg");
+                }
+                Image img;
+                using (var bmp = new Bitmap(global.dest + "\\.tmp.jpg"))
                 {
                     img = new Bitmap(bmp);
                 }
                 img_preview.Image = img;
+                //img_preview.Image = jpegThumbnail;
                 img_preview.Visible = true;
                 GC.Collect();
                 GC.WaitForPendingFinalizers();
@@ -138,7 +143,7 @@ namespace photo_sorter
 
         public string[] populate_file_names()
         {
-            string[] files = Directory.GetFiles(global.src, "*.jpg");
+            string[] files = Directory.GetFiles(global.src, "*.nef");
             return files;
         }
 

obj/Debug/photo_sorter.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-8069502011d0681850e57a53d5a1673222f430a6
+2b0bbc37fd9389f1c332902d9bb726f2b2efa56d

obj/Debug/photo_sorter.csproj.FileListAbsolute.txt

@@ -8,3 +8,11 @@ C:\Users\ajohnson\source\repos\photo_sorter\obj\Debug\photo_sorter.csproj.CoreCo
 C:\Users\ajohnson\source\repos\photo_sorter\obj\Debug\photo_sorter.exe
 C:\Users\ajohnson\source\repos\photo_sorter\obj\Debug\photo_sorter.pdb
 C:\Users\ajohnson\source\repos\photo_sorter\obj\Debug\photo_sorter.form_main.resources
+C:\Users\ajohnson\source\repos\photo_sorter\bin\Debug\Magick.Native-Q16-arm64.dll
+C:\Users\ajohnson\source\repos\photo_sorter\bin\Debug\Magick.Native-Q16-x64.dll
+C:\Users\ajohnson\source\repos\photo_sorter\bin\Debug\Magick.Native-Q16-x86.dll
+C:\Users\ajohnson\source\repos\photo_sorter\bin\Debug\Magick.NET-Q16-AnyCPU.dll
+C:\Users\ajohnson\source\repos\photo_sorter\bin\Debug\Magick.NET.Core.dll
+C:\Users\ajohnson\source\repos\photo_sorter\bin\Debug\Magick.NET-Q16-AnyCPU.xml
+C:\Users\ajohnson\source\repos\photo_sorter\bin\Debug\Magick.NET.Core.xml
+C:\Users\ajohnson\source\repos\photo_sorter\obj\Debug\photo_sorter.csproj.CopyComplete

packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Magick.NET.Core" version="12.2.1" targetFramework="net472" />
+  <package id="Magick.NET-Q16-AnyCPU" version="12.2.1" targetFramework="net472" />
+</packages>

packages/Magick.NET-Q16-AnyCPU.12.2.1/build/netstandard20/Magick.NET-Q16-AnyCPU.targets

@@ -0,0 +1,40 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' OR '$(MagickCopyNativeWindows)' == 'true'">
+    <NativeWindowsDLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win*\native\*.dll" />
+    <Content Include="@(NativeWindowsDLL)">
+      <Link>%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup Condition="'$(MagickCopyNativeLinux)' == 'true'">
+    <NativeLinuxDLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\*.so" />
+    <Content Include="@(NativeLinuxDLL)">
+      <Link>%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <NativeLinuxArm64DLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\linux-arm64\native\*.so" />
+    <Content Include="@(NativeLinuxArm64DLL)">
+      <Link>%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup Condition="'$(MagickCopyNativeLinuxMusl)' == 'true'">
+    <NativeLinuxMuslDLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\linux-musl-x64\native\*.so" />
+    <Content Include="@(NativeLinuxMuslDLL)">
+      <Link>%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup Condition="'$(MagickCopyNativeMacOS)' == 'true'">
+    <NativeMacOSDLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\osx-x64\native\*.dylib" />
+    <Content Include="@(NativeMacOSDLL)">
+      <Link>%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <NativeMacOSArm64DLL Include="$(MSBuildThisFileDirectory)\..\..\runtimes\osx-arm64\native\*.dylib" />
+    <Content Include="@(NativeMacOSArm64DLL)">
+      <Link>%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+</Project>

packages/Magick.NET.Core.12.2.1/Copyright.txt

@@ -0,0 +1,2 @@
+Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
+Licensed under the Apache License, Version 2.0.

photo_sorter.csproj

@@ -12,6 +12,23 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>0.1.1.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -22,6 +39,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,7 +50,16 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>skyfall_logo_roulette_white001.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Magick.NET-Q16-AnyCPU, Version=12.2.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
+      <HintPath>packages\Magick.NET-Q16-AnyCPU.12.2.1\lib\netstandard20\Magick.NET-Q16-AnyCPU.dll</HintPath>
+    </Reference>
+    <Reference Include="Magick.NET.Core, Version=12.2.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
+      <HintPath>packages\Magick.NET.Core.12.2.1\lib\netstandard20\Magick.NET.Core.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -66,6 +93,7 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -79,5 +107,27 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="skyfall_logo_roulette_white001.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="packages\Magick.NET-Q16-AnyCPU.12.2.1\build\netstandard20\Magick.NET-Q16-AnyCPU.targets" Condition="Exists('packages\Magick.NET-Q16-AnyCPU.12.2.1\build\netstandard20\Magick.NET-Q16-AnyCPU.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\Magick.NET-Q16-AnyCPU.12.2.1\build\netstandard20\Magick.NET-Q16-AnyCPU.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Magick.NET-Q16-AnyCPU.12.2.1\build\netstandard20\Magick.NET-Q16-AnyCPU.targets'))" />
+  </Target>
 </Project>

photo_sorter.csproj.user

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishUrlHistory>publish\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>en-US</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+</Project>