fixed bug in retrieving videos for subscription when name was not present

backend/subscriptions.js

@@ -69,7 +69,12 @@ async function getVideosForSub(sub) {
         const basePath = config_api.getConfigItem('ytdl_subscriptions_base_path');
         const useArchive = config_api.getConfigItem('ytdl_subscriptions_use_youtubedl_archive');
 
-        const appendedBasePath = basePath + (sub.isPlaylist ? 'playlists/%(playlist_title)s' : 'channels/%(uploader)s');
+        let appendedBasePath = null
+        if (sub.name) {
+            appendedBasePath = getAppendedBasePath(sub, basePath);
+        } else {
+            appendedBasePath = basePath + (sub.isPlaylist ? 'playlists/%(playlist_title)s' : 'channels/%(uploader)s');
+        }
 
         let downloadConfig = ['-o', appendedBasePath + '/%(title)s.mp4', '-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4', '-ciw', '--write-annotations', '--write-thumbnail', '--write-info-json', '--print-json'];
 

src/app/subscriptions/subscriptions.component.html

@@ -11,7 +11,8 @@
         <a class="a-list-item" matLine (click)="goToSubscription(sub)" href="javascript:void(0)">
             <strong *ngIf="sub.name">{{ sub.name }}</strong>
             <div *ngIf="!sub.name">
-                <ngx-content-loading [width]="200" [height]="20">
+                Name not available. Channel retrieval in progress.
+                <ngx-content-loading *ngIf="false" [width]="200" [height]="20">
                     <svg:g ngx-rect width="200" height="20" y="0" x="0" rx="4" ry="4"></svg:g>
                 </ngx-content-loading>
             </div>
@@ -32,7 +33,8 @@
         <a class="a-list-item" matLine (click)="goToSubscription(sub)" href="javascript:void(0)">
             <strong>{{ sub.name }}</strong>
             <div class="content-loading-div" *ngIf="!sub.name">
-                <ngx-content-loading [primaryColor]="postsService.theme.background_color" [secondaryColor]="postsService.theme.alternate_color" [width]="200" [height]="20">
+                Name not available. Playlist retrieval in progress.
+                <ngx-content-loading *ngIf="false" [primaryColor]="postsService.theme.background_color" [secondaryColor]="postsService.theme.alternate_color" [width]="200" [height]="20">
                     <svg:g ngx-rect width="200" height="20" y="0" x="0" rx="4" ry="4"></svg:g>
                 </ngx-content-loading>
             </div>
@@ -43,11 +45,11 @@
     </mat-list-item>
 </mat-nav-list>
 
-<div style="width: 80%; margin: 0 auto; padding-left: 15px;" *ngIf="!playlist_subscriptions && subscriptions">
+<div style="width: 80%; margin: 0 auto; padding-left: 15px;" *ngIf="playlist_subscriptions.length === 0 && subscriptions">
     <p>You have no playlist subscriptions.</p>
 </div>
 
-<div style="margin: 0 auto" *ngIf="subscriptions_loading">
+<div style="margin: 0 auto; width: 80%" *ngIf="subscriptions_loading">
     <mat-progress-bar mode="indeterminate"></mat-progress-bar>
 </div>
 

src/app/subscriptions/subscriptions.component.ts

@@ -26,7 +26,7 @@ export class SubscriptionsComponent implements OnInit {
 
   getSubscriptions() {
     this.subscriptions_loading = true;
-    this.subscriptions = [];
+    this.subscriptions = null;
     this.channel_subscriptions = [];
     this.playlist_subscriptions = [];
     this.postsService.getAllSubscriptions().subscribe(res => {
@@ -43,6 +43,10 @@ export class SubscriptionsComponent implements OnInit {
           this.channel_subscriptions.push(sub);
         }
       }
+    }, err => {
+      this.subscriptions_loading = false;
+      console.error('Failed to get subscriptions');
+      this.openSnackBar('ERROR: Failed to get subscriptions!', 'OK.');
     });
   }