Push

SharpRss/Models/CategoryItem.cs

@@ -1,10 +0,0 @@
-namespace SharpRss.Models
-{
-    public class CategoryItem
-    {
-        public string CategoryId { get; set; }
-        public string CategoryName { get; set; }
-        public string CategoryIcon { get; set; }
-        
-    }
-}

SharpRss/Models/CategoryModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SharpRss.Models
+{
+    /// <summary>
+    /// To store and load data from file/database
+    /// </summary>
+    public class CategoryModel
+    {
+        public string Name { get; set; }
+        public HashSet<FeedModel> Feeds { get; set; }
+    }
+}

SharpRss/Models/FeedInfo.cs

@@ -1,10 +0,0 @@
-using CodeHollow.FeedReader;
-
-namespace SharpRss.Models
-{
-    public class FeedInfo
-    {
-        public string FeedName { get; set; }
-        public string Url { get; set; }
-    }
-}

SharpRss/Models/FeedModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SharpRss.Models
+{
+    public class FeedModel
+    {
+        public string Type { get; set; }
+        public string Text { get; set; }
+        public string Title { get; set; }
+        public string XmlUrl { get; set; }
+        public string HtmlUrl { get; set; }
+    }
+}

SharpRss/RssService.cs

@@ -6,37 +6,48 @@ using SharpRss.Models;
 
 namespace SharpRss
 {
+    /// <summary>
+    /// Managing RSS feeds and categories.
+    /// </summary>
     public class RssService
     {
         public RssService()
         {
-            //TODO: Check if db exists else create.
+            /// Storage options:
+            /// - Database
+            /// - File
+            /// - Memory
         }
 
-        public async Task<HashSet<CategoryItem>> GetCategories()
+        public async Task<HashSet<CategoryModel>> GetCategories()
         {
-            return new HashSet<CategoryItem>();
+            return new HashSet<CategoryModel>();
         }
 
-        public async void GetFeeds()
+        public async Task<HashSet<FeedModel>> GetAllFeeds()
         {
-            //TODO: Load from db or something.
+            return new HashSet<FeedModel>();
+        }
 
-            var urls = await FeedReader.GetFeedUrlsFromUrlAsync(_feeds[0]);
+
+        /// Old
+
+        public async Task<Feed> GetFeed(string feedUrl)
+        {
+            var urls = await FeedReader.GetFeedUrlsFromUrlAsync(feedUrl);
             string url;
             if (urls.Count() < 1)
                 url = _feeds[0];
             else
                 url = urls.First().Url;
 
-            Feed f = await FeedReader.ReadAsync(url);
+            return await FeedReader.ReadAsync(url);
+        }
+        public async Task<HashSet<Feed>> GetFeedsFromCatAsync(CategoryModel category)
+        {
+            return new HashSet<Feed>();
         }
 
         private readonly string[] _feeds = { "https://www.reddit.com/r/freshrss/.rss", "http://fedoramagazine.org/" };
-
-        private void CheckDbExist()
-        {
-            
-        }
     }
 }

WebSharpRSS/Models/CategoryItem.cs

@@ -0,0 +1,15 @@
+using SharpRss.Models;
+
+namespace WebSharpRSS.Models
+{
+    public class CategoryItem : CategoryModel, ISelectableGuideItem
+    {
+        public CategoryItem(CategoryModel model)
+        {
+            Name = model.Name;
+            Feeds = model.Feeds;
+        }
+        public bool IsSelected { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public bool IsExpanded { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+    }
+}

WebSharpRSS/Settings.json

@@ -1,4 +0,0 @@
-{
-  "FaviconResolveUrl": "https://icons.duckduckgo.com/ip3/{0}.ico",
-  "LogPath": "/home/max/GitHub/SharpRSS/WebSharpRSS/logs/log_.json"
-}

WebSharpRSS/Shared/SideGuide.razor

@@ -1,3 +1,4 @@
+@using SharpRss.Models;
 @using WebSharpRSS.Models
 @using MudBlazor.Utilities
 @using CodeHollow.FeedReader
@@ -14,6 +15,7 @@
 
 @code {
     public HashSet<CategoryGuideItem> Categories = new HashSet<CategoryGuideItem>();
+    public HashSet<CategoryItem> Cats = new HashSet<CategoryItem>();
     protected override void OnInitialized()
     {
         Log.Verbose("Setting up test data");