Update data source context

dogzz9445 · Jul 22, 2024 · e863141 · e863141
1 parent 00cb980
commit e863141
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 33 deletions.
diff --git a/src/Apps/Corathing.Organizer.WPF/Services/AppStateService.cs b/src/Apps/Corathing.Organizer.WPF/Services/AppStateService.cs
@@ -437,7 +437,7 @@ private string GetOrganizerSettingsFilename()
         else
         {
             using var fileStream = File.Open(AppSettingsFilename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-            using var streamReader = new StreamReader(fileStream);
+            using var streamReader = new StreamReader(fileStream, Encoding.UTF8);
             var json = await streamReader.ReadToEndAsync();
             using var document = JsonDocument.Parse(json, _documentOptions);
             var appSettings = document.RootElement
@@ -454,14 +454,14 @@ private async Task WriteAppSettingsToAppPath(AppSettings appSettings)
         if (appSettings == null)
             return;
 
-        string jsonString = await File.ReadAllTextAsync(AppSettingsFilename);
+        string jsonString = await File.ReadAllTextAsync(AppSettingsFilename, Encoding.UTF8);
 
         var rootNode = JsonNode.Parse(jsonString);
 
         rootNode["Corathing"]["Organizer"].ReplaceWith(appSettings);
         var json = rootNode.ToJsonString(_serializerOptions);
 
-        await File.WriteAllTextAsync(AppSettingsFilename, json);
+        await File.WriteAllTextAsync(AppSettingsFilename, json, Encoding.UTF8);
     }
 
     private async Task ReadOrCreateAppStateByAppSettings()
@@ -551,7 +551,7 @@ private async Task WrtieAppState()
     {
         _isWriting = true;
         using var fileStream = File.Open(GetOrganizerSettingsFilename(), FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.Read);
-        using var streamReader = new StreamReader(fileStream);
+        using var streamReader = new StreamReader(fileStream, Encoding.UTF8);
         var json = await streamReader.ReadToEndAsync();
         if (string.IsNullOrEmpty(json))
             json = AppStateJsonDomBase;

diff --git a/src/Apps/Corathing.Organizer.WPF/ViewModels/DataSourceSettingsViewModel.cs b/src/Apps/Corathing.Organizer.WPF/ViewModels/DataSourceSettingsViewModel.cs
@@ -138,8 +138,6 @@ public void Apply()
         if (SelectedContext == null)
             return;
 
-        // FIXME:
-        // 무언가 우아한 방법
         SelectedContext.Name = TempName;
         SelectedContext.State.CoreSettings.Title = TempName;
         SelectedContext.State.CustomSettigns = JsonHelper.DeepCopy(TempSettingsContext.CustomSettings, _optionType);

diff --git a/src/Shared/Corathing.Contracts.Utils/Generators/CoraDataSourceGenerator.cs b/src/Shared/Corathing.Contracts.Utils/Generators/CoraDataSourceGenerator.cs
@@ -57,6 +57,8 @@ private DataSourceState CreateState()
         {
             TypeName = GetDataSourceFullName(),
             Title = GenerateDefaultTitle(),
+            IsDependentOnWidget = false,
+            DependencyWidget = null,
         };
 
         state.CustomSettigns = CreateCustomOption();

diff --git a/src/Shared/Corathing.Contracts/Bases/DataSourceState.cs b/src/Shared/Corathing.Contracts/Bases/DataSourceState.cs
@@ -10,12 +10,16 @@ public interface IDataSourceCoreState
 {
     string? TypeName { get; }
     string? Title { get; }
+    bool IsDependentOnWidget { get; }
+    Guid? DependencyWidget { get; }
 }
 
-public class DataSourceCoreState
+public class DataSourceCoreState : IDataSourceCoreState
 {
     public string? TypeName { get; set; }
     public string? Title { get; set; }
+    public bool IsDependentOnWidget { get; set; }
+    public Guid? DependencyWidget { get; set; }
 }
 
 public interface IDataSourceState : IEntity

diff --git a/src/Shared/Corathing.Contracts/DataContexts/DataSourceContext.cs b/src/Shared/Corathing.Contracts/DataContexts/DataSourceContext.cs
@@ -18,16 +18,16 @@ namespace Corathing.Contracts.DataContexts;
 
 public partial class DataSourceContext : ObservableRecipient
 {
-    protected IServiceProvider _services;
+    protected IServiceProvider? _services;
 
     #region 숨겨진 프로퍼티
-    public Guid DataSourceId;
+    public Guid? DataSourceId { get; set; }
 
     public DataSourceState? State { get; set; }
     #endregion
 
     [ObservableProperty]
-    private string _name;
+    private string? _name;
 
     public void Initialize(IServiceProvider services, DataSourceState state)
     {
@@ -63,6 +63,9 @@ public void Destroy()
 
         _services?.GetRequiredService<IStorageService>().DeleteEntityFolder(State);
         _services?.GetRequiredService<IAppStateService>().RemoveDataSource(State);
+
+        // TODO:
+        //WeakReferenceMessenger.Default.Register
     }
 
     public virtual void OnCreate(IServiceProvider services, DataSourceState state)

diff --git a/src/Shared/Corathing.Contracts/DataContexts/DataSourceSelector.cs b/src/Shared/Corathing.Contracts/DataContexts/DataSourceSelector.cs
@@ -30,7 +30,7 @@ public partial class DataSourceSelector<T> :
     [ObservableProperty]
     private string? _hintSelectionText;
 
-    private bool _selectDefaultCreateIfEmpty;
+    private readonly bool _selectDefaultCreateIfEmpty;
 
     public DataSourceSelector(
         IServiceProvider services,
@@ -50,10 +50,13 @@ public DataSourceSelector(
 
         Select(guid);
 
-        WeakReferenceMessenger.Default?.Register<DataSourceStateChangedMessage, string>(
-            this,
-            typeof(T).FullName,
-            OnDataSourceStateChanged);
+        if (!string.IsNullOrEmpty(typeof(T).FullName))
+        {
+            WeakReferenceMessenger.Default?.Register<DataSourceStateChangedMessage, string>(
+                this,
+                typeof(T).FullName,
+                OnDataSourceStateChanged);
+        }
     }
 
     [RelayCommand]
@@ -69,14 +72,18 @@ private void OnDataSourceStateChanged(object recipient, DataSourceStateChangedMe
         {
             if (message.Value is T context)
             {
-                DataSourceContexts.Add(message.Value as T);
+                DataSourceContexts.Add(context);
             }
         }
         else if (message.ChangedType == EntityStateChangedType.Removed)
         {
             if (SelectedDataSourceContext == message.Value)
                 SelectedDataSourceContext = null;
-            DataSourceContexts.Remove(message.Value as T);
+
+            if (message.Value is T context)
+            {
+                DataSourceContexts.Remove(context);
+            }
         }
         else if (message.ChangedType == EntityStateChangedType.Selected)
         {

diff --git a/src/Shared/Corathing.UI.WPF/Styles/ListBox.xaml b/src/Shared/Corathing.UI.WPF/Styles/ListBox.xaml
@@ -45,7 +45,6 @@
     </Style>
 
     <Style TargetType="{x:Type ListBoxItem}"
-           BasedOn="{StaticResource DefaultListBoxItemStyle}"
            x:Key="DefaultCorathingListBoxItemStyle">
         <Setter Property="Foreground"
                 Value="{DynamicResource ListBoxItemForeground}" />

diff --git a/src/Widgets/Corathing.Widgets.Basics/DataSources/ToDos/ToDoDataSourceContext.cs b/src/Widgets/Corathing.Widgets.Basics/DataSources/ToDos/ToDoDataSourceContext.cs
@@ -47,30 +47,39 @@ public override void OnStateChanged(DataSourceState state)
 
     public void Add(ToDo toDo)
     {
+        ArgumentNullException.ThrowIfNull(State);
+
         if (State.CustomSettigns is not ToDoDataSourceOption option)
         {
             return;
         }
+        option.ToDos ??= new List<ToDo>();
         option.ToDos.Add(toDo);
         SaveState();
     }
 
     public void Remove(ToDo toDo)
     {
+        ArgumentNullException.ThrowIfNull(State);
+
         if (State.CustomSettigns is not ToDoDataSourceOption option)
         {
             return;
         }
+        option.ToDos ??= new List<ToDo>();
         option.ToDos.Remove(toDo);
         SaveState();
     }
 
     public void Update(ToDo toDo)
     {
+        ArgumentNullException.ThrowIfNull(State);
+
         if (State.CustomSettigns is not ToDoDataSourceOption option)
         {
             return;
         }
+        option.ToDos ??= new List<ToDo>();
         var index = option.ToDos.FindIndex(t => t.Id == toDo.Id);
         if (index == -1)
         {
@@ -85,10 +94,14 @@ public void Update(ToDo toDo)
 
     public List<ToDo>? GetToDos()
     {
+        ArgumentNullException.ThrowIfNull(State);
+
         if (State.CustomSettigns is not ToDoDataSourceOption option)
         {
             return null;
         }
+
+        option.ToDos ??= new List<ToDo>();
         return option.ToDos;
     }
 }
diff --git a/src/Widgets/Corathing.Widgets.Basics/Widgets/ToDoLists/ToDoListDataTemplates.xaml b/src/Widgets/Corathing.Widgets.Basics/Widgets/ToDoLists/ToDoListDataTemplates.xaml
@@ -39,7 +39,7 @@
                           IsChecked="{Binding IsShowTask}" />
             </settings:SettingsBlock>
 
-            <!-- Files ExecutableAppDataSourceSelector -->
+            <!-- ToDo DataSources -->
             <settings:SettingsBlock CategoryText="ToDo:"
                                     Header="Executable App for Open File or Folder..">
                 <ContentPresenter Grid.Row="1"

diff --git a/src/Widgets/Corathing.Widgets.Basics/Widgets/ToDoLists/ToDoListWidget.xaml b/src/Widgets/Corathing.Widgets.Basics/Widgets/ToDoLists/ToDoListWidget.xaml
@@ -248,7 +248,11 @@
                              Margin="0"
                              Padding="0"
                              BorderThickness="0"
-                             Text="{Binding Job}" />
+                             Text="{Binding Job}">
+                        <i:Interaction.Behaviors>
+                            <behaviors:TextBoxEnterKeyUpdateBehavior />
+                        </i:Interaction.Behaviors>
+                    </TextBox>
                 </DockPanel>
                 <Border IsHitTestVisible="False"
                         Visibility="{Binding IsDone, Converter={StaticResource BoolToVis}}"
@@ -260,33 +264,22 @@
         </DataTemplate>
 
     </UserControl.Resources>
+
     <Grid>
-        <!--<ListView BorderThickness="0"
-                  Background="Transparent"
-                  Style="{StaticResource MahApps.Styles.ListView.Virtualized}"
-                  ItemsSource="{Binding GroupedJobs}"
-                  ItemTemplateSelector="{StaticResource JobTemplateSelector}" />-->
-
         <ListView BorderThickness="0"
                   Background="Transparent"
                   Style="{DynamicResource CoraListViewStyle}"
                   dd:DragDrop.IsDragSource="True"
                   dd:DragDrop.IsDropTarget="True"
                   dd:DragDrop.ShowAlwaysDropTargetAdorner="True"
                   dd:DragDrop.UseDefaultDragAdorner="True"
-                  dd:DragDrop.DropHandler="{Binding}"
                   ItemContainerStyle="{StaticResource ChangedVisibilityByDoneListViewItem}"
                   SelectionChanged="ListView_SelectionChanged"
                   ItemsSource="{Binding ToDos}">
             <ListView.ItemTemplateSelector>
                 <behaviors:EmptyDataTemplateSelector EmptyTemplate="{StaticResource AddingJobDataTemplate}" />
             </ListView.ItemTemplateSelector>
         </ListView>
-
-        <!--<ListBox x:Name="ToDoListBox"
-                 BorderThickness="0"
-                 Background="Transparent"
-                 ItemsSource="{Binding GroupedJobs}"
-                 ItemTemplateSelector="{StaticResource JobTemplateSelector}" />-->
     </Grid>
+
 </UserControl>