Refactoring and adding more cultures.

Also improving logging
BlythMeister · Oct 12, 2015 · 1ca7622 · 1ca7622
1 parent f05dd30
commit 1ca7622
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 11 deletions.
diff --git a/src/BingWallpaper/App.config → src/App.config b/src/BingWallpaper/App.config → src/App.config
@@ -3,7 +3,7 @@
   <appSettings>
     <add key="ImageSavePath" value="C:\Users\Chris.Blyth\Bing Wallpaper"/>
     <add key="ArchiveAfterMonths" value="3"/>
-    <add key="Countries" value="en-GB,en-US,en-AU,en-NZ,en-CA,de-DE,fr-FR,zh-CN,ja-JP"/>
+    <add key="PreventDuplicatesInArchive" value="True"/>
   </appSettings>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />

diff --git a/...ingWallpaper/BingInteractionAndParsing.cs → src/BingInteractionAndParsing.cs b/...ingWallpaper/BingInteractionAndParsing.cs → src/BingInteractionAndParsing.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Configuration;
 using System.Drawing;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -14,22 +15,22 @@ static internal class BingInteractionAndParsing
     private const string url = "http://bing.com";
     internal static readonly string downloadPath = Path.Combine(Program.appData, "Temp");
     internal static readonly List<string> urlsRetrieved = new List<string>();
-    internal static readonly string[] countries = ConfigurationManager.AppSettings["Countries"].Split(',');
+    internal static readonly List<CultureInfo> countries = new List<CultureInfo>();
 
     internal static void GetBingImages()
     {
         var downloadedImages = 0;
 
         foreach (var country in countries)
         {
-            ConsoleWriter.WriteLine("Searching for images for {0}", country);
+            ConsoleWriter.WriteLine("Searching for images for {0} - {1}", country.Name, country.DisplayName);
             var countryImages = 0;
             var countryDuplicateImages = 0;
             var currentIndex = 0;
             var moreImages = true;
             while (moreImages)
             {
-                var xmlNodeList = GetImages(currentIndex, country);
+                var xmlNodeList = GetImages(currentIndex, country.Name);
                 if (xmlNodeList == null)
                 {
                     moreImages = false;
@@ -38,7 +39,8 @@ internal static void GetBingImages()
                 {
                     foreach (XmlNode xmlNode in xmlNodeList)
                     {
-                        ConsoleWriter.WriteLine(1, "Image for: '{0}' on {1}-{2} using index {3}", country, xmlNode.SelectSingleNode("startdate").InnerText, xmlNode.SelectSingleNode("enddate").InnerText, currentIndex);
+                        var imageUrl = string.Format("{0}{1}_1920x1080.jpg", url, xmlNode.SelectSingleNode("urlBase").InnerText);
+                        ConsoleWriter.WriteLine(1, "Image for: '{0}' on {1}-{2} index {3} was: {4}", country.Name, xmlNode.SelectSingleNode("startdate").InnerText, xmlNode.SelectSingleNode("enddate").InnerText, currentIndex, imageUrl);
                         try
                         {
                             if (DownloadAndSaveImage(xmlNode))
@@ -62,8 +64,8 @@ internal static void GetBingImages()
             }
 
             downloadedImages += countryImages;
-            ConsoleWriter.WriteLine("Found {0} new images for {1}", countryImages, country);
-            ConsoleWriter.WriteLine("Found {0} duplicate images for {1}", countryDuplicateImages, country);
+            ConsoleWriter.WriteLine("Found {0} new images for {1}", countryImages, country.Name);
+            ConsoleWriter.WriteLine("Found {0} duplicate images for {1}", countryDuplicateImages, country.Name);
             ConsoleWriter.WriteLine("");
         }
 
@@ -72,7 +74,7 @@ internal static void GetBingImages()
 
     internal static bool DownloadAndSaveImage(XmlNode xmlNode)
     {
-        var fileurl = String.Format("{0}{1}_1920x1080.jpg", url, xmlNode.SelectSingleNode("urlBase").InnerText);
+        var fileurl = string.Format("{0}{1}_1920x1080.jpg", url, xmlNode.SelectSingleNode("urlBase").InnerText);
         if (urlsRetrieved.Contains(fileurl))
         {
             ConsoleWriter.WriteLine(2, "Already Dowloaded Image URL");

diff --git a/src/BingWallpaper/BingWallpaper.csproj → src/BingWallpaper.csproj b/src/BingWallpaper/BingWallpaper.csproj → src/BingWallpaper.csproj
diff --git a/src/BingWallpaper/BingWallpaper.sln → src/BingWallpaper.sln b/src/BingWallpaper/BingWallpaper.sln → src/BingWallpaper.sln
diff --git a/src/BingWallpaper/ConsoleWriter.cs → src/ConsoleWriter.cs b/src/BingWallpaper/ConsoleWriter.cs → src/ConsoleWriter.cs
diff --git a/src/BingWallpaper/ImageHashing.cs → src/ImageHashing.cs b/src/BingWallpaper/ImageHashing.cs → src/ImageHashing.cs
diff --git a/src/BingWallpaper/ImageMetadataPropertyId.cs → src/ImageMetadataPropertyId.cs b/src/BingWallpaper/ImageMetadataPropertyId.cs → src/ImageMetadataPropertyId.cs
diff --git a/src/BingWallpaper/ImagePropertyHandling.cs → src/ImagePropertyHandling.cs b/src/BingWallpaper/ImagePropertyHandling.cs → src/ImagePropertyHandling.cs
diff --git a/src/BingWallpaper/Program.cs → src/Program.cs b/src/BingWallpaper/Program.cs → src/Program.cs
diff --git a/src/BingWallpaper/Properties/AssemblyInfo.cs → src/Properties/AssemblyInfo.cs b/src/BingWallpaper/Properties/AssemblyInfo.cs → src/Properties/AssemblyInfo.cs
diff --git a/src/BingWallpaper/Serializer.cs → src/Serializer.cs b/src/BingWallpaper/Serializer.cs → src/Serializer.cs
diff --git a/src/BingWallpaper/SetupAndTearDown.cs → src/SetupAndTearDown.cs b/src/BingWallpaper/SetupAndTearDown.cs → src/SetupAndTearDown.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Configuration;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using BingWallpaper;
@@ -16,15 +17,25 @@ internal static void Startup()
         var logPath = Path.Combine(Program.savePath, "Logs");
         if (!Directory.Exists(logPath)) Directory.CreateDirectory(logPath);
         ConsoleWriter.SetupLogWriter(Path.Combine(logPath, String.Format("Log-{0}.txt", DateTime.UtcNow.ToString("yyyy-MM-dd"))));
-
-
-        BingInteractionAndParsing.urlsRetrieved.AddRange(Serializer.Deserialize<string>(Path.Combine(Program.appData, "urlsRetrieved.bin")));
 
+        BingInteractionAndParsing.urlsRetrieved.AddRange(Serializer.Deserialize<string>(Path.Combine(Program.appData, "urlsRetrieved.bin")));
+        BingInteractionAndParsing.countries.AddRange(CultureInfo.GetCultures(CultureTypes.AllCultures).Where(x=>x.Name.Contains("-") && x.Name.Length == 5));
+
         foreach (var file in Directory.GetFiles(Program.savePath, "*.jpg"))
         {
             ImageHashing.AddHash(file);
         }
 
+        var preventArchiveDupes = bool.Parse(ConfigurationManager.AppSettings["PreventDuplicatesInArchive"]);
+        if (preventArchiveDupes)
+        {
+            var archivePath = Path.Combine(Program.savePath, "Archive");
+            if (!Directory.Exists(archivePath)) Directory.CreateDirectory(archivePath);
+            foreach (var file in Directory.GetFiles(archivePath, "*.jpg"))
+            {
+                ImageHashing.AddHash(file);
+            }
+        }
         foreach (var file in Directory.GetFiles(logPath))
         {
             var fileInfo = new FileInfo(file);

diff --git a/src/BingWallpaper/packages.config → src/packages.config b/src/BingWallpaper/packages.config → src/packages.config