move more secrets to github,

fix crash when unable to find id
insomniachi · Feb 10, 2024 · 1f803fd · 1f803fd
1 parent 5823ea8
commit 1f803fd
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 40 deletions.
diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml
@@ -48,6 +48,8 @@ jobs:
                 ClientId: ${{ secrets.MAL_CLIENT_ID }}
                 ClientIdAniList: ${{ secrets.ANILIST_CLIENT_ID }}
                 ClientIdSimkl: ${{ secrets.SIMKL_CLIENT_ID }}
+                SimklSecret: ${{ secrets.SIMKL_SECRET }}
+                ClientIdDiscord: ${{ secrets.DISCORD_CLIENT_ID }}
 
         -   name: 'Build Installer'
             run: msbuild ${{ env.INSTALLER_PATH }} /property:Configuration=Release /property:BuildVersion=${{ steps.version.outputs.version-without-v }} /property:BasePath=${{ env.PUBLISH_FOLDER }}

diff --git a/Totoro.Core/Services/AniList/AniListService.cs b/Totoro.Core/Services/AniList/AniListService.cs
@@ -115,7 +115,7 @@ public async Task<string> GetBannerImage(long id)
     {
         var animeId = await _animeIdService.GetId(_settings.DefaultListService, ListServiceType.AniList, id);
 
-        if (animeId is { AniList: null })
+        if (animeId is { AniList: null } or null)
         {
             return string.Empty;
         }
@@ -133,15 +133,15 @@ public async Task<string> GetBannerImage(long id)
     {
         var animeId = await _animeIdService.GetId(_settings.DefaultListService, ListServiceType.AniList, id);
 
-        if (animeId is { AniList: null } )
+        if (animeId is { AniList: null } or null)
         {
             return (null, null);
         }
 
         var response = await _anilistClient.SendQueryAsync<Query>(new GraphQL.GraphQLRequest
         {
             Query = new QueryQueryBuilder().WithMedia(new MediaQueryBuilder()
-                .WithNextAiringEpisode(new AiringScheduleQueryBuilder()
+                    .WithNextAiringEpisode(new AiringScheduleQueryBuilder()
                     .WithEpisode()
                     .WithTimeUntilAiring()), id: (int)animeId.AniList).Build()
         });

diff --git a/Totoro.Core/Services/DiscordRichPresense.cs b/Totoro.Core/Services/DiscordRichPresense.cs
@@ -1,11 +1,12 @@
 
 using DiscordRPC;
+using Microsoft.Extensions.Configuration;
 
 namespace Totoro.Core.Services;
 
-public class DiscordRichPresense : IDiscordRichPresense
+public class DiscordRichPresense(IConfiguration configuration) : IDiscordRichPresense
 {
-    private readonly DiscordRpcClient _client = new("997177919052984622");
+    private readonly DiscordRpcClient _client = new(configuration["ClientIdDiscord"]);
 
     public void Initialize() => _client.Initialize();
     public bool IsInitialized => _client.IsInitialized;

diff --git a/Totoro.Core/Services/FileService.cs b/Totoro.Core/Services/FileService.cs
@@ -7,7 +7,8 @@ public class FileService : IFileService
 {
     private readonly JsonSerializerSettings _settings = new()
     {
-        DefaultValueHandling = DefaultValueHandling.Ignore
+        DefaultValueHandling = DefaultValueHandling.Ignore,
+        NullValueHandling = NullValueHandling.Ignore,
     };
 
     public T Read<T>(string folderPath, string fileName)

diff --git a/Totoro.Core/Services/OfflineAnimeIdService.cs b/Totoro.Core/Services/OfflineAnimeIdService.cs
@@ -78,32 +78,34 @@ public async Task UpdateOfflineMappings()
             var id = new AnimeIdExtended();
             var obj = item.AsObject();
 
-            foreach (var key in keys)
+            foreach (var key in keys.Where(obj.ContainsKey))
             {
-                if (obj.ContainsKey(key))
+                var value = obj[key].GetValue<long>();
+                switch (key)
                 {
-                    var value = obj[key].GetValue<long>();
-                    switch (key)
-                    {
-                        case "livechart_id":
-                            id.LiveChart = value;
-                            break;
-                        case "anidb_id":
-                            id.AniDb = value;
-                            break;
-                        case "kitsu_id":
-                            id.Kitsu = value;
-                            break;
-                        case "mal_id":
-                            id.MyAnimeList = value;
-                            break;
-                        case "anilist_id":
-                            id.AniList = value;
-                            break;
-                    }
+                    case "livechart_id":
+                        id.LiveChart = value;
+                        break;
+                    case "anidb_id":
+                        id.AniDb = value;
+                        break;
+                    case "kitsu_id":
+                        id.Kitsu = value;
+                        break;
+                    case "mal_id":
+                        id.MyAnimeList = value;
+                        break;
+                    case "anilist_id":
+                        id.AniList = value;
+                        break;
                 }
             }
 
+            if (id.IsEmpty())
+            {
+                continue;
+            }
+
             _ids.Add(id);
         }
         _idsMap = GetMapping(settings.DefaultListService);

diff --git a/Totoro.Core/Services/Simkl/SimklAnimeService.cs b/Totoro.Core/Services/Simkl/SimklAnimeService.cs
@@ -78,4 +78,6 @@ public bool HasId(ListServiceType type)
             _ => false
         };
     }
+
+    public bool IsEmpty() => this is { AniDb: null, AniList: null, MyAnimeList: null, Kitsu: null, LiveChart: null, Simkl: null };  
 }
diff --git a/Totoro.WinUI/Views/SettingsSections/AnimePluginsSection.xaml b/Totoro.WinUI/Views/SettingsSections/AnimePluginsSection.xaml
@@ -75,16 +75,6 @@
                 OnContent="On" />
         </labs:SettingsCard>
 
-        <labs:SettingsCard
-            Description="This repository is to store and provide the mapping between various anime sources, (https://github.com/Fribb/anime-lists)"
-            Header="Offline Anime DB"
-            HeaderIcon="{ui:FontIcon Glyph=&#xE78C;}">
-            <Button
-                Command="{x:Bind UpdateOfflineDb}"
-                Content="Update"
-                Style="{ThemeResource AccentButtonStyle}" />
-        </labs:SettingsCard>
-
         <Grid Margin="0,20,0,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />

diff --git a/Totoro.WinUI/Views/SettingsSections/AnimePluginsSection.xaml.cs b/Totoro.WinUI/Views/SettingsSections/AnimePluginsSection.xaml.cs
@@ -22,14 +22,12 @@ public SettingsViewModel ViewModel
         DependencyProperty.Register("ViewModel", typeof(SettingsViewModel), typeof(AnimePluginsSection), new PropertyMetadata(null));
 
 
-    public ICommand UpdateOfflineDb { get; }
     public ICommand ResetProvider { get; }
 
     public AnimePluginsSection()
     {
         InitializeComponent();
 
-        UpdateOfflineDb = ReactiveCommand.CreateFromTask(() => App.GetService<IOfflineAnimeIdService>().UpdateOfflineMappings());
         ResetProvider = ReactiveCommand.Create<string>(provider => App.GetService<IPluginOptionsStorage<AnimeProvider>>().ResetConfig(provider));
     }
 

diff --git a/Totoro.WinUI/Views/SettingsSections/TrackingSection.xaml b/Totoro.WinUI/Views/SettingsSections/TrackingSection.xaml
@@ -116,5 +116,15 @@
                 Value="{x:Bind ViewModel.Settings.TimeRemainingWhenEpisodeCompletesInSeconds, Mode=TwoWay}" />
         </labs:SettingsCard>
 
+        <labs:SettingsCard
+            Description="This repository is to store and provide the mapping between various anime sources, (https://github.com/Fribb/anime-lists)"
+            Header="Offline Anime DB"
+            HeaderIcon="{ui:FontIcon Glyph=&#xE78C;}">
+            <Button
+                Command="{x:Bind UpdateOfflineDb}"
+                Content="Update"
+                Style="{ThemeResource AccentButtonStyle}" />
+        </labs:SettingsCard>
+
     </StackPanel>
 </Page>
diff --git a/Totoro.WinUI/Views/SettingsSections/TrackingSection.xaml.cs b/Totoro.WinUI/Views/SettingsSections/TrackingSection.xaml.cs
@@ -19,10 +19,12 @@ public SettingsViewModel ViewModel
     public static readonly DependencyProperty ViewModelProperty =
         DependencyProperty.Register("ViewModel", typeof(SettingsViewModel), typeof(TrackingSection), new PropertyMetadata(null));
 
+    public ICommand UpdateOfflineDb { get; }
 
     public TrackingSection()
     {
         InitializeComponent();
+        UpdateOfflineDb = ReactiveCommand.CreateFromTask(() => App.GetService<IOfflineAnimeIdService>().UpdateOfflineMappings());
     }
 
     protected override void OnNavigatedTo(NavigationEventArgs e)

diff --git a/Totoro.WinUI/appsettings.json b/Totoro.WinUI/appsettings.json
@@ -5,5 +5,7 @@
   },
   "ClientId": "",
   "ClientIdAniList": "",
-  "ClientIdSimkl": ""
+  "ClientIdSimkl": "",
+  "SimklSecret": "",
+  "ClientIdDiscord": ""
 }