Fix rough edges on movie series form titles

#30
TolikPylypchuk · Feb 16, 2020 · 1b00a92 · 1b00a92
1 parent 724f6b3
commit 1b00a92
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 26 deletions.
diff --git a/MovieList.ViewModels/Comparers/ListItemTitleComparer.cs b/MovieList.ViewModels/Comparers/ListItemTitleComparer.cs
@@ -81,8 +81,8 @@ private int Compare(MovieSeriesListItem left, MovieSeriesListItem right)
             } else if (left.MovieSeries.Entry == null && right.MovieSeries.Entry == null)
             {
                 result = TitleComparer.Instance.Compare(
-                    left.MovieSeries.GetTitle()?.Name ?? String.Empty,
-                    right.MovieSeries.GetTitle()?.Name ?? String.Empty);
+                    left.MovieSeries.GetListTitle()?.Name ?? String.Empty,
+                    right.MovieSeries.GetListTitle()?.Name ?? String.Empty);
 
                 if (result == 0)
                 {
@@ -183,7 +183,7 @@ private int CompareTitleOrYear(ListItem left, ListItem right)
         private int CompareTitleOrYear(MovieSeriesListItem left, ListItem right)
         {
             int result = TitleComparer.Instance.Compare(
-                left.MovieSeries.GetTitle()?.Name ?? String.Empty, right.Title);
+                left.MovieSeries.GetListTitle()?.Name ?? String.Empty, right.Title);
 
             return result != 0 ? result : left.Year.CompareTo(right.Year);
         }

diff --git a/MovieList.ViewModels/Data/Models/ModelExtensions.cs b/MovieList.ViewModels/Data/Models/ModelExtensions.cs
@@ -44,6 +44,9 @@ public static string GetActiveColor(this MovieSeries movieSeries)
         }
 
         public static Title? GetTitle(this MovieSeries movieSeries)
+            => movieSeries.Titles.Count > 0 ? movieSeries.Title! : movieSeries.GetFirstEntry()?.GetTitle();
+
+        public static Title? GetListTitle(this MovieSeries movieSeries)
             => movieSeries.ShowTitles ? movieSeries.Title! : movieSeries.GetFirstEntry()?.GetTitle();
 
         public static Title? GetTitle(this MovieSeriesEntry entry)

diff --git a/MovieList.ViewModels/ViewModels/Forms/Base/TitledFormBase.cs b/MovieList.ViewModels/ViewModels/Forms/Base/TitledFormBase.cs
@@ -40,9 +40,7 @@ protected TitledFormBase(ResourceManager? resourceManager, IScheduler? scheduler
                 .AutoRefresh(vm => vm.Priority)
                 .ToCollection()
                 .Select(vms => vms.OrderBy(vm => vm.Priority).Select(vm => vm.Name).FirstOrDefault())
-                .Select(title => this.IsNew && String.IsNullOrWhiteSpace(title)
-                    ? this.ResourceManager.GetString(this.NewItemKey) ?? String.Empty
-                    : title)
+                .Select(this.GetFormTitle)
                 .ObserveOn(RxApp.MainThreadScheduler);
 
             var canAddTitle = this.Titles.ToObservableChangeSet()
@@ -122,6 +120,11 @@ protected async Task SaveTitlesAsync()
         protected void ClearTitles()
             => this.titlesSource.Clear();
 
+        protected string GetFormTitle(string title)
+            => this.IsNew && String.IsNullOrWhiteSpace(title)
+                ? this.ResourceManager.GetString(this.NewItemKey) ?? String.Empty
+                : title;
+
         private void InitializeTitles(
             Func<Title, bool> predicate,
             out ReadOnlyObservableCollection<TitleFormViewModel> titles)

diff --git a/MovieList.ViewModels/ViewModels/Forms/MovieSeriesEntryViewModel.cs b/MovieList.ViewModels/ViewModels/Forms/MovieSeriesEntryViewModel.cs
@@ -124,6 +124,11 @@ protected override void CopyProperties()
             this.Years = this.Entry.GetYears();
             this.SequenceNumber = this.Entry.SequenceNumber;
             this.DisplayNumber = this.Entry.DisplayNumber;
+
+            if (this.Years == "0")
+            {
+                this.Years = String.Empty;
+            }
         }
     }
 }
diff --git a/MovieList.ViewModels/ViewModels/Forms/MovieSeriesFormViewModel.cs b/MovieList.ViewModels/ViewModels/Forms/MovieSeriesFormViewModel.cs
@@ -58,16 +58,15 @@ public MovieSeriesFormViewModel(
 
             this.FormTitle =
                 this.FormTitle
-                    .Select(title => this.MovieSeriesEntry != null
-                        ? $"{this.GetFormTitle(this.MovieSeriesEntry.ParentSeries)}: {title}"
-                        : title);
+                    .Select(this.GetFullFormTitle)
+                    .StartWith(this.GetFullFormTitle(this.GetFormTitle(String.Empty)));
 
             this.PosterUrlRule = this.ValidationRule(vm => vm.PosterUrl, url => url.IsUrl(), "PosterUrlInvalid");
 
             this.entriesSource.Connect()
                 .Count()
                 .Select(count => count > 0)
-                .ToPropertyEx(this, vm => vm.CanHaveTitles);
+                .ToPropertyEx(this, vm => vm.CanShowTitles);
 
             var canSelectEntry = this.FormChanged.Invert();
 
@@ -114,7 +113,7 @@ public ReadOnlyObservableCollection<MovieSeriesEntryViewModel> Entries
 
         public ValidationHelper PosterUrlRule { get; }
 
-        public bool CanHaveTitles { [ObservableAsProperty] get; }
+        public bool CanShowTitles { [ObservableAsProperty] get; }
 
         public ReactiveCommand<MovieSeriesEntryViewModel, MovieSeriesEntry> SelectEntry { get; }
         public ReactiveCommand<MovieSeriesEntry, MovieSeriesEntry> DetachEntry { get; }
@@ -212,24 +211,21 @@ protected override void AttachTitle(Title title)
         private void InitializeValueDependencies()
         {
             this.WhenAnyValue(vm => vm.HasTitles)
-                .Where(_ => this.CanHaveTitles)
                 .BindTo(this, vm => vm.ShowTitles);
 
             this.WhenAnyValue(vm => vm.HasTitles)
-                .Where(_ => this.CanHaveTitles)
                 .Where(hasTitles => hasTitles && this.Titles.Count == 0)
                 .Discard()
                 .SubscribeAsync(this.AddTitles);
 
             this.WhenAnyValue(vm => vm.HasTitles)
-                .Where(_ => this.CanHaveTitles)
                 .Where(hasTitles => !hasTitles && this.Titles.Count > 0)
                 .Discard()
                 .Subscribe(this.ClearTitles);
 
-            this.WhenAnyValue(vm => vm.HasTitles)
-                .Where(hasTitles => hasTitles && !this.CanHaveTitles)
-                .Subscribe(_ => this.HasTitles = false);
+            this.WhenAnyValue(vm => vm.ShowTitles)
+                .Where(showTitles => showTitles && !this.CanShowTitles)
+                .Subscribe(_ => this.ShowTitles = false);
 
             this.WhenAnyValue(vm => vm.MergeDisplayNumbers)
                 .SubscribeBool(this.OnMergeDisplayNumbers, this.OnUnmergeDisplayNumbers);
@@ -239,15 +235,24 @@ private void InitializeValueDependencies()
         [SuppressMessage("ReSharper", "ConstantConditionalAccessQualifier")]
         private string GetFormTitle(MovieSeries movieSeries)
         {
-            string title = movieSeries.ActualTitles.FirstOrDefault(t => !t.IsOriginal)?.Name
-                ?? this.ResourceManager.GetString(this.NewItemKey) ?? String.Empty;
+            string title = movieSeries.ActualTitles.FirstOrDefault(t => !t.IsOriginal)?.Name ?? String.Empty;
             return movieSeries.Entry == null ? title : $"{this.GetFormTitle(movieSeries.Entry.ParentSeries)}: {title}";
         }
 
+        private string GetFullFormTitle(string title)
+            => this.MovieSeriesEntry != null
+                ? $"{this.GetFormTitle(this.MovieSeriesEntry.ParentSeries)}: {title}"
+                : title;
+
+        [SuppressMessage("ReSharper", "ConstantNullCoalescingCondition")]
+        [SuppressMessage("ReSharper", "ConstantConditionalAccessQualifier")]
         private async Task AddTitles()
         {
-            string titleName = this.MovieSeries.ActualTitles.First(t => !t.IsOriginal).Name;
-            string originalTitleName = this.MovieSeries.ActualTitles.First(t => t.IsOriginal).Name;
+            string titleName = this.MovieSeries.ActualTitles.FirstOrDefault(t => !t.IsOriginal)?.Name
+                ?? String.Empty;
+
+            string originalTitleName = this.MovieSeries.ActualTitles.FirstOrDefault(t => t.IsOriginal)?.Name
+                ?? String.Empty;
 
             await this.AddTitle.Execute();
             await this.AddOriginalTitle.Execute();

diff --git a/MovieList/Views/Forms/MovieSeriesFormControl.xaml.cs b/MovieList/Views/Forms/MovieSeriesFormControl.xaml.cs
@@ -155,11 +155,10 @@ private void BindCheckboxes(CompositeDisposable disposables)
             this.Bind(this.ViewModel, vm => vm.MergeDisplayNumbers, v => v.MergeDisplayNumbersCheckBox.IsChecked)
                 .DisposeWith(disposables);
 
-            this.WhenAnyValue(v => v.ViewModel.CanHaveTitles)
-                .BindTo(this, v => v.HasTitlesCheckBox.IsEnabled)
-                .DisposeWith(disposables);
-
-            this.WhenAnyValue(v => v.ViewModel.HasTitles)
+            this.WhenAnyValue(
+                    v => v.ViewModel.HasTitles,
+                    v => v.ViewModel.CanShowTitles,
+                    (hasTitles, canShowTitles) => hasTitles && canShowTitles)
                 .BindTo(this, v => v.ShowInListCheckBox.IsEnabled)
                 .DisposeWith(disposables);