phoenix/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

Partially implemented song compression #14

Browse Source
This commit is contained in:
amazing-username
2019-04-08 22:29:52 -04:00
parent 2911b9739b
commit 2d26d6ecdc
6 changed files with 128 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controllers/Managers/DirectoryManager.cs
+2 -8
View File
@@ -20,14 +20,8 @@ namespace Icarus.Controllers.Managers
#region Properties
public string SongDirectory
{
get
{
return _songDirectory;
}
set
{
_songDirectory = value;
}
get => _songDirectory;
set => _songDirectory = value;
}
#endregion
Controllers/Managers/SongManager.cs
+7 -8
View File
@@ -37,14 +37,8 @@ namespace Icarus.Controllers.Managers
#region Properties
public Song SongDetails
{
get
{
return _song;
}
set
{
_song = value;
}
get => _song;
set => _song = value;
}
#endregion
@@ -288,6 +282,11 @@ namespace Icarus.Controllers.Managers
try
{
_song = await RetrieveSongDetails(id);
Console.WriteLine("Retrieved details of song");
song = RetrieveSongFromFileSystem(_song);
Console.WriteLine("Retrieved song from filesystem");
SongCompression compressed = new SongCompression();
song.Data = compressed.CompressedSong(song.Data);
}
catch (Exception ex)
{
Controllers/SongCompressedDataControllers.cs
+93
View File
@@ -0,0 +1,93 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Icarus.Controllers.Managers;
using Icarus.Models;
namespace Icarus.Controllers
{
[Route("api/song/compressed/data")]
[ApiController]
public class SongCompressedDataController : ControllerBase
{
#region Fields
private IConfiguration _config;
private SongManager _songMgr;
private string _songTempDir;
#endregion
#region Properties
#endregion
#region Constructor
public SongCompressedDataController(IConfiguration config)
{
_config = config;
_songTempDir = _config.GetValue<string>("TemporaryMusicPath");
_songMgr = new SongManager(config, _songTempDir);
}
#endregion
[HttpGet]
public ActionResult<IEnumerable<SongData>> Get()
{
List<SongData> songs = new List<SongData>();
return songs;
}
[HttpGet("{id}")]
public async Task<IActionResult> Get(int id)
{
SongData song = new SongData();
Console.WriteLine("Starting process of retrieving comrpessed song");
song = await _songMgr.RetrieveCompressedSong(id);
return File(song.Data, "application/x-msdownload", "demo.zip");
}
[HttpPost]
public async Task Post([FromForm(Name = "file")] List<IFormFile> songData)
{
try
{
Console.WriteLine("Uploading song...");
var uploads = _songTempDir;
Console.WriteLine($"Song Root Path {uploads}");
foreach (var sng in songData)
{
if (sng.Length > 0) {
await _songMgr.SaveSongToFileSystem(sng);
}
}
}
catch (Exception ex)
{
Console.WriteLine($"An error occurred: {ex.Message}");
}
}
[HttpPut("{id}")]
public void Put(int id, [FromBody] SongData song)
{
}
[HttpDelete("{id}")]
public void Delete(int id)
{
}
}
}
Controllers/SongDataController.cs
+1 -2
View File
@@ -14,7 +14,7 @@ using Icarus.Models;
namespace Icarus.Controllers
{
[Route("api/Song/data")]
[Route("api/song/data")]
[ApiController]
public class SongDataController : ControllerBase
{
@@ -56,7 +56,6 @@ namespace Icarus.Controllers
song = await _songMgr.RetrieveSong(id);
return File(song.Data, "application/x-msdownload", _songMgr.SongDetails.Filename);
//return File(song.Data, "application/x-msdownload", "demo.zip");
}
[HttpPost]
Controllers/Utilities/SongCompression.cs
+25 -4
View File
@@ -3,7 +3,6 @@ using System.IO;
using System.IO.Compression;
using System.Threading.Tasks;
using SevenZip.Compression.LZMA;
namespace Icarus.Controllers.Utilities
@@ -31,19 +30,41 @@ namespace Icarus.Controllers.Utilities
#region Methods
//public async Task<byte[]> CompressedSong(byte[] uncompressedSong)
public async Task<byte[]> CompressedSong(byte[] uncompressedSong)
public byte[] CompressedSong(byte[] uncompressedSong)
{
byte[] compressedSong = null;
try
{
//compressedSong = SevenZip.Compression.LZMA.SevenZipHelper.Compress(uncompressedSong);
/**
MemoryStream output = new MemoryStream();
using (DeflateStream dstream = new DeflateStream(output, CompressionLevel.Optimal))
{
dstream.Write(uncompressedSong, 0, uncompressedSong.Length);
compressedSong = output.ToArray();
}
*/
// TODO: Implement song compression
FileStream sourceFile = File.ReadAllBytes(uncompressedSong);
FileStream destinationFile = File.Create(path + ".gz");
byte[] buffer = new byte[sourceFile.Length];
sourceFile.Read(uncompressedSong, 0, uncompressedSong.Length);
using (GZipStream output = new GZipStream(destinationFile,
CompressionMode.Compress))
{
Console.WriteLine("Compressing {0} to {1}.", sourceFile.Name,
destinationFile.Name, false);
output.Write(buffer, 0, buffer.Length);
}
sourceFile.Close();
destinationFile.Close();
Console.WriteLine("Song has been successfully compressed");
}
catch (Exception ex)
{
Controllers/ValuesController.cs
-45
View File
@@ -1,45 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
namespace Icarus.Controllers
{
[Route("api/[controller]")]
[ApiController]
public class ValuesController : ControllerBase
{
// GET api/values
[HttpGet]
public ActionResult<IEnumerable<string>> Get()
{
return new string[] { "value1", "value2" };
}
// GET api/values/5
[HttpGet("{id}")]
public ActionResult<string> Get(int id)
{
return "value";
}
// POST api/values
[HttpPost]
public void Post([FromBody] string value)
{
}
// PUT api/values/5
[HttpPut("{id}")]
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/values/5
[HttpDelete("{id}")]
public void Delete(int id)
{
}
}
}