Fix:RSS Feed cover, Update:Remove experimental scanner

advplyr · Jul 18, 2022 · 1812366 · 1812366
1 parent 2e6e4f9
commit 1812366
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/client/pages/config/index.vue b/client/pages/config/index.vue
@@ -157,16 +157,15 @@
             </ui-tooltip>
           </div>
 
-          <div class="flex items-center py-2">
+          <!-- <div class="flex items-center py-2">
             <ui-text-input type="number" v-model="newServerSettings.scannerMaxThreads" no-spinner :disabled="updatingServerSettings" :padding-x="1" text-center class="w-10" @change="updateScannerMaxThreads" />
             <ui-tooltip :text="tooltips.scannerMaxThreads">
               <p class="pl-4">
                 Max # of threads to use
                 <span class="material-icons icon-text text-sm">info_outlined</span>
               </p>
             </ui-tooltip>
-            <!-- <p class="pl-4 text-sm"></p> -->
-          </div>
+          </div> -->
 
           <div class="pt-4">
             <h2 class="font-semibold">Experimental Features</h2>
@@ -196,15 +195,15 @@
             </ui-tooltip>
           </div>
 
-          <div class="flex items-center py-2">
+          <!-- <div class="flex items-center py-2">
             <ui-toggle-switch v-model="newServerSettings.scannerUseSingleThreadedProber" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('scannerUseSingleThreadedProber', val)" />
             <ui-tooltip :text="tooltips.scannerUseSingleThreadedProber">
               <p class="pl-4">
                 Scanner use old single threaded audio prober
                 <span class="material-icons icon-text text-sm">info_outlined</span>
               </p>
             </ui-tooltip>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>

diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
@@ -68,9 +68,9 @@ class RssFeedManager {
       return
     }
 
-    const extname = Path.extname(feedData.coverPath).toLowerCase().slice(1)
+    const extname = Path.extname(feed.coverPath).toLowerCase().slice(1)
     res.type(`image/${extname}`)
-    var readStream = fs.createReadStream(feedData.coverPath)
+    var readStream = fs.createReadStream(feed.coverPath)
     readStream.pipe(res)
   }
 

diff --git a/server/objects/settings/ServerSettings.js b/server/objects/settings/ServerSettings.js
@@ -16,7 +16,7 @@ class ServerSettings {
     this.scannerPreferMatchedMetadata = false
     this.scannerDisableWatcher = false
     this.scannerPreferOverdriveMediaMarker = false
-    this.scannerUseSingleThreadedProber = false
+    this.scannerUseSingleThreadedProber = true
     this.scannerMaxThreads = 0 // 0 = defaults to CPUs * 2
 
     // Metadata - choose to store inside users library item folder
@@ -74,6 +74,9 @@ class ServerSettings {
     this.scannerDisableWatcher = !!settings.scannerDisableWatcher
     this.scannerPreferOverdriveMediaMarker = !!settings.scannerPreferOverdriveMediaMarker
     this.scannerUseSingleThreadedProber = !!settings.scannerUseSingleThreadedProber
+    if (settings.scannerUseSingleThreadedProber === undefined) { // Default to original scanner
+      this.scannerUseSingleThreadedProber = true
+    }
     this.scannerMaxThreads = isNullOrNaN(settings.scannerMaxThreads) ? 0 : Number(settings.scannerMaxThreads)
 
     this.storeCoverWithItem = !!settings.storeCoverWithItem