Fix misc bugs

anaisbetts · Jul 11, 2012 · 4aa9688 · 4aa9688
1 parent eb56b98
commit 4aa9688
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/Shotclock/MainWindow.xaml b/Shotclock/MainWindow.xaml
@@ -1,8 +1,10 @@
 <Window x:Class="Shotclock.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="MainWindow" Height="350" Width="525">
+        Title="MainWindow" Height="350" Width="525" Background="Black">
     <Grid>
-
+        <Viewbox>
+            <TextBlock FontSize="64" Text="{Binding CommitAge}" HorizontalAlignment="Center"  VerticalAlignment="Center"  Foreground="White" />
+        </Viewbox>
     </Grid>
 </Window>
diff --git a/Shotclock/MainWindow.xaml.cs b/Shotclock/MainWindow.xaml.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive;
+using System.Reactive.Linq;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
@@ -11,6 +13,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Shotclock.ViewModels;
 
 namespace Shotclock
 {
@@ -21,6 +24,10 @@ public partial class MainWindow : Window
     {
         public MainWindow()
         {
+            DataContext =
+                new MainViewModel(
+                    Observable.FromEventPattern(x => Activated += x, x => Activated -= x).Select(_ => Unit.Default));
+
             InitializeComponent();
         }
     }

diff --git a/Shotclock/ViewModels/MainViewModel.cs b/Shotclock/ViewModels/MainViewModel.cs
@@ -16,7 +16,7 @@ namespace Shotclock.ViewModels
     public interface IMainViewModel : IReactiveNotifyPropertyChanged
     {
         bool IsVersionControlled { get; }
-        string RepositoryRoot { get;  }
+        string RepositoryRoot { get; }
 
         IObservable<Unit> RefreshNotification { get; }
         IObservable<Unit> GotFocusNotification { get; }
@@ -49,29 +49,29 @@ public TimeSpan CommitAge {
             get { return _CommitAge.Value; }
         }
 
-        public MainViewModel(IObservable<Unit> gotFocusNotification = null, IObservable<Unit> refreshNotification = null)
+        public MainViewModel(IObservable<Unit> gotFocusNotification = null, IObservable<Unit> refreshNotification = null, Func<TimeSpan> getIdleTime = null)
         {
-            RepositoryRoot = findRepositoryRoot();
+            RepositoryRoot = findRepositoryRoot(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
             IsVersionControlled = (!String.IsNullOrEmpty(RepositoryRoot));
 
             GotFocusNotification = gotFocusNotification ?? Observable.Never<Unit>();
-            RefreshNotification = refreshNotification ?? 
-                (IsVersionControlled ? createFileChangeWatch(RepositoryRoot) : Observable.Never<Unit>());
+            RefreshNotification = refreshNotification ??
+                (IsVersionControlled ? createFileChangeWatch(RepositoryRoot).Select(_ => Unit.Default) : Observable.Never<Unit>());
 
-            Observable.Merge(gotFocusNotification, refreshNotification)
+            Observable.Merge(GotFocusNotification, RefreshNotification)
                 .Where(_ => IsVersionControlled)
                 .Select(_ => fetchLatestCommitForHead(RepositoryRoot))
                 .Select(x => x.Author.When)
-                .ToProperty(this, x => LatestCommit, DateTimeOffset.MinValue);
+                .ToProperty(this, x => x.LatestCommit, DateTimeOffset.MinValue);
 
             var shouldUpdateClock = Observable.Merge(
                 gotFocusNotification,
                 this.WhenAny(x => x.LatestCommit, _ => Unit.Default),
-                Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1.0)).Select(_ => Unit.Default)
+                Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1.0), RxApp.DeferredScheduler).Select(_ => Unit.Default)
             ).Where(_ => IsVersionControlled);
 
             shouldUpdateClock
-                .Select(_ => getIdleTime())
+                .Select(_ => getIdleTime != null ? getIdleTime() : this.getIdleTime())
                 .Buffer(2, 1).Where(x => x[1] < TimeSpan.FromSeconds(5.0) && x[0] > TimeSpan.FromSeconds(30.0))
                 .Select(_ => RxApp.DeferredScheduler.Now)
                 .StartWith(RxApp.DeferredScheduler.Now)