Mirrors/roadie
2
0
Fork 0
mirror of https://github.com/sphildreth/roadie synced 2024-11-10 06:44:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

various bugs squashed

Browse source
This commit is contained in:
Steven Hildreth 2019-07-31 19:10:00 -05:00
parent 36459efa38
commit ed0aa051d6
3 changed files with 39 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Roadie.Api.Library/SearchEngines/Imaging/ITunesSearchEngine.cs
View file

@ -41,9 +41,7 @@ namespace Roadie.Library.SearchEngines.Imaging
response.ErrorMessage, response.Content));
}
var responseData = response.Data.resultCount > 0 && response.Data.results != null
? response.Data.results.First()
: null;
var responseData = response?.Data?.results?.FirstOrDefault();
if (responseData != null)
{
var urls = new List<string>();
@ -130,9 +128,7 @@ namespace Roadie.Library.SearchEngines.Imaging
ReleaseSearchResult data = null;
try
{
var responseData = response.Data.results != null && response.Data.results.Any()
? response.Data.results.First()
: null;
var responseData = response?.Data?.results?.FirstOrDefault();
if (responseData != null)
{
var urls = new List<string>();

5
Roadie.Api.Services/ArtistService.cs
View file

@ -744,7 +744,7 @@ namespace Roadie.Api.Services
if (Directory.Exists(originalArtistFolder))
{
// Rename artist folder to reflect new artist name
Logger.LogTrace("Moving Artist From Folder [{0}] To [{1}]", originalArtistFolder, newArtistFolder);
Logger.LogInformation("Moving Artist From Folder [{0}] -> [{1}]", originalArtistFolder, newArtistFolder);
Directory.Move(originalArtistFolder, newArtistFolder);
}
}
@ -921,8 +921,7 @@ namespace Roadie.Api.Services
}
CacheManager.ClearRegion(artist.CacheRegion);
Logger.LogInformation(
$"UpdateArtist `{artist}` By User `{user}`: Renamed Artist [{didRenameArtist}], Uploaded new image [{didChangeThumbnail}]");
Logger.LogInformation($"UpdateArtist `{artist}` By User `{user}`: Renamed Artist [{didRenameArtist}], Uploaded new image [{didChangeThumbnail}]");
}
catch (Exception ex)
{

64
Roadie.Api.Services/ReleaseService.cs
View file

@ -671,11 +671,8 @@ namespace Roadie.Api.Services
if (!newTrackPath.ToLower().Equals(oldTrackPath.ToLower()))
{
var audioMetaData = await AudioMetaDataHelper.GetInfo(trackFile);
track.FilePath = FolderPathHelper.TrackPath(Configuration, releaseToMergeInto.Artist,
releaseToMergeInto, track);
track.Hash = HashHelper.CreateMD5(
releaseToMergeInto.ArtistId + trackFile.LastWriteTimeUtc.GetHashCode().ToString() +
audioMetaData.GetHashCode());
track.FilePath = FolderPathHelper.TrackPath(Configuration, releaseToMergeInto.Artist, releaseToMergeInto, track);
track.Hash = HashHelper.CreateMD5(releaseToMergeInto.ArtistId + trackFile.LastWriteTimeUtc.GetHashCode().ToString() + audioMetaData.GetHashCode());
track.LastUpdated = now;
File.Move(oldTrackPath, newTrackPath);
}
@ -1132,6 +1129,10 @@ namespace Roadie.Api.Services
{
trackArtistId = trackArtistData.Data.Id;
}
if (release.ArtistId == trackArtistData.Data.Id)
{
trackArtistId = null;
}
}
else if (audioMetaData.TrackArtists.Any())
{
@ -1343,7 +1344,9 @@ namespace Roadie.Api.Services
.Include("Labels.Label")
.FirstOrDefault(x => x.RoadieId == model.Id);
if (release == null)
{
return new OperationResult<bool>(true, string.Format("Release Not Found [{0}]", model.Id));
}
try
{
var now = DateTime.UtcNow;
@ -1356,7 +1359,9 @@ namespace Roadie.Api.Services
var specialReleaseTitle = model.Title.ToAlphanumericName();
var alt = new List<string>(model.AlternateNamesList);
if (!model.AlternateNamesList.Contains(specialReleaseTitle, StringComparer.OrdinalIgnoreCase))
{
alt.Add(specialReleaseTitle);
}
release.AlternateNames = alt.ToDelimitedList();
release.ReleaseDate = model.ReleaseDate;
release.Rating = model.Rating;
@ -1377,15 +1382,13 @@ namespace Roadie.Api.Services
if (model?.Artist?.Artist?.Value != null)
{
var artist = DbContext.Artists.FirstOrDefault(x =>
x.RoadieId == SafeParser.ToGuid(model.Artist.Artist.Value));
var artist = DbContext.Artists.FirstOrDefault(x => x.RoadieId == SafeParser.ToGuid(model.Artist.Artist.Value));
if (artist != null && release.ArtistId != artist.Id)
{
release.ArtistId = artist.Id;
didChangeArtist = true;
}
}
var releaseImage = ImageHelper.ImageDataFromUrl(model.NewThumbnailData);
if (releaseImage != null)
{
@ -1400,8 +1403,7 @@ namespace Roadie.Api.Services
if (model.NewSecondaryImagesData != null && model.NewSecondaryImagesData.Any())
{
var releaseFolder =
release.ReleaseFileFolder(release.Artist.ArtistFileFolder(Configuration));
var releaseFolder = release.ReleaseFileFolder(release.Artist.ArtistFileFolder(Configuration));
// Additional images to add to artist
var looper = 0;
foreach (var newSecondaryImageData in model.NewSecondaryImagesData)
@ -1513,39 +1515,43 @@ namespace Roadie.Api.Services
var result = false;
var artistFolder = release.Artist.ArtistFileFolder(Configuration);
var newReleaseFolder = release.ReleaseFileFolder(artistFolder);
if (!oldReleaseFolder.Equals(newReleaseFolder, StringComparison.OrdinalIgnoreCase))
if (newReleaseFolder != oldReleaseFolder)
{
Logger.LogTrace("Moving Release From Folder [{0}] To [{1}]", oldReleaseFolder, newReleaseFolder);
// Create the new release folder
if (!Directory.Exists(newReleaseFolder)) Directory.CreateDirectory(newReleaseFolder);
if (Directory.Exists(oldReleaseFolder))
{
Directory.Move(oldReleaseFolder, newReleaseFolder);
Logger.LogInformation($"Moved Release Folder From [{ oldReleaseFolder }] -> [{ newReleaseFolder }]");
}
else if (!Directory.Exists(newReleaseFolder))
{
Directory.CreateDirectory(newReleaseFolder);
}
var releaseDirectoryInfo = new DirectoryInfo(newReleaseFolder);
// Update and move tracks under new release folder
foreach (var releaseMedia in DbContext.ReleaseMedias.Where(x => x.ReleaseId == release.Id).ToArray())
// Update the track path to have the new album title. This is needed because future scans might not work properly without updating track title.
foreach (var track in DbContext.Tracks.Where(x => x.ReleaseMediaId == releaseMedia.Id).ToArray())
{
var existingTrackPath = track.PathToTrack(Configuration);
var existingTrackFileInfo = new FileInfo(existingTrackPath);
var newTrackFileInfo = new FileInfo(track.PathToTrack(Configuration));
if (existingTrackFileInfo.Exists)
track.FilePath = Path.Combine(releaseDirectoryInfo.Parent.Name, releaseDirectoryInfo.Name);
var trackPath = track.PathToTrack(Configuration);
var trackFileInfo = new FileInfo(trackPath);
if (trackFileInfo.Exists)
{
// Update the tracks release tags
var audioMetaData = await AudioMetaDataHelper.GetInfo(existingTrackFileInfo);
var audioMetaData = await AudioMetaDataHelper.GetInfo(trackFileInfo);
audioMetaData.Release = release.Title;
AudioMetaDataHelper.WriteTags(audioMetaData, existingTrackFileInfo);
AudioMetaDataHelper.WriteTags(audioMetaData, trackFileInfo);
// Update track path
track.FilePath = Path.Combine(releaseDirectoryInfo.Parent.Name, releaseDirectoryInfo.Name);
track.Status = Statuses.Ok;
track.Hash = HashHelper.CreateMD5(release.ArtistId + trackFileInfo.LastWriteTimeUtc.GetHashCode().ToString() + audioMetaData.GetHashCode());
track.LastUpdated = now;
// Move the physical track
var newTrackPath = track.PathToTrack(Configuration);
if (!existingTrackPath.Equals(newTrackPath, StringComparison.OrdinalIgnoreCase))
File.Move(existingTrackPath, newTrackPath);
}
else
{
track.Hash = null;
track.Status = Statuses.Missing;
}
CacheManager.ClearRegion(track.CacheRegion);
}