Merge branch 'release/v0.18'

.gitignore

@@ -5,3 +5,5 @@ promotion
 .working
 extension
 client/tags
+NYoutubeDL
+tags

client/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "pod-noms.web",
-    "version": "0.16.0",
+    "version": "0.17.0",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -309,6 +309,12 @@
                 }
             }
         },
+        "@types/applicationinsights-js": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/@types/applicationinsights-js/-/applicationinsights-js-1.0.5.tgz",
+            "integrity": "sha512-/obMaLeIWrL6FDYJC8v9VE2BrQJ2Y6iHgT/9UI6Xd30S/x0uDkJv/DGt1wMMJEmu+ShkR2KiR9L9OaJ1d91uoA==",
+            "dev": true
+        },
         "@types/jasmine": {
             "version": "2.8.6",
             "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.6.tgz",
@@ -568,6 +574,11 @@
                 "default-require-extensions": "1.0.0"
             }
         },
+        "applicationinsights-js": {
+            "version": "1.0.15",
+            "resolved": "https://registry.npmjs.org/applicationinsights-js/-/applicationinsights-js-1.0.15.tgz",
+            "integrity": "sha512-lxO7LOIkK38q3VE8covJMsGS3O04hPGgPaA8BmGyR3SYQhuIYX9qy14KMojqx239TlPR9YuPexVXTHdrGBATow=="
+        },
         "aproba": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",

client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pod-noms.web",
-    "version": "0.17.0",
+    "version": "0.18.0",
     "license": "MIT",
     "scripts": {
         "ng": "ng",
@@ -31,6 +31,7 @@
         "@qontu/ngx-inline-editor": "^0.2.0-alpha.12",
         "angular2-jwt": "^0.2.3",
         "angular2-moment": "^1.8.0",
+        "applicationinsights-js": "^1.0.15",
         "auth0": "^2.9.1",
         "auth0-lock": "^11.3.1",
         "bootstrap": "4.0.0",
@@ -54,6 +55,7 @@
         "@angular/cli": "1.6.8",
         "@angular/compiler-cli": "^5.2.6",
         "@angular/language-service": "^5.2.6",
+        "@types/applicationinsights-js": "^1.0.5",
         "@types/jasmine": "^2.8.6",
         "@types/node": "~9.4.6",
         "codelyzer": "^4.2.1",

client/src/app/app.component.ts

@@ -2,6 +2,7 @@ import { GlobalsService } from './services/globals.service';
 import { Component, HostBinding } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { AuthService } from 'app/services/auth.service';
+import { AppInsightsService } from 'app/services/app-insights.service';
 
 @Component({
     selector: 'app-root',
@@ -9,7 +10,7 @@ import { AuthService } from 'app/services/auth.service';
     styleUrls: ['./app.component.css']
 })
 export class AppComponent {
-    constructor(private _authService: AuthService) {
+    constructor(private _authService: AuthService, _appInsights: AppInsightsService) {
         _authService.handleAuthentication();
         _authService.scheduleRenewal();
     }

client/src/app/app.module.ts

@@ -49,6 +49,7 @@ import { ProfileComponent } from './components/profile/profile.component';
 import { AboutComponent } from './components/about/about.component';
 import { FooterComponent } from './components/footer/footer.component';
 import { JobsService } from 'app/services/jobs.service';
+import { AppInsightsService } from 'app/services/app-insights.service';
 
 export function authHttpServiceFactory(http: Http, options: RequestOptions) {
     return new AuthHttp(
@@ -123,6 +124,7 @@ export function authHttpServiceFactory(http: Http, options: RequestOptions) {
         PodcastService,
         ImageService,
         DebugService,
+        AppInsightsService,
         JobsService,
         GlobalsService
     ],

client/src/app/components/debug/debug.component.html

@@ -28,6 +28,10 @@
                     <div class="block-content">
                         <button class="btn btn-primary"
                                 (click)="processOrphans()">Process Orphans</button>
+                                <button class="btn btn-primary"
+                                (click)="processPlaylists()">Process Playlists</button>
+                                <button class="btn btn-primary"
+                                (click)="updateYouTubeDl()">Update Youtube Downloader</button>
                     </div>
                 </div>
             </div>

client/src/app/components/debug/debug.component.ts

@@ -1,14 +1,14 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from "rxjs/Observable";
-import { SignalRService } from 'app/services/signalr.service';
+import { SignalRService } from "app/services/signalr.service";
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from "@angular/core";
-import { DebugService } from 'app/services/debug.service';
+import { DebugService } from "app/services/debug.service";
-import { environment } from 'environments/environment';
+import { environment } from "environments/environment";
-import { JobsService } from 'app/services/jobs.service';
+import { JobsService } from "app/services/jobs.service";
 
 @Component({
-    selector: 'app-debug',
+    selector: "app-debug",
-    templateUrl: './debug.component.html',
+    templateUrl: "./debug.component.html",
-    styleUrls: ['./debug.component.css']
+    styleUrls: ["./debug.component.css"]
 })
 export class DebugComponent implements OnInit {
     realtimeMessage: string;
@@ -17,35 +17,59 @@ export class DebugComponent implements OnInit {
     debugInfo$: Observable<string>;
     apiHost = environment.API_HOST;
     signalrHost = environment.SIGNALR_HOST;
-    pingPong = '';
+    pingPong = "";
 
-    constructor(private _debugService: DebugService, private _jobsService: JobsService,
+    constructor(
-        private _signalrService: SignalRService) {}
+        private _debugService: DebugService,
+        private _jobsService: JobsService,
+        private _signalrService: SignalRService
+    ) {}
     ngOnInit() {
         this._signalrService
             .init(`${environment.SIGNALR_HOST}hubs/debug`)
             .then(() => {
-                this._signalrService.connection.on('Send', data => {
+                this._signalrService.connection.on("Send", data => {
-                    console.log('DebugService', 'signalr', data);
+                    console.log("DebugService", "signalr", data);
                     this.messagesReceived.push(data);
-                    this.realtimeMessage = '';
+                    this.realtimeMessage = "";
                 });
                 this.debugInfo$ = this._debugService.getDebugInfo();
             })
-            .catch(err => console.error('debug.component.ts', '_signalrService.init', err));
+            .catch(err =>
+                console.error("debug.component.ts", "_signalrService.init", err)
+            );
 
         this._debugService.ping().subscribe(r => (this.pingPong = r));
     }
 
     sendMessage() {
-        this._debugService.sendRealtime(this.realtimeMessage).subscribe(r => console.log(r));
+        this._debugService
+            .sendRealtime(this.realtimeMessage)
+            .subscribe(r => console.log(r));
     }
     doSomething() {
-        alert('doSomething was did');
+        alert("doSomething was did");
     }
 
-    processOrphans(){
+    processOrphans() {
-        this._jobsService.processOrphans()
+        this._jobsService
-            .subscribe(e => console.log('debug.component.ts', 'processOrphans', e));
+            .processOrphans()
+            .subscribe(e =>
+                console.log("debug.component.ts", "processOrphans", e)
+            );
+    }
+    processPlaylists() {
+        this._jobsService
+            .processPlaylists()
+            .subscribe(e =>
+                console.log("debug.component.ts", "processPlaylists", e)
+            );
+    }
+    updateYouTubeDl() {
+        this._jobsService
+            .updateYouTubeDl()
+            .subscribe(e =>
+                console.log("debug.component.ts", "updateYouTubeDl", e)
+            );
     }
 }

client/src/app/components/podcast/podcast-add-url-form/podcast-add-url-form.component.ts

@@ -8,6 +8,7 @@ import {
     ViewChild
 } from '@angular/core';
 import { PodcastService } from 'app/services/podcast.service';
+import { debounceTime } from 'rxjs/operator/debounceTime';
 
 @Component({
     selector: 'app-podcast-add-url-form',
@@ -41,7 +42,7 @@ export class PodcastAddUrlFormComponent implements AfterViewInit {
             this._service.addEntry(entry).subscribe(
                 e => {
                     if (e) {
-                        if (e.ProcessingStatus == 6) {
+                        if (e.processingStatus == 6) {
                             this.onUploadDeferred.emit(e);
                         } else {
                             this.onUrlAddComplete.emit(e);

client/src/app/components/podcast/podcast.component.html

@@ -1,89 +1,68 @@
-<div class="content"
+<div class="content" *ngIf="selectedPodcast$ | async; let podcast; else empty">
-    *ngIf="selectedPodcast$ | async; let podcast; else empty">
     <div class="block">
         <div class="block-header block-header-default">
             <h3 class="block-title">{{podcast.title}}</h3>
             <div class="block-options">
-                <div class="btn-group"
+                <div class="btn-group" role="group" aria-label="Podcast actions">
-                    role="group"
+                    <a [routerLink]="['/podcasts', podcast.slug, 'edit']" class="btn btn-secondary btn-outline">
-                    aria-label="Podcast actions">
+                        <i class="icon-pencil" aria-hidden="true"></i> Edit
-                    <a [routerLink]="['/podcasts', podcast.slug, 'edit']"
-                        class="btn btn-secondary btn-outline">
-                        <i class="icon-pencil"
-                            aria-hidden="true"></i> Edit
                     </a>
-                    <a (click)="podcastDeleteDialog.show()"
+                    <a (click)="podcastDeleteDialog.show()" class="btn btn-secondary btn-outline-danger">
-                        class="btn btn-secondary btn-outline-danger">
+                        <i class="icon-close" aria-hidden="true"></i> Delete
-                        <i class="icon-close"
-                            aria-hidden="true"></i> Delete
                     </a>
-                    <a class="btn btn-secondary"
+                    <a class="btn btn-secondary" (click)="startAddEntry()">
-                        (click)="startAddEntry()"><i class="icon-plus"></i> Add (from URL)</a>
+                        <i class="icon-plus"></i> Add (from URL)</a>
-                    <a class="btn btn-secondary"
+                    <a class="btn btn-secondary" (click)="startUpload()">
-                        (click)="startUpload()"><i class="icon-cloud-upload"></i> Upload (from computer)</a>
+                        <i class="icon-cloud-upload"></i> Upload (from computer)</a>
                 </div>
-                <div class="btn-group"
+                <div class="btn-group" role="group" aria-label="Podcast actions">
-                    role="group"
+                    <a class="btn btn-secondary btn-outline-warning" [href]="podcast.rssUrl" target="_blank">
-                    aria-label="Podcast actions">
-                    <a class="btn btn-secondary btn-outline-warning"
-                        [href]="podcast.rssUrl"
-                        target="_blank">
                         <i class="text-warning fa fa-rss"></i> Rss Url
                     </a>
-                    <button class="btn btn-secondary btn-outline-warning"
+                    <button class="btn btn-secondary btn-outline-warning" ngxClipboard [cbContent]="podcast.rssUrl">
-                        ngxClipboard
-                        [cbContent]="podcast.rssUrl">
                         <i class="fa fa-copy"></i>
                     </button>
                 </div>
             </div>
         </div>
         <div class="block-content">
-            <app-podcast-upload-form *ngIf="uploadMode"
+            <app-podcast-upload-form *ngIf="uploadMode" [podcast]="podcast" (onUploadComplete)="onEntryUploadComplete($event)">
-                [podcast]="podcast"
-                (onUploadComplete)="onEntryUploadComplete($event)">
             </app-podcast-upload-form>
-            <app-podcast-add-url-form *ngIf="urlMode"
+            <app-podcast-add-url-form *ngIf="urlMode" [podcast]="podcast" (onUrlAddComplete)="onUrlAddComplete($event)" (onUploadDeferred)="onEntryUploadDeferred($event)">
-                [podcast]="podcast"
-                (onUrlAddComplete)="onUrlAddComplete($event)"
-                (onUploadDeferred)="onEntryUploadDeferred($event)">
             </app-podcast-add-url-form>
+            <div class="block block-themed" *ngIf="pendingEntry">
+                <div class="block-header bg-danger">
+                    <h3 class="block-title">This looks like a playlist? Shall we add all items (please note, this may result in a lot of episodes being downloaded to your device).</h3>
+                    <div class="block-options">
+                        <button type="button" class="btn-block-option" (click)="processPlaylist()">
+                            <i class="fa fa-check"></i>Yes
+                        </button>
+                        <button type="button" class="btn-block-option" (click)="dismissPlaylist()">
+                            <i class="fa fa-times"></i>No
+                        </button>
+                    </div>
+                </div>
+            </div>
             <table class="js-table-checkable table table-hover js-table-checkable-enabled">
                 <tbody>
-                    <tr *ngFor="let e of entries$ | async | orderBy : '-id'"
+                    <tr *ngFor="let e of entries$ | async | orderBy : '-id'" app-entry-list-item (entryRemoved)='deleteEntry(e)' [entry]="e">
-                        app-entry-list-item
-                        (entryRemoved)='deleteEntry(e)'
-                        [entry]="e">
-
                 </tbody>
             </table>
         </div>
     </div>
-    <div class="modal fade"
+    <div class="modal fade" bsModal #podcastDeleteDialog="bs-modal" tabindex="-1" role="dialog" aria-hidden="true">
-        bsModal
-        #podcastDeleteDialog="bs-modal"
-        tabindex="-1"
-        role="dialog"
-        aria-hidden="true">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
                     <h4 class="modal-title pull-left">Delete this podcast?</h4>
-                    <button type="button"
+                    <button type="button" class="close pull-right" aria-label="Close" (click)="podcastDeleteDialog.hide()">
-                        class="close pull-right"
-                        aria-label="Close"
-                        (click)="podcastDeleteDialog.hide()">
                         <span aria-hidden="true">&times;</span>
                     </button>
                 </div>
                 <div class="modal-body">
-                    <button type="button"
+                    <button type="button" class="btn btn-primary pull-right" (click)="podcastDeleteDialog.hide()">No
-                        class="btn btn-primary pull-right"
-                        (click)="podcastDeleteDialog.hide()">No
                     </button>
-                    <button type="button"
+                    <button type="button" class="btn btn-danger pull-right" (click)="deletePodcast(podcast); podcastDeleteDialog.hide()">Yes
-                        class="btn btn-danger pull-right"
-                        (click)="deletePodcast(podcast); podcastDeleteDialog.hide()">Yes
                     </button>
                 </div>
             </div>
@@ -98,11 +77,10 @@
             </div>
             <div class="font-size-h4 font-w600">It's looking a bit empty here?</div>
             <div class="pt-20">
-                <a class="btn btn-rounded btn-alt-primary"
+                <a class="btn btn-rounded btn-alt-primary" [routerLink]="['/add']">
-                    [routerLink]="['/add']">
                     <i class="fa fa-cog mr-5"></i> Add my first podcast
                 </a>
             </div>
         </div>
     </div>
-</ng-template>
+</ng-template>

client/src/app/components/podcast/podcast.component.ts

@@ -13,6 +13,7 @@ import { UpdateAction, AddAction } from 'app/actions/entries.actions';
 import * as fromPodcast from 'app/reducers';
 import * as fromPodcastActions from 'app/actions/podcast.actions';
 import * as fromEntriesActions from 'app/actions/entries.actions';
+import { PodcastService } from 'app/services/podcast.service';
 
 @Component({
     selector: 'app-podcast',
@@ -21,6 +22,7 @@ import * as fromEntriesActions from 'app/actions/entries.actions';
 })
 export class PodcastComponent {
     selectedPodcast$: Observable<PodcastModel>;
+    pendingEntry: PodcastEntryModel = null;
     entries$: Observable<PodcastEntryModel[]>;
     uploadMode = false;
     urlMode = false;
@@ -36,6 +38,8 @@ export class PodcastComponent {
 
     constructor(
         private _store: Store<ApplicationState>,
+        private _service: PodcastService,
+        private _toasty: ToastyService,
         route: ActivatedRoute,
         private _location: Location
     ) {
@@ -88,11 +92,25 @@ export class PodcastComponent {
         this._store.dispatch(new fromEntriesActions.AddSuccessAction(entry));
         this._store.dispatch(new fromEntriesActions.UpdateAction(entry));
     }
-    onEntryUploadDeferred($event) {
+    onEntryUploadDeferred(entry: PodcastEntryModel) {
-
+        this.pendingEntry = entry;
     }
     onUrlAddComplete(entry: PodcastEntryModel) {
         this.urlMode = false;
         this._store.dispatch(new fromEntriesActions.AddSuccessAction(entry));
     }
+    processPlaylist() {
+        if (this.pendingEntry) {
+            this._service.addPlaylist(this.pendingEntry)
+                .subscribe(e => {
+                    if (e) {
+                        this._toasty.info('Playlist added, check back here (and on your device) for new episodes');
+                    }
+                });
+        }
+    }
+    dismissPlaylist() {
+        this.urlMode = false;
+        this.pendingEntry = null;
+    }
 }

client/src/app/services/app-insights.service.ts

@@ -0,0 +1,16 @@
+import { Injectable } from '@angular/core';
+import { AppInsights } from 'applicationinsights-js';
+import { environment } from 'environments/environment';
+
+@Injectable()
+export class AppInsightsService {
+
+    private config: Microsoft.ApplicationInsights.IConfig = {
+        instrumentationKey: environment.appInsights.instrumentationKey
+    };
+    constructor() {
+        if (!AppInsights.config){
+            AppInsights.downloadAndSetup(this.config);
+        }
+    }
+}

client/src/app/services/jobs.service.ts

@@ -6,9 +6,16 @@ import { environment } from 'environments/environment';
 
 @Injectable()
 export class JobsService {
-    constructor(private _http: AuthHttp) {}
+    constructor(private _http: AuthHttp) { }
 
     processOrphans(): Observable<Response> {
         return this._http.get(environment.API_HOST + '/job/processorphans');
     }
+
+    processPlaylists(): Observable<Response> {
+        return this._http.get(environment.API_HOST + '/job/processplaylists');
+    }
+    updateYouTubeDl(): Observable<Response> {
+        return this._http.get(environment.API_HOST + '/job/updateyoutubedl');
+    }
 }

client/src/app/services/podcast.service.ts

@@ -13,7 +13,7 @@ export class PodcastService {
         }
         return value;
     }
-    constructor(private _http: AuthHttp) {}
+    constructor(private _http: AuthHttp) { }
     //#region Podcasts
     get(): Observable<PodcastModel[]> {
         return this._http
@@ -68,8 +68,16 @@ export class PodcastService {
     }
     reSubmitEntry(entry: PodcastEntryModel): Observable<PodcastEntryModel> {
         return this._http
-        .post(environment.API_HOST + '/entry/resubmit', entry)
+            .post(environment.API_HOST + '/entry/resubmit', entry)
-        .map(res => res.json());
+            .map(res => res.json());
+    }
+    //#endregion
+
+    //#region Playlists
+    addPlaylist(entry: PodcastEntryModel) {
+        return this._http
+            .post(environment.API_HOST + '/playlist', JSON.stringify(entry))
+            .map(res => res.json());
     }
     //#endregion
 }