1.1.3 update

FrogTheFrog · FrogTheFrog · commit 62c8b532355d · 2017-05-01T23:46:16.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 1.1.3 - 2017-05-01
+### Added
+* Greedy search option which will search for images using both `${title}` and `${fuzzyTitle}`
+
+### Changed
+* Added a temporary fix, which should prevent `shortcuts.vdf` corruption
+
 ## 1.1.2 - 2017-05-01
 ### Added
 * Additional one time backups will be made with extension `.firstbackup`
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "steam-rom-manager",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "license": "GPL-3.0",
   "description": "An app for managing ROMs in Steam",
   "author": {
@@ -68,7 +68,7 @@
     "ngx-color-picker": "^4.0.0",
     "reflect-metadata": "^0.1.10",
     "rxjs": "^5.3.0",
-    "steam-shortcut-editor": "^2.1.0",
+    "steam-shortcut-editor": "git+https://github.com/FrogTheFrog/steam-shortcut-editor.git",
     "to-css": "^1.2.1",
     "vdf": "0.0.2",
     "zone.js": "^0.8.5"
@@ -102,4 +102,4 @@
     "webpack": "^2.4.1",
     "webpack-merge": "^4.1.0"
   }
-}
+}
diff --git a/src/renderer/lib/fuzzy-matcher.ts b/src/renderer/lib/fuzzy-matcher.ts
@@ -22,7 +22,7 @@ export class FuzzyMatcher {
             this.list = list;
             let currentTime = new Date().getTime();
             if (currentTime - this.fuzzyListTimestamps.download > this.forcedUpdate || this.list.length === 0) {
-                this.loggerService.info('Title list download for fuzzy matching started.');
+                this.loggerService.info('Title list for fuzzy matching will be downloaded.');
                 return this.downloadList().then((list) => {
                     this.list = list;
                     this.fuzzyListTimestamps.download = currentTime;
@@ -35,7 +35,7 @@ export class FuzzyMatcher {
                 this.loggerService.info('Checking if title list is up to date.');
                 return this.getTotalCount().then((countInDatabase) => {
                     if (this.list.length !== countInDatabase) {
-                        this.loggerService.info('List is outdated. Title list download for fuzzy matching started.');
+                        this.loggerService.info('List is outdated. Title list for fuzzy matching will be downloaded.');
                         return this.downloadList().then((list) => {
                             this.list = list;
                             this.fuzzyListTimestamps.download = currentTime;
diff --git a/src/renderer/lib/vdfList.ts b/src/renderer/lib/vdfList.ts
@@ -341,38 +341,46 @@ export class VDFList {
 
         promises.push(new Promise((resolve, reject) => {
             fs.readFile(this.listData[steamDirectory][userId].shortcuts.filename, 'utf8', (err, data) => {
-                if (err && err.code !== 'ENOENT')
-                    reject(err);
-                else {
-                    if (data)
-                        this.listData[steamDirectory][userId].shortcuts.data = shortcutsParser.parse(data);
-                    else
-                        this.listData[steamDirectory][userId].shortcuts.data = {};
+                try {
+                    if (err && err.code !== 'ENOENT')
+                        reject(err);
+                    else {
+                        if (data)
+                            this.listData[steamDirectory][userId].shortcuts.data = shortcutsParser.parse(data);
+                        else
+                            this.listData[steamDirectory][userId].shortcuts.data = {};
 
-                    if (this.listData[steamDirectory][userId].shortcuts.data['shortcuts'] === undefined)
-                        this.listData[steamDirectory][userId].shortcuts.data['shortcuts'] = [];
+                        if (this.listData[steamDirectory][userId].shortcuts.data['shortcuts'] === undefined)
+                            this.listData[steamDirectory][userId].shortcuts.data['shortcuts'] = [];
 
-                    resolve();
+                        resolve();
+                    }
+                } catch (error) {
+                    reject(error);
                 }
             });
         }));
         promises.push(new Promise((resolve, reject) => {
             fs.readFile(this.listData[steamDirectory][userId].screenshots.filename, 'utf8', (err, data) => {
-                if (err && err.code !== 'ENOENT')
-                    reject(err);
-                else {
-                    if (data)
-                        this.listData[steamDirectory][userId].screenshots.data = screenshotsParser.parse(data);
-                    else
-                        this.listData[steamDirectory][userId].screenshots.data = {};
+                try {
+                    if (err && err.code !== 'ENOENT')
+                        reject(err);
+                    else {
+                        if (data)
+                            this.listData[steamDirectory][userId].screenshots.data = screenshotsParser.parse(data);
+                        else
+                            this.listData[steamDirectory][userId].screenshots.data = {};
 
-                    if (this.listData[steamDirectory][userId].screenshots.data['Screenshots'] === undefined) {
-                        this.listData[steamDirectory][userId].screenshots.data['Screenshots'] = { 'shortcutnames': {} };
-                    }
-                    else if (this.listData[steamDirectory][userId].screenshots.data['Screenshots']['shortcutnames'] === undefined) {
-                        this.listData[steamDirectory][userId].screenshots.data['Screenshots']['shortcutnames'] = {};
+                        if (this.listData[steamDirectory][userId].screenshots.data['Screenshots'] === undefined) {
+                            this.listData[steamDirectory][userId].screenshots.data['Screenshots'] = { 'shortcutnames': {} };
+                        }
+                        else if (this.listData[steamDirectory][userId].screenshots.data['Screenshots']['shortcutnames'] === undefined) {
+                            this.listData[steamDirectory][userId].screenshots.data['Screenshots']['shortcutnames'] = {};
+                        }
+                        resolve();
                     }
-                    resolve();
+                } catch (error) {
+                    reject(error);
                 }
             });
         }));
diff --git a/src/renderer/models/preview.model.ts b/src/renderer/models/preview.model.ts
@@ -13,6 +13,7 @@ export interface ImageContent {
 
 export interface ImagesStatusAndContent {
     status: Urltatus,
+    searchTitles: string[],
     content: ImageContent[]
 }
 
@@ -43,5 +44,6 @@ export interface PreviewStateVariables {
     listIsUpdating: boolean,
     listIsBeingSaved: boolean,
     skipDownloading: boolean,
+    greedySearch: boolean,
     numberOfListItems: number
 }
diff --git a/src/renderer/services/preview.service.ts b/src/renderer/services/preview.service.ts
@@ -3,7 +3,7 @@ import { Http } from '@angular/http';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { ParsersService } from './parsers.service';
 import { LoggerService } from './logger.service';
-import { PreviewData, ImageContent, ParsedUserConfiguration, Images, PreviewStateVariables, LoadStatus, PreferedImages, ImagesStatusAndContent } from '../models';
+import { PreviewData, ImageContent, ParsedUserConfiguration, Images, PreviewStateVariables, LoadStatus, PreferedImages, ImagesStatusAndContent, ImageProviderData } from '../models';
 import { VDFList, Reference, ImageProvider } from "../lib";
 import { union } from "lodash";
 import * as fs from 'fs-extra';
@@ -26,6 +26,7 @@ export class PreviewService {
             listIsBeingSaved: false,
             listIsUpdating: false,
             skipDownloading: false,
+            greedySearch: false,
             numberOfListItems: 0
         };
         this.previewDataChanged = new Subject<boolean>();
@@ -51,8 +52,6 @@ export class PreviewService {
         else if (this.stateVariables.listIsBeingSaved)
             return this.loggerService.info('Files are being saved. Please wait.', { invokeAlert: true, alertTimeout: 3000 });
 
-        this.loggerService.info('Please shutdown Steam if it is running when saving, otherwise it might not save correctly.', { invokeAlert: true, alertTimeout: 10000 });
-
         this.stateVariables.listIsUpdating = true;
         this.imageProvider.stopUrlDownload();
         this.generatePreviewDataCallback();
@@ -183,15 +182,14 @@ export class PreviewService {
         }
         else {
             this.previewData.next(undefined);
+            this.loggerService.info('Executing parsers.', { invokeAlert: true });
             this.parsersService.executeFileParser().then((data) => {
                 if (data.parsedData.length > 0) {
-                    let titles = this.getAllTitles(data.parsedData);
+                    this.loggerService.info('Please shutdown Steam if it is running when saving, otherwise it might not save correctly.', { invokeAlert: true, alertTimeout: 5000 });
+
                     this.steamDirectories = this.getAllSteamDirectories(data.parsedData);
                     this.images = {};
 
-                    for (let i = 0; i < titles.length; i++)
-                        this.images[titles[i]] = { status: this.stateVariables.skipDownloading ? 'retrieved' : 'none', content: [] };
-
                     let previewData: { numberOfItems: number, data: PreviewData } = this.createPreviewData(data.parsedData);
 
                     if (previewData.numberOfItems > 0) {
@@ -239,17 +237,6 @@ export class PreviewService {
         }
     }
 
-    private getAllTitles(data: ParsedUserConfiguration[]) {
-        let title: string[] = [];
-        for (let i = 0; i < data.length; i++) {
-            for (let j = 0; j < data[i].files.length; j++) {
-                if (title.indexOf(data[i].files[j].fuzzyTitle) === -1)
-                    title.push(data[i].files[j].fuzzyTitle);
-            }
-        }
-        return title;
-    }
-
     private getAllSteamDirectories(data: ParsedUserConfiguration[]) {
         let title: string[] = [];
         for (let i = 0; i < data.length; i++) {
@@ -291,6 +278,14 @@ export class PreviewService {
                     }
                 }
 
+                if (this.images[data[i].files[j].fuzzyTitle] === undefined)
+                    this.images[data[i].files[j].fuzzyTitle] = { status: this.stateVariables.skipDownloading ? 'retrieved' : 'none', searchTitles: [data[i].files[j].fuzzyTitle], content: [] };
+
+                if (this.stateVariables.greedySearch) {
+                    if (this.images[data[i].files[j].fuzzyTitle].searchTitles.indexOf(data[i].files[j].extractedTitle) === -1)
+                        this.images[data[i].files[j].fuzzyTitle].searchTitles.push(data[i].files[j].extractedTitle);
+                }
+
                 if (data[i].files[j].localImages.length) {
                     for (let k = 0; k < data[i].files[j].localImages.length; k++) {
                         this.addUniqueImage(data[i].files[j].fuzzyTitle, { imageProvider: 'LocalStorage', imageUrl: data[i].files[j].localImages[k], loadStatus: 'downloaded' })
@@ -315,27 +310,45 @@ export class PreviewService {
             let promises: Promise<any>[] = [];
             for (let fuzzyTitle in this.images) {
                 this.images[fuzzyTitle].status = 'retrieving';
-                promises.push(this.imageProvider.retrieveUrls(fuzzyTitle, ...imageProviders).then((data) => {
+                promises.push(new Promise((resolve, reject) => {
+                    let searchPromises: Promise<ImageProviderData>[] = [];
+                    for (let i = 0; i < this.images[fuzzyTitle].searchTitles.length; i++) {
+                        searchPromises.push(this.imageProvider.retrieveUrls(this.images[fuzzyTitle].searchTitles[i], ...imageProviders)/*.then((data) => {
+                            return Promise.resolve(data);
+                        })*/);
+                    }
+                    Promise.all(searchPromises).then((dataArray) => {
+                        let data: ImageProviderData = { failed: [], images: [] };
 
-                    if (data.failed.length) {
-                        this.loggerService.error(`Failed to retrieve some image urls for "${fuzzyTitle}"`, { invokeAlert: true, alertTimeout: 3000 });
-                        for (let i = 0; i < data.failed.length; i++) {
-                            this.loggerService.error(data.failed[i]);
+                        for (let j = 0; j < dataArray.length; j++) {
+                            data.failed = data.failed.concat(dataArray[j].failed);
+                            data.images = data.images.concat(dataArray[j].images);
+                        }
+
+                        if (data.failed.length) {
+                            this.loggerService.error(`Failed to retrieve some image urls for "${fuzzyTitle}"`, { invokeAlert: true, alertTimeout: 3000 });
+                            for (let i = 0; i < data.failed.length; i++) {
+                                this.loggerService.error(data.failed[i]);
+                            }
                         }
-                    }
 
-                    this.addUniqueImage(fuzzyTitle, ...data.images);
+                        this.addUniqueImage(fuzzyTitle, ...data.images);
 
-                    if (this.preferedImages !== undefined) {
-                        for (let title in this.preferedImages) {
-                            let index = this.images[fuzzyTitle].content.findIndex((image) => this.preferedImages[title] === image.imageUrl);
-                            if (index !== -1 && previewData[title] !== undefined)
-                                previewData[title].currentImageIndex = index;
+                        if (this.preferedImages !== undefined) {
+                            for (let title in this.preferedImages) {
+                                let index = this.images[fuzzyTitle].content.findIndex((image) => this.preferedImages[title] === image.imageUrl);
+                                if (index !== -1 && previewData[title] !== undefined)
+                                    previewData[title].currentImageIndex = index;
+                            }
                         }
-                    }
 
-                    this.images[fuzzyTitle].status = 'retrieved';
-                    this.previewDataChanged.next();
+                        this.images[fuzzyTitle].status = 'retrieved';
+                        this.previewDataChanged.next();
+
+                        resolve();
+                    }).catch((error) => {
+                        reject(error);
+                    });
                 }));
             }
             Promise.all(promises).then(() => {
diff --git a/src/renderer/styles/global.themes.scss b/src/renderer/styles/global.themes.scss
@@ -271,6 +271,30 @@
     --color-preview-generate-button-text: #a0a0a0;
     --color-preview-generate-button-text-active: #f0fff0;
     --color-preview-generate-button-text-hover: #f0fff0;
+    /*--color-hacks-background: #121212;
+    --color-hacks-border: #040404;
+    --color-hacks-menu-background: #0c0c0c;
+    --color-hacks-add-button-background: rgba(0,0,0,0);
+    --color-hacks-add-button-background-active: #179443;
+    --color-hacks-add-button-background-hover: #1bd85e;
+    --color-hacks-add-button-border: #1db954;
+    --color-hacks-add-button-border-active: #179443;
+    --color-hacks-add-button-border-hover: #1bd85e;
+    --color-hacks-add-button-text: #a0a0a0;
+    --color-hacks-add-button-text-active: #f0fff0;
+    --color-hacks-add-button-text-hover: #f0fff0;*/
+    --color-preview-greedy-button-background: rgba(0,0,0,0);
+    --color-preview-greedy-button-background-active: #137c38;
+    --color-preview-greedy-button-background-active-hover: #16ac4b;
+    --color-preview-greedy-button-background-hover: #2f2f2f;
+    --color-preview-greedy-button-border: #1db954;
+    --color-preview-greedy-button-border-active: #137c38;
+    --color-preview-greedy-button-border-active-hover: #16ac4b;
+    --color-preview-greedy-button-border-hover: #1bd85e;
+    --color-preview-greedy-button-text: #a0a0a0;
+    --color-preview-greedy-button-text-active: #f0fff0;
+    --color-preview-greedy-button-text-active-hover: #f0fff0;
+    --color-preview-greedy-button-text-hover: #f0fff0;
     --color-preview-image-arrow-background-active: rgba(0,0,0,0);
     --color-preview-image-arrow-background-hover: rgba(0,0,0,0);
     --color-preview-image-arrow-color-active: #fff;
@@ -434,17 +458,4 @@
     --color-titlebar-minimize-text-active: #a0a0a0;
     --color-titlebar-minimize-text-hover: #a0a0a0;
     --color-titlebar-title: #a0a0a0;
-
-    /*--color-hacks-background: #121212;
-    --color-hacks-border: #040404;
-    --color-hacks-menu-background: #0c0c0c;
-    --color-hacks-add-button-background: rgba(0,0,0,0);
-    --color-hacks-add-button-background-active: #179443;
-    --color-hacks-add-button-background-hover: #1bd85e;
-    --color-hacks-add-button-border: #1db954;
-    --color-hacks-add-button-border-active: #179443;
-    --color-hacks-add-button-border-hover: #1bd85e;
-    --color-hacks-add-button-text: #a0a0a0;
-    --color-hacks-add-button-text-active: #f0fff0;
-    --color-hacks-add-button-text-hover: #f0fff0;*/
 }
diff --git a/src/renderer/styles/preview.component.scss b/src/renderer/styles/preview.component.scss
@@ -52,6 +52,10 @@ $item-radio: 430/920;
         .offline {
             @include toggle-button-color(preview-offline-button);
         }
+
+        .greedy {
+            @include toggle-button-color(preview-greedy-button);
+        }
     }
     >.items {
         display: flex;
diff --git a/src/renderer/templates/preview.component.html b/src/renderer/templates/preview.component.html
@@ -62,6 +62,7 @@
     <div>
         <div class="generate clickButton" (click)="generatePreviewData()">Generate list</div>
         <div class="offline clickButton" [class.active]="!stateVariables.skipDownloading" (click)="stateVariables.skipDownloading = !stateVariables.skipDownloading">{{stateVariables.skipDownloading ? 'Offline' : 'Online'}} mode</div>
+        <div class="greedy clickButton" [class.active]="stateVariables.greedySearch" (click)="stateVariables.greedySearch = !stateVariables.greedySearch">{{stateVariables.greedySearch ? 'Greedy search' : 'Normal search'}}</div>
         <div *ngIf="stateVariables.numberOfListItems > 0" class="save clickButton" (click)="saveData()">Save list</div>
     </div>
 </div>

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ export interface ImageContent {`
`13`	`13`
`14`	`14`	`export interface ImagesStatusAndContent {`
`15`	`15`	`status: Urltatus,`
	`16`	`+ searchTitles: string[],`
`16`	`17`	`content: ImageContent[]`
`17`	`18`	`}`
`18`	`19`
`@@ -43,5 +44,6 @@ export interface PreviewStateVariables {`
`43`	`44`	`listIsUpdating: boolean,`
`44`	`45`	`listIsBeingSaved: boolean,`
`45`	`46`	`skipDownloading: boolean,`
	`47`	`+ greedySearch: boolean,`
`46`	`48`	`numberOfListItems: number`
`47`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ $item-radio: 430/920;`
`52`	`52`	`.offline {`
`53`	`53`	`@include toggle-button-color(preview-offline-button);`
`54`	`54`	`}`
	`55`	`+`
	`56`	`+ .greedy {`
	`57`	`+ @include toggle-button-color(preview-greedy-button);`
	`58`	`+ }`
`55`	`59`	`}`
`56`	`60`	`>.items {`
`57`	`61`	`display: flex;`