put back bugs

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 * Bug with sorting in list view
 * [Issue 666](https://github.com/SteamGridDB/steam-rom-manager/issues/666)
+* Two bugs with exception putback ability
 
 ## 2.5.4
 ### Added

src/models/preview.model.ts

@@ -77,6 +77,7 @@ export interface PreviewDataApp {
     onlineProviders: OnlineProviderType[],
     startInDirectory: string,
     executableLocation: string,
+    filePath: string,
     title: string,
     extractedTitle: string,
     argumentString: string,

src/renderer/components/preview.component.ts

@@ -463,8 +463,6 @@ export class PreviewComponent implements OnDestroy {
         this.refreshImages(this.previewData[steamDirectory][userId].apps[appId]);
       }
       this.closeDetails();
-    } else {
-      console.log("Details app", this.detailsApp,this.matchFix )
     }
   }
 
@@ -585,6 +583,7 @@ export class PreviewComponent implements OnDestroy {
     const putBackKeys = Object.keys(this.excludePutBacks).filter(putBackKey=>this.excludePutBacks[putBackKey]);
     for(const putBackKey of putBackKeys) {
       this.userExceptionsService.putBack(putBackKey);
+      delete this.excludePutBacks[putBackKey];
     }
     this.cancelExcludes();
     this.generatePreviewData();
@@ -656,6 +655,13 @@ export class PreviewComponent implements OnDestroy {
     return Object.keys(apps).sort((a,b)=>(apps[a][this.listSortBy as keyof PreviewDataApp] as string).localeCompare(apps[b][this.listSortBy as keyof PreviewDataApp] as string))
   }
 
+  niceAppTitle(app: PreviewDataApp) {
+    if(superTypesMap[app.parserType] == 'ArtworkOnly') {
+      return app.title
+    }
+    return `${app.title} (${app.filePath})`
+  }
+
   async exportSelection() {
     await this.previewService.exportSelection();
   }

src/renderer/services/preview.service.ts

@@ -564,7 +564,7 @@ export class PreviewService {
           if (previewData[config.steamDirectory][userAccount.accountID] === undefined) {
             previewData[config.steamDirectory][userAccount.accountID] = {
               username: userAccount.name,
-              excluded: config.excluded,
+              excluded: data.map(x=>x.excluded).reduce((x,y)=>x.concat(y),[]),
               apps: {}
             };
           }
@@ -668,6 +668,7 @@ export class PreviewService {
                 onlineProviders: config.imageProviders,
                 drmProtect: config.drmProtect,
                 argumentString: file.argumentString,
+                filePath: file.filePath,
                 title: file.finalTitle,
                 extractedTitle: file.extractedTitle,
                 steamInputEnabled: config.steamInputEnabled,

src/renderer/styles/preview.component.scss

@@ -119,7 +119,10 @@
         @include button();
         @include clickButtonColor(click-button);
     }
-
+    .title {
+      margin-left: 1em;
+      color: var(--color-preview-text); 
+    }
     .imageCounter {
       color: var(--color-preview-text);
 

src/renderer/templates/preview.component.html

@@ -23,6 +23,15 @@ <h1>Add your games to Steam</h1>
   </div>
   <div class="upperMenu" *ngIf="previewVariables.numberOfListItems > 0">
     <div class="filtersButton" (click)="toggleFilters()">Filters</div>
+    <div class="title" *ngIf="showDetails">
+      <span>Fix Match</span>
+    </div>
+    <div class="title" *ngIf="showExcludes">
+      <span>Manage Excludes</span>
+    </div>
+    <div class="title" *ngIf="showListImages">
+      <span>Select Artwork</span>
+    </div>
     <div class="slider">
       <input
         type="range"
@@ -94,7 +103,7 @@ <h1>Add your games to Steam</h1>
   </div>
   <div class="upper detailsUpper" *ngIf="showDetails">
     <div class="upperTitle">
-      <span>Fix match for: {{ detailsApp ? detailsApp.app.title : "" }}</span>
+      <span>{{ detailsApp ? niceAppTitle(detailsApp.app) : "" }}</span>
     </div>
     <div class="buttonGroup">
       <div class="upperButton dangerousButton" (click)="closeDetails()">
@@ -107,7 +116,7 @@ <h1>Add your games to Steam</h1>
   </div>
   <div class="upper listImagesUpper" *ngIf="getCurrentViewType()=='list' && currentApp && showListImages">
     <div class="upperTitle">
-      <span>Choose artwork for {{currentApp.app.title}}</span>
+      <span>{{currentApp ? niceAppTitle(currentApp.app) : ""}}</span>
     </div>
     <div class="buttonGroup">
       <div class="upperButton dangerousButton" (click)="closeListImages()">