initial commit: working version

ui/src/app/app.component.html

@@ -0,0 +1,75 @@
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+  <a class="navbar-brand" href="#">MeTube</a>
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsDefault" aria-controls="navbarsDefault" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+
+  <!--
+  <div class="collapse navbar-collapse" id="navbarsDefault">
+    <ul class="navbar-nav mr-auto">
+      <li class="nav-item active">
+        <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
+      </li>
+    </ul>
+  </div>
+  -->
+</nav>
+
+<main role="main" class="container">
+  <form #f="ngForm">
+    <div class="input-group add-url-box">
+      <input type="text" class="form-control" placeholder="Video or playlist URL" name="addUrl" [(ngModel)]="addUrl" [disabled]="addInProgress || downloads.loading">
+      <div class="input-group-append">
+        <button class="btn btn-primary" type="submit" (click)="addDownload()" [disabled]="addInProgress || downloads.loading">
+          <span class="spinner-border spinner-border-sm" role="status" id="add-spinner" *ngIf="addInProgress"></span>
+          {{ addInProgress ? "Adding..." : "Add" }}
+        </button>
+      </div>
+    </div>
+  </form>
+
+  <p *ngIf="downloads.loading">Loading...</p>
+  <div *ngIf="!downloads.loading">
+    <div *ngIf="downloads.empty()" class="jumbotron jumbotron-fluid px-4">
+      <div class="container text-center">
+        <h1 class="display-4">Welcome to MeTube!</h1>
+        <p class="lead">Please add some downloads via the URL box above.</p>
+      </div>
+    </div> 
+    <table *ngIf="!downloads.empty()" class="table">
+      <thead>
+      <tr>
+        <th scope="col" style="width: 1rem; vertical-align: middle;">
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox" class="custom-control-input" id="select-all" #masterCheckbox [(ngModel)]="masterSelected" (change)="checkUncheckAll()">
+            <label class="custom-control-label" for="select-all"></label>
+          </div>
+        </th>      
+        <th scope="col">
+          <button type="button" class="btn btn-link px-0" disabled #delSelected (click)="delSelectedDownloads()"><fa-icon [icon]="faTrashAlt"></fa-icon>&nbsp; Clear selected</button>
+        </th>
+        <th scope="col" style="width: 14rem;"></th>
+        <th scope="col" style="width: 8rem;">Speed</th>
+        <th scope="col" style="width: 7rem;">ETA</th>
+        <th scope="col" style="width: 2rem;"></th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr *ngFor="let download of downloads.downloads | keyvalue: asIsOrder" [class.disabled]='download.value.deleting'>
+        <td>
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox" class="custom-control-input" id="select-{{download.key}}" [(ngModel)]="download.value.checked" (change)="selectionChanged()">
+            <label class="custom-control-label" for="select-{{download.key}}"></label>
+          </div>
+        </td>
+        <td>{{ download.value.title }}</td>
+        <td><ngb-progressbar height="1.5rem" [showValue]="download.value.status != 'preparing'" [striped]="download.value.status == 'preparing'" [animated]="download.value.status == 'preparing'" type="success" [value]="download.value.status == 'preparing' ? 100 : download.value.percent | number:'1.0-0'"></ngb-progressbar></td>
+        <td>{{ download.value.speed | speed }}</td>
+        <td>{{ download.value.eta | eta }}</td>
+        <td><button type="button" class="btn btn-link" (click)="delDownload(download.key)"><fa-icon [icon]="faTrashAlt"></fa-icon></button></td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+  
+</main><!-- /.container -->

ui/src/app/app.component.sass

@@ -0,0 +1,16 @@
+.add-url-box
+    padding: 5rem 0
+    max-width: 720px
+    margin: auto
+
+.rounded-box
+    border: 1px solid rgba(0,0,0,.125)
+    border-radius: .25rem
+
+th
+    border-top: 0
+    border-bottom: 3px solid #dee2e6 !important
+
+.disabled
+    opacity: 0.5
+    pointer-events: none

ui/src/app/app.component.ts

@@ -0,0 +1,65 @@
+import { Component, ViewChild, ElementRef } from '@angular/core';
+import { faTrashAlt } from '@fortawesome/free-regular-svg-icons';
+
+import { DownloadsService, Status } from './downloads.service';
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.sass']
+})
+export class AppComponent {
+  addUrl: string;
+  addInProgress = false;
+  faTrashAlt = faTrashAlt;
+  masterSelected: boolean;
+  @ViewChild('masterCheckbox', {static: false}) masterCheckbox: ElementRef;
+  @ViewChild('delSelected', {static: false}) delSelected: ElementRef;
+
+  constructor(private downloads: DownloadsService) {
+    this.downloads.dlChanges.subscribe(() => this.selectionChanged());
+  }
+
+  // workaround to allow fetching of Map values in the order they were inserted
+  //  https://github.com/angular/angular/issues/31420
+  asIsOrder(a, b) {
+    return 1;
+  }
+
+  checkUncheckAll() {
+    this.downloads.downloads.forEach(dl => dl.checked = this.masterSelected);
+    this.selectionChanged();
+  }
+
+  selectionChanged() {
+    if (!this.masterCheckbox)
+      return;
+    let checked: number = 0;
+    this.downloads.downloads.forEach(dl => { if(dl.checked) checked++ });
+    this.masterSelected = checked > 0 && checked == this.downloads.downloads.size;
+    this.masterCheckbox.nativeElement.indeterminate = checked > 0 && checked < this.downloads.downloads.size;
+    this.delSelected.nativeElement.disabled = checked == 0;
+  }
+
+  addDownload() {
+    this.addInProgress = true;
+    this.downloads.add(this.addUrl).subscribe((status: Status) => {
+      if (status.status === 'error') {
+        alert(`Error adding URL: ${status.msg}`);
+      } else {
+        this.addUrl = '';
+      }
+      this.addInProgress = false;
+    });
+  }
+
+  delDownload(id: string) {
+    this.downloads.del([id]).subscribe();
+  }
+
+  delSelectedDownloads() {
+    let ids: string[] = [];
+    this.downloads.downloads.forEach(dl => { if(dl.checked) ids.push(dl.id) });
+    this.downloads.del(ids).subscribe();
+  }
+}

ui/src/app/app.module.ts

@@ -0,0 +1,31 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { HttpClientModule } from '@angular/common/http';
+import { SocketIoModule, SocketIoConfig } from 'ngx-socket-io';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+
+import { AppComponent } from './app.component';
+import { EtaPipe, SpeedPipe } from './downloads.pipe';
+
+const config: SocketIoConfig = { url: '', options: {} };
+
+@NgModule({
+  declarations: [
+    AppComponent,
+    EtaPipe,
+    SpeedPipe
+  ],
+  imports: [
+    BrowserModule,
+    FormsModule,
+    NgbModule,
+    HttpClientModule,
+    SocketIoModule.forRoot(config),
+    FontAwesomeModule
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }

ui/src/app/downloads.pipe.ts

@@ -0,0 +1,37 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'eta'
+})
+export class EtaPipe implements PipeTransform {
+  transform(value: number, ...args: any[]): any {
+    if (value === null) {
+      return null;
+    }
+    if (value < 60) {
+      return `${value}s`;
+    }
+    if (value < 3600) {
+      return `${Math.floor(value/60)}m ${value%60}s`;
+    }
+    const hours = Math.floor(value/3600)
+    const minutes = value % 3600
+    return `${hours}h ${Math.floor(minutes/60)}m ${minutes%60}s`;
+  }
+}
+
+@Pipe({
+  name: 'speed'
+})
+export class SpeedPipe implements PipeTransform {
+  transform(value: number, ...args: any[]): any {
+    if (value === null) {
+      return null;
+    }
+    const k = 1024;
+    const dm = 2;
+    const sizes = ['B/s', 'KB/s', 'MB/s', 'GB/s', 'TB/s', 'PB/s', 'EB/s', 'ZB/s', 'YB/s'];
+    const i = Math.floor(Math.log(value) / Math.log(k));
+    return parseFloat((value / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
+  }
+}

ui/src/app/downloads.service.ts

@@ -0,0 +1,79 @@
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
+import { of, Subject } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+import { Socket } from 'ngx-socket-io';
+
+export interface Status {
+  status: string;
+  msg?: string;
+}
+
+interface Download {
+  id: string;
+  title: string;
+  url: string,
+  status: string;
+  percent: number;
+  speed: number;
+  eta: number;
+  checked?: boolean;
+  deleting?: boolean;
+}
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DownloadsService {
+  loading = true;
+  downloads = new Map<string, Download>();
+  dlChanges = new Subject();
+
+  constructor(private http: HttpClient, private socket: Socket) {
+    socket.fromEvent('queue').subscribe((strdata: string) => {
+      this.loading = false;
+      this.downloads.clear();
+      let data: [[string, Download]] = JSON.parse(strdata);
+      data.forEach(entry => this.downloads.set(...entry));
+      this.dlChanges.next();
+    });
+    socket.fromEvent('added').subscribe((strdata: string) => {
+      let data: Download = JSON.parse(strdata);
+      this.downloads.set(data.id, data);
+      this.dlChanges.next();
+    });
+    socket.fromEvent('updated').subscribe((strdata: string) => {
+      let data: Download = JSON.parse(strdata);
+      let dl: Download = this.downloads.get(data.id);
+      data.checked = dl.checked;
+      data.deleting = dl.deleting;
+      this.downloads.set(data.id, data);
+      this.dlChanges.next();
+    });
+    socket.fromEvent('deleted').subscribe((strdata: string) => {
+      let data: string = JSON.parse(strdata);
+      this.downloads.delete(data);
+      this.dlChanges.next();
+    });
+  }
+
+  empty() {
+    return this.downloads.size == 0;
+  }
+
+  handleHTTPError(error: HttpErrorResponse) {
+    var msg = error.error instanceof ErrorEvent ? error.error.message : error.error;
+    return of({status: 'error', msg: msg})
+  }
+
+  public add(url: string) {
+    return this.http.post<Status>('add', {url: url}).pipe(
+      catchError(this.handleHTTPError)
+    );
+  }
+
+  public del(ids: string[]) {
+    ids.forEach(id => this.downloads.get(id).deleting = true);
+    return this.http.post('delete', {ids: ids});
+  }
+}