From 8b3d12989018fa985e27f51f0e36351548771554 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 19 Nov 2024 09:46:06 +0800
Subject: [PATCH] code_review: PR #711

* SourceGit.Commands.* should not reference code in SourceGit.ViewModels.

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Statistics.cs   | 5 ++---
 src/Models/Statistics.cs     | 4 +++-
 src/ViewModels/Statistics.cs | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Commands/Statistics.cs b/src/Commands/Statistics.cs
index 40ecc24a..511c43e8 100644
--- a/src/Commands/Statistics.cs
+++ b/src/Commands/Statistics.cs
@@ -1,15 +1,14 @@
 using System;
-using SourceGit.ViewModels;
 
 namespace SourceGit.Commands
 {
     public class Statistics : Command
     {
-        public Statistics(string repo)
+        public Statistics(string repo, int max)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"log --date-order --branches --remotes -{Preference.Instance.MaxHistoryCommits} --pretty=format:\"%ct$%aN\"";
+            Args = $"log --date-order --branches --remotes -{max} --pretty=format:\"%ct$%aN\"";
         }
 
         public Models.Statistics Result()
diff --git a/src/Models/Statistics.cs b/src/Models/Statistics.cs
index 6ee29e0c..969d3945 100644
--- a/src/Models/Statistics.cs
+++ b/src/Models/Statistics.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+
 using LiveChartsCore;
 using LiveChartsCore.Defaults;
 using LiveChartsCore.SkiaSharpView;
@@ -138,7 +139,8 @@ namespace SourceGit.Models
         public Statistics()
         {
             _today = DateTime.Now.ToLocalTime().Date;
-            _thisWeekStart = _today.AddDays(((int)_today.DayOfWeek + (int)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek) % 7 - 7);
+            var weekOffset = (7 + (int)_today.DayOfWeek - (int)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek) % 7;
+            _thisWeekStart = _today.AddDays(-weekOffset);
             _thisMonthStart = _today.AddDays(1 - _today.Day);
 
             All = new StatisticsReport(StaticsticsMode.All, DateTime.MinValue);
diff --git a/src/ViewModels/Statistics.cs b/src/ViewModels/Statistics.cs
index 7852a367..6caa2d95 100644
--- a/src/ViewModels/Statistics.cs
+++ b/src/ViewModels/Statistics.cs
@@ -54,7 +54,7 @@ namespace SourceGit.ViewModels
         {
             Task.Run(() =>
             {
-                var result = new Commands.Statistics(repo).Result();
+                var result = new Commands.Statistics(repo, Preference.Instance.MaxHistoryCommits).Result();
                 Dispatcher.UIThread.Invoke(() =>
                 {
                     _data = result;