code cleanup (issues reported by sonarlint)

frankhale · Aug 27, 2020 · bb44c00 · bb44c00
1 parent 9e15848
commit bb44c00
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 31 deletions.
diff --git a/server/Components/CommandInput.razor.cs b/server/Components/CommandInput.razor.cs
@@ -51,21 +51,16 @@ private async Task<SearchResult> CreateResult<T>(SearchResultType type, Message
             return result;
         }
 
-        private async void OnKeyPress(string key)
+        private async Task OnKeyPress(string key)
         {
-            static bool MatchesCommandList(string value, params string[] commands) => commands.Where(x => x == value).FirstOrDefault() != null;
+            static bool MatchesCommandList(string value, params string[] commands) => commands.FirstOrDefault(x => x == value) != null;
 
             if (key == "Enter" && !string.IsNullOrEmpty(SearchTerm))
             {
                 var searchValue = SearchTerm.ToLower().Split(new char[] { ' ' }, 2);
 
                 var result = searchValue switch
                 {
-                    //_ when MatchesCommandList(searchValue[0], "/t", "/test") =>
-                    //    CreateResult(SearchResultType.Command,
-                    //    () => {
-                    //        return new Message() { Value = "This is a test message...", Type = "alert-warning" };
-                    //    }),
                     _ when MatchesCommandList(searchValue[0], "/clear") => CreateResult(SearchResultType.Search, new List<Video>()),
                     _ when MatchesCommandList(searchValue[0], "/mg", "/manage") => CreateResult(SearchResultType.Manage, await videos.AllVideosAsync()),
                     _ when MatchesCommandList(searchValue[0], "/mgg", "/manage-groups") => CreateResult(SearchResultType.ManageGroups, await videos.AllGroupsAsync()),

diff --git a/server/Components/GroupManagement.razor.cs b/server/Components/GroupManagement.razor.cs
@@ -69,7 +69,7 @@ private void OnCheckboxClicked(string name, object checkedValue)
                 }
             }
 
-            DeleteButtonDisabled = (GroupsToDelete.Count > 0) ? false : true;
+            DeleteButtonDisabled = GroupsToDelete.Count <= 0;
         }
 
         private async Task OnDeleteButtonClicked()
@@ -101,8 +101,7 @@ private async Task OnDeleteButtonClicked()
         private async Task OnAddButtonClicked()
         {
             await videos.AddGroupAsync(SearchTerm);
-            Groups = await videos.AllGroupsAsync();
-            // FIXME: This is not working, boo! Can't bind value and do on-input stupid fucking this doesn't work...!!!?!?!?!?!?!?!
+            Groups = await videos.AllGroupsAsync();            
             SearchTerm = string.Empty;
             await OnSearchTermChanged(new ChangeEventArgs() { Value = String.Empty });
         }

diff --git a/server/Components/Notification.razor.cs b/server/Components/Notification.razor.cs
@@ -29,7 +29,7 @@ private async Task CallClose()
             await OnClose.InvokeAsync(null);
         }
 
-        private async void OnCloseButtonClick()
+        private async Task OnCloseButtonClick()
         {
             await CallClose();
         }

diff --git a/server/Components/VideoPagination.razor.cs b/server/Components/VideoPagination.razor.cs
@@ -1,11 +1,8 @@
-using Google.Apis.YouTube.v3.Data;
-using Microsoft.AspNetCore.Components;
-using System;
+using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using TobyBlazor.Data;
-using TobyBlazor.Models;
 using TobyBlazor.Other;
 
 namespace TobyBlazor.Components
@@ -74,17 +71,11 @@ private async Task InitializePages(bool resetCurrentPage = false)
             }
 
             TogglePrevNextButtonsDisabled();
-
-            //Console.WriteLine("Total Videos = {0}", Videos.Count);
-            //Console.WriteLine("Total Pages = {0}", Pages.Count);
-            //Console.WriteLine("Total Page Indicies = {0}", PageIndices.Count);
-            //Console.WriteLine("Total Link Pages = {0}", Pages.Count / ChunkSize);
-            //Console.WriteLine("Total Links Left Over = {0}", Pages.Count % ChunkSize);
         }
 
         private void TogglePrevNextButtonsDisabled()
         {
-            PreviousButtonDisabled = CurrentPageLinkPage != 1 ? false : true;
+            PreviousButtonDisabled = CurrentPageLinkPage == 1;
             NextButtonDisabled = CurrentPageLinkPage >= PageIndices.Count;
         }
 

diff --git a/server/Components/VideoPopup.razor.cs b/server/Components/VideoPopup.razor.cs
@@ -51,7 +51,7 @@ public async Task<bool> IsAddedToFavorites(Video video)
             return true;
         }
 
-        public async void OnModalCloseClicked()
+        public async Task OnModalCloseClicked()
         {
             await JSRuntime.InvokeVoidAsync("closeModal", "ytModal");
             await OnPopupClosed.InvokeAsync(EventCallback.Empty);

diff --git a/server/Data/VideoRepository.cs b/server/Data/VideoRepository.cs
@@ -214,13 +214,10 @@ public async Task UpdateVideoGroupAsync(string ytid, string group)
         {
             var foundVideo = await db.Videos.Where(x => x.YTId == ytid && x.Group != "Recently Played").FirstOrDefaultAsync();
 
-            if (foundVideo != null)
+            if (foundVideo != null && !string.IsNullOrEmpty(group))
             {
-                if (!String.IsNullOrEmpty(group))
-                {
-                    foundVideo.Group = group;
-                    await db.SaveChangesAsync();
-                }
+                foundVideo.Group = group;
+                await db.SaveChangesAsync();
             }
         }
         #endregion
@@ -306,7 +303,7 @@ public async Task SetCurrentVideoPage(bool recentlyPlayed, int page, int linkPag
             }
             else
             {
-                if (recentlyPlayed) 
+                if (recentlyPlayed)
                 {
                     preferences.CurrentRecentlyPlayedVideoPage = page;
                 }

diff --git a/server/Program.cs b/server/Program.cs
@@ -3,7 +3,7 @@
 
 namespace TobyBlazor
 {
-    public class Program
+    public static class Program
     {
         public static void Main(string[] args)
         {

diff --git a/server/videos.db b/server/videos.db