Merge branch 'master' of https://github.com/fredatgithub/SaveWindows10WallPaper

Author: fredatgithub

SaveWin10Pictures/Program.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Reflection;
 
 namespace SaveWin10Pictures
 {
@@ -10,10 +12,13 @@ private static void Main()
     {
       Action<string> display = Console.WriteLine;
       Console.ForegroundColor = ConsoleColor.White;
+      display($"Save Windows 10 wallpaper {DisplayTitle()} without Explorer opening");
+      display(string.Empty);
       display("Checking if there are new images to be copied...");
       List<string> files = new List<string>();
       int counter = 0;
       //string OSVersion = Environment.OSVersion.ToString(); // 6.2 ON Win 10
+      string OSVersion = GetOSInfo();
       //string userName = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
       string userName = Environment.UserName;
       string userNameProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
@@ -22,7 +27,7 @@ private static void Main()
       // remove domain if any
       if (userName.Contains("\\"))
       {
-        userName = userName.Split('\\')[1]; 
+        userName = userName.Split('\\')[1];
       }
 
       string imagePath = myPicturesFolder;
@@ -44,13 +49,24 @@ private static void Main()
 
       try
       {
-        const bool overwirte = false;
+        //const bool overwrite = true;
+        const bool doNotOverwrite = false;
         for (int i = 0; i < files.Count; i++)
         {
           string source = files[i];
-          string destination = Path.Combine(imagePath, source) + ".jpg";
-          File.Copy(source, destination, overwirte);
-          counter++;
+          string destination = Path.Combine(imagePath, Path.GetFileName(source)) + ".jpg";
+          if (!File.Exists(destination))
+          {
+            File.Copy(source, destination, doNotOverwrite);
+            counter++;
+            // copying pic to source git
+            string destinationGitPath = $@"C:\Users\{userName}\Source\Repos\SaveWindows10WallPaper\SaveWindows10WallPaper\images";
+            string destinationGit = Path.Combine(destinationGitPath, Path.GetFileName(source)) + ".jpg";
+            if (File.Exists(destinationGit))
+            {
+              File.Copy(source, destinationGit, doNotOverwrite);
+            }
+          }
         }
       }
       catch (Exception)
@@ -70,11 +86,52 @@ private static void Main()
       display(string.Empty);
       display($"{counter} image{Plural(counter)} {Plural(counter, "have")} been copied to the picture folder.");
       display(string.Empty);
+
+      // Open explorer to see source picture folder for test to debug
+      //userName = Environment.UserName;
+      //imagePath = $@"C:\Users\{userName}\Pictures";
+      //if (Directory.Exists($@"C:\Users\{userName}\Pictures\fond_ecran"))
+      //{
+      //  imagePath = $@"C:\Users\{userName}\Pictures\fond_ecran";
+      //}
+
+      //StartProcess("Explorer.exe", imagePath, true, false);
+
+      // Open explorer to view target picture folder for test to debug
+      //imagePath = $@"C:\Users\{userName}\AppData\Local\Packages\Microsoft.Windows.ContentDeliveryManager_cw5n1h2txyewy\LocalState\Assets";
+      //if (Directory.Exists(imagePath))
+      //{
+      //  StartProcess("Explorer.exe", imagePath, true, false);
+      //}
+
       Console.ForegroundColor = ConsoleColor.Yellow;
       display("Press any key to exit:");
       Console.ReadKey(); // comment for batch to production
     }
 
+    private static string DisplayTitle()
+    {
+      Assembly assembly = Assembly.GetExecutingAssembly();
+      FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
+      return $@"V{fvi.FileMajorPart}.{fvi.FileMinorPart}.{fvi.FileBuildPart}.{fvi.FilePrivatePart}";
+    }
+
+    public static void StartProcess(string dosScript, string arguments = "", bool useShellExecute = true, bool createNoWindow = false)
+    {
+      Process task = new Process
+      {
+        StartInfo =
+        {
+          UseShellExecute = useShellExecute,
+          FileName = dosScript,
+          Arguments = arguments,
+          CreateNoWindow = createNoWindow
+        }
+      };
+
+      task.Start();
+    }
+
     public static string Plural(int number, string irregularNoun = "")
     {
       switch (irregularNoun)
@@ -187,5 +244,89 @@ public static List<string> GetFilesFileteredBySize(DirectoryInfo directoryInfo,
 
       return result;
     }
+
+    public static string GetOSInfo()
+    {
+      //Get Operating system information.
+      OperatingSystem os = Environment.OSVersion;
+      //Get version information about the os.
+      Version vs = os.Version;
+
+      //Variable to hold our return value
+      string operatingSystem = "";
+
+      if (os.Platform == PlatformID.Win32Windows)
+      {
+        //This is a pre-NT version of Windows
+        switch (vs.Minor)
+        {
+          case 0:
+            operatingSystem = "95";
+            break;
+          case 10:
+            if (vs.Revision.ToString() == "2222A")
+              operatingSystem = "98SE";
+            else
+              operatingSystem = "98";
+            break;
+          case 90:
+            operatingSystem = "Me";
+            break;
+          default:
+            break;
+        }
+      }
+      else if (os.Platform == PlatformID.Win32NT)
+      {
+        switch (vs.Major)
+        {
+          case 3:
+            operatingSystem = "NT 3.51";
+            break;
+          case 4:
+            operatingSystem = "NT 4.0";
+            break;
+          case 5:
+            if (vs.Minor == 0)
+              operatingSystem = "2000";
+            else
+              operatingSystem = "XP";
+            break;
+          case 6:
+            if (vs.Minor == 0)
+              operatingSystem = "Vista";
+            else if (vs.Minor == 1)
+              operatingSystem = "7";
+            else if (vs.Minor == 2)
+              operatingSystem = "8";
+            else
+              operatingSystem = "8.1";
+            break;
+          case 10:
+            operatingSystem = "10";
+            break;
+          default:
+            break;
+        }
+      }
+      //Make sure we actually got something in our OS check
+      //We don't want to just return " Service Pack 2" or " 32-bit"
+      //That information is useless without the OS version.
+      if (operatingSystem != "")
+      {
+        //Got something.  Let's prepend "Windows" and get more info.
+        operatingSystem = "Windows " + operatingSystem;
+        //See if there's a service pack installed.
+        if (os.ServicePack != "")
+        {
+          //Append it to the OS name.  i.e. "Windows XP Service Pack 3"
+          operatingSystem += " " + os.ServicePack;
+        }
+        //Append the OS architecture.  i.e. "Windows XP Service Pack 3 32-bit"
+        //operatingSystem += " " + getOSArchitecture().ToString() + "-bit";
+      }
+      //Return the information we've gathered.
+      return operatingSystem;
+    }
   }
 }

SaveWin10Pictures/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]

SaveWin10Pictures/SaveWin10Pictures.csproj

@@ -32,6 +32,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>SaveWin10Pictures.Program</StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />