diff --git a/SharpRss/Services/DatabaseService.cs b/SharpRss/Services/DatabaseService.cs index 0c62451..1686972 100644 --- a/SharpRss/Services/DatabaseService.cs +++ b/SharpRss/Services/DatabaseService.cs @@ -119,7 +119,7 @@ namespace SharpRss.Services feeds.Add(new FeedModel(reader["url"].ToString()) { Id = reader["id"].ToString(), - Title = reader["group_id"].ToString(), + Title = reader["title"].ToString(), GroupId = reader["group_id"].ToString(), FeedType = reader["feed_type"].ToString(), Description = reader["description"].ToString(), @@ -139,7 +139,7 @@ namespace SharpRss.Services { bool result = false; _sqlConn.Open(); - using SqliteCommand cmd = new SqliteCommand($"INSERT OR REPLACE INTO {_feedTable} (id, url, title, group_id, feed_type, description, language, copyright, date_added, last_updated, image_url, original_document) VALUES (IFNULL((SELECT id FROM {_feedTable} WHERE url=@url), @id), @url, @title, @groupId, @feedType, @description, @language, @copyright, @dateAdded, @lastUpdated, @imageUrl, @originalDoc)", _sqlConn) + using SqliteCommand cmd = new SqliteCommand($"INSERT OR REPLACE INTO {_feedTable} (id, url, title, group_id, feed_type, description, language, copyright, date_added, last_updated, image_url, original_document) VALUES (IFNULL((SELECT id FROM {_feedTable} WHERE url=@url), @id), @url, @title, @groupId, @feedType, @description, @language, @copyright, IFNULL((SELECT date_added FROM {_feedItemTable} WHERE id=@id), @dateAdded), @lastUpdated, @imageUrl, @originalDoc)", _sqlConn) { Parameters = { diff --git a/WebSharpRSS/Shared/SideGuide.razor b/WebSharpRSS/Shared/SideGuide.razor index 1da075a..5ea9471 100644 --- a/WebSharpRSS/Shared/SideGuide.razor +++ b/WebSharpRSS/Shared/SideGuide.razor @@ -16,7 +16,7 @@
- + @if (context.FaviconUrl == null && context.Icon != null) { @@ -54,13 +54,15 @@ { } - //private async void ExpandedClicked(TreeItemData treeItemData) - //{ - // treeItemData.Loading = true; - // var groupedItems = await _rssService.GetFeedsAsync(treeItemData.GroupModel); - // treeItemData.Children = ModelToTreeItem(groupedItems); - // treeItemData.Loading = false; - //} + private async void ExpandedChanged(TreeItemData treeItemData) + { + treeItemData.Loading = true; + var groupedItems = await _rssService.GetFeedsAsync(treeItemData.GroupModel); + treeItemData.Children = ModelToTreeItem(groupedItems); + treeItemData.IsExpanded = !treeItemData.IsExpanded; + treeItemData.Loading = false; + StateHasChanged(); + } protected override async void OnInitialized() { Log.Verbose("Loading guide data...");