Workshop - Added indicator for official workshop entries

Artemis-RGB · Jul 22, 2024 · a45d98c · a45d98c
1 parent b00f5ca
commit a45d98c
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 16 deletions.
diff --git a/src/Artemis.Storage/Entities/Workshop/EntryEntity.cs b/src/Artemis.Storage/Entities/Workshop/EntryEntity.cs
@@ -14,6 +14,7 @@ public class EntryEntity
     public int EntryType { get; set; }
 
     public string Author { get; set; } = string.Empty;
+    public bool IsOfficial { get; set; }
     public string Name { get; set; } = string.Empty;
     public string Summary { get; set; } = string.Empty;
     public long Downloads { get; set; }

diff --git a/...06131336_ExpandInstalledEntry.Designer.cs → ...s/20240722084220_AutoUpdating.Designer.cs b/...06131336_ExpandInstalledEntry.Designer.cs → ...s/20240722084220_AutoUpdating.Designer.cs
diff --git a/...ns/20240706131336_ExpandInstalledEntry.cs → ...Migrations/20240722084220_AutoUpdating.cs b/...ns/20240706131336_ExpandInstalledEntry.cs → ...Migrations/20240722084220_AutoUpdating.cs
@@ -6,7 +6,7 @@
 namespace Artemis.Storage.Migrations
 {
     /// <inheritdoc />
-    public partial class ExpandInstalledEntry : Migration
+    public partial class AutoUpdating : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -38,6 +38,13 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 nullable: false,
                 defaultValue: 0L);
 
+            migrationBuilder.AddColumn<bool>(
+                name: "IsOfficial",
+                table: "Entries",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+
             migrationBuilder.AddColumn<long>(
                 name: "LatestReleaseId",
                 table: "Entries",
@@ -50,7 +57,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 type: "TEXT",
                 nullable: false,
                 defaultValue: "");
-
+            
             // Enable auto-update on all entries that are not profiles
             migrationBuilder.Sql("UPDATE Entries SET AutoUpdate = 1 WHERE EntryType != 2");
 
@@ -87,6 +94,10 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 name: "Downloads",
                 table: "Entries");
 
+            migrationBuilder.DropColumn(
+                name: "IsOfficial",
+                table: "Entries");
+
             migrationBuilder.DropColumn(
                 name: "LatestReleaseId",
                 table: "Entries");

diff --git a/src/Artemis.Storage/Migrations/ArtemisDbContextModelSnapshot.cs b/src/Artemis.Storage/Migrations/ArtemisDbContextModelSnapshot.cs
@@ -261,6 +261,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTimeOffset>("InstalledAt")
                         .HasColumnType("TEXT");
 
+                    b.Property<bool>("IsOfficial")
+                        .HasColumnType("INTEGER");
+
                     b.Property<long?>("LatestReleaseId")
                         .HasColumnType("INTEGER");
 

diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabItemView.axaml b/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabItemView.axaml
@@ -39,7 +39,7 @@
                 <TextBlock Grid.Row="0" Margin="0 0 0 5" TextTrimming="CharacterEllipsis">
                     <Run Classes="h5" Text="{CompiledBinding Entry.Name, FallbackValue=Title}" />
                     <Run Classes="subtitle">by you</Run>
-                    <Run Classes="subtitle" Text="{CompiledBinding Emoji}" />
+                    <Run Text="{CompiledBinding Emoji}" />
                 </TextBlock>
                 <TextBlock Grid.Row="1"
                            Classes="subtitle"

diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabItemViewModel.cs b/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabItemViewModel.cs
@@ -11,7 +11,7 @@ namespace Artemis.UI.Screens.Workshop.Library.Tabs;
 
 public class SubmissionsTabItemViewModel : ViewModelBase
 {
-    private static readonly string[] Emojis = ["❤️", "🧡", "💛", "💚", "💙", "💜", "🤍", "💔", "❣️", "💕", "💞", "💓", "💗", "💖", "💘", "💝", "😍", "🥰"];
+    private static readonly string[] Emojis = ["❤️", "🧡", "💛", "💚", "💙", "💜", "💔", "❣️", "💕", "💞", "💓", "💗", "💖", "💘", "💝", "😍", "🥰"];
     private readonly IRouter _router;
 
     public SubmissionsTabItemViewModel(IGetSubmittedEntries_SubmittedEntries entry, IRouter router)

diff --git a/src/Artemis.UI/Services/Updating/WorkshopUpdateService.cs b/src/Artemis.UI/Services/Updating/WorkshopUpdateService.cs
@@ -4,7 +4,6 @@
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Services.Interfaces;
-using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Utilities;
 using Artemis.WebClient.Workshop;
 using Artemis.WebClient.Workshop.Handlers.InstallationHandlers;
@@ -19,13 +18,11 @@ public class WorkshopUpdateService : IWorkshopUpdateService
 {
     private readonly ILogger _logger;
     private readonly IWorkshopClient _client;
-    private readonly INotificationService _notificationService;
     private readonly IWorkshopService _workshopService;
     private readonly Lazy<IUpdateNotificationProvider> _updateNotificationProvider;
     private readonly PluginSetting<bool> _showNotifications;
 
-    public WorkshopUpdateService(ILogger logger, IWorkshopClient client, IWorkshopService workshopService, ISettingsService settingsService,
-        Lazy<IUpdateNotificationProvider> updateNotificationProvider)
+    public WorkshopUpdateService(ILogger logger, IWorkshopClient client, IWorkshopService workshopService, ISettingsService settingsService, Lazy<IUpdateNotificationProvider> updateNotificationProvider)
     {
         _logger = logger;
         _client = client;
@@ -69,15 +66,27 @@ public async Task<bool> AutoUpdateEntry(InstalledEntry entry)
 
         _logger.Information("Auto-updating entry {Entry} to version {Version}", entry, latestRelease.Version);
 
-        EntryInstallResult updateResult = await _workshopService.InstallEntry(entry, latestRelease, new Progress<StreamProgress>(), CancellationToken.None);
+        try
+        {
+            EntryInstallResult updateResult = await _workshopService.InstallEntry(entry, latestRelease, new Progress<StreamProgress>(), CancellationToken.None);
+
+            // This happens during installation too but not on our reference of the entry
+            if (updateResult.IsSuccess)
+                entry.ApplyRelease(latestRelease);
 
-        // This happens during installation too but not on our reference of the entry
-        if (updateResult.IsSuccess)
-            entry.ApplyRelease(latestRelease);
+            if (updateResult.IsSuccess)
+                _logger.Information("Auto-update successful for entry {Entry}", entry);
+            else
+                _logger.Warning("Auto-update failed for entry {Entry}: {Message}", entry, updateResult.Message);
 
-        _logger.Information("Auto-update result: {Result}", updateResult);
+            return updateResult.IsSuccess;
+        }
+        catch (Exception e)
+        {
+            _logger.Warning(e, "Auto-update failed for entry {Entry}", entry);
+        }
 
-        return updateResult.IsSuccess;
+        return false;
     }
 
     /// <inheritdoc />

diff --git a/src/Artemis.WebClient.Workshop/Models/InstalledEntry.cs b/src/Artemis.WebClient.Workshop/Models/InstalledEntry.cs
@@ -65,6 +65,7 @@ internal void Load()
     {
         Id = Entity.EntryId;
         Author = Entity.Author;
+        IsOfficial = Entity.IsOfficial;
         Name = Entity.Name;
         Summary = Entity.Summary;
         EntryType = (EntryType) Entity.EntryType;
@@ -87,6 +88,7 @@ internal void Save()
         Entity.EntryType = (int) EntryType;
 
         Entity.Author = Author;
+        Entity.IsOfficial = IsOfficial;
         Entity.Name = Name;
         Entity.Summary = Summary;
         Entity.Downloads = Downloads;