Ad-hoc support for So-an

Note: the change for BusyIndicator does not solve the CPU load issue

Author: kmaki565

BentoEx/Model/Net.cs

@@ -42,7 +42,7 @@ public async Task<List<Bento>> GetBentoList(DateTime startDate)
                 }
 
                 // Retrieve Monday to Friday
-                string urlString = String.Format("item_list.html?from={0}&to={1}&deliveryDate=weeks", startDate.ToString("yyyy/MM/dd"), startDate.AddDays(4).ToString("yyyy/MM/dd"));
+                string urlString = String.Format("item_list.html?from={0}&to={1}", startDate.ToString("yyyy/MM/dd"), startDate.AddDays(4).ToString("yyyy/MM/dd"));
                 urlString = urlString.Replace("/", "%2F"); // URL encoding
                 urlString = SiteUrl + urlString;
 
@@ -66,6 +66,7 @@ List<Bento> ParseHtml(string html, DateTime startDate)
                 htmlDoc.DocumentNode
                 .SelectNodes(@"//div[@class=""box""]")
                 .Where(a => a.InnerHtml.Contains(@"class=""info"""))
+                .Where(a => !a.InnerHtml.Contains("ライス大盛"))
                 .Where(a => !a.InnerHtml.Contains("おかずのみ"))
                 .Select(a => new
                 {

BentoEx/Properties/AssemblyInfo.cs

@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.3.0")]
 [assembly: NeutralResourcesLanguage("ja")]
 

BentoEx/View/MainWindow.xaml

@@ -84,7 +84,7 @@
                 <SolidColorBrush Color="Black" Opacity="0.1" />
             </Grid.Background>
             <!--NuGet:Extended WPF Toolkit-->
-            <tool:BusyIndicator IsBusy="True" BusyContent="Loading..." />
+            <tool:BusyIndicator IsBusy="{Binding IsUpdating}" IsEnabled="{Binding IsUpdating}" BusyContent="Loading..." />
         </Grid>
     </Grid>
 </Window>

BentoEx/ViewModel/MainViewModel.cs

@@ -32,7 +32,7 @@ public MainViewModel()
             // Adjust to Monday
             while (selectedDay.DayOfWeek != DayOfWeek.Monday)
             {
-                if ((selectedDay.DayOfWeek == DayOfWeek.Friday && selectedDay.TimeOfDay > new TimeSpan(9, 45, 0))
+                if ((selectedDay.DayOfWeek == DayOfWeek.Friday && selectedDay.TimeOfDay > new TimeSpan(8, 45, 0))
                     || selectedDay.DayOfWeek == DayOfWeek.Saturday || selectedDay.DayOfWeek == DayOfWeek.Sunday)
                     selectedDay = selectedDay.AddDays(1);
                 else

Gat.Controls.AboutBox/AboutControlViewModel.cs

@@ -64,7 +64,7 @@ public AboutControlViewModel()
 			Window.Deactivated += Window_Deactivated;
 
 			Assembly assembly = Assembly.GetEntryAssembly();
-			Version = assembly.GetName().Version.ToString();
+			Version = assembly.GetName().Version.ToString() + "  (For So-an)";
 			Title = assembly.GetName().Name;
 
 #if NET35 || NET40