From 787dba4c0e770242b1aadaef388b861d9028c85c Mon Sep 17 00:00:00 2001
From: Benjamin Ifland <benjamin@Apfelbox.local>
Date: Thu, 28 Mar 2019 12:51:32 +0100
Subject: [PATCH] download files

---
 .../song-files/song-files.component.html      |  2 +-
 .../songs/song-files/song-files.component.ts  |  4 +++-
 WEB/src/app/data/download.service.ts          | 19 ++++++++-----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/WEB/src/app/components/songs/song-files/song-files.component.html b/WEB/src/app/components/songs/song-files/song-files.component.html
index c19e5f8..f944ec1 100644
--- a/WEB/src/app/components/songs/song-files/song-files.component.html
+++ b/WEB/src/app/components/songs/song-files/song-files.component.html
@@ -31,7 +31,7 @@
           <td mat-cell *matCellDef="let element">
             <button
               mat-icon-button
-              (click)="onClickDownload(element.ID)"
+              (click)="onClickDownload(element.ID, element.Name)"
               matTooltip="Datei herunterladen"
               matTooltipPosition="left"
             >
diff --git a/WEB/src/app/components/songs/song-files/song-files.component.ts b/WEB/src/app/components/songs/song-files/song-files.component.ts
index 55e4c2a..7c0e377 100644
--- a/WEB/src/app/components/songs/song-files/song-files.component.ts
+++ b/WEB/src/app/components/songs/song-files/song-files.component.ts
@@ -43,7 +43,9 @@ export class SongFilesComponent {
     });
   }
 
-  public onClickDownload(id: number): void {}
+  public onClickDownload(fileId: number, filename): void {
+    this.downloadService.get(this.selectedSongId, fileId, filename);
+  }
   public onFileOverNew(hover: boolean) {
     this.fileOverNew = hover;
   }
diff --git a/WEB/src/app/data/download.service.ts b/WEB/src/app/data/download.service.ts
index 09ea046..b4178fb 100644
--- a/WEB/src/app/data/download.service.ts
+++ b/WEB/src/app/data/download.service.ts
@@ -2,28 +2,25 @@ import { base } from './urls';
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 
-
 @Injectable({
   providedIn: 'root'
 })
 export class DownloadService {
   constructor(private httpClient: HttpClient) {}
 
-  public get(id: number, withKey: boolean) {
+  public get(songId: number, fileId: number, filename: string) {
     return this.httpClient
-      .get(base + '/' + id + '?withKey=' + withKey, {
-        responseType: 'blob' as 'json'
+      .get(base + '/api/songs/' + songId + '/files/' + fileId, {
+        responseType: 'blob' as 'json',
+        observe: 'response'
       })
       .subscribe(
         (response: any) => {
-          const dataType = response.type;
-          const binaryData = [];
-          binaryData.push(response);
+          const contentType = response.headers.get('Content-Type');
           const downloadLink = document.createElement('a');
-          downloadLink.href = window.URL.createObjectURL(
-            new Blob(binaryData)
-          );
-          downloadLink.setAttribute('download', id + '.doc');
+          const blob = new Blob([response.body], { type: contentType });
+          downloadLink.href = window.URL.createObjectURL(blob);
+          downloadLink.setAttribute('download', filename);
           document.body.appendChild(downloadLink);
           downloadLink.click();
         },