Mirrors/roadie
2
0
Fork 0
mirror of https://github.com/sphildreth/roadie synced 2024-11-25 21:50:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

resolves #38; fixed typo and included excluding Track Artists and updated NuGet pacakges.

Browse source
This commit is contained in:
Steven Hildreth 2020-01-04 09:11:50 -06:00
parent 0cfd91156d
commit b8bdf0d7c4
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Inspector/Inspector.csproj
View file

@ -21,7 +21,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.4.4" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.5.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
</ItemGroup>

10
Roadie.Api.Library/Data/Context/Implementation/MysqlRoadieDbContext.cs
View file

@ -164,11 +164,17 @@ namespace Roadie.Library.Data.Context.Implementation
FROM `track` t
# Rated filter
WHERE ((t.rating > 0 AND {3} = 1) OR {3} = 0)
# Artist is not disliked
# Artist and TrackArtist is not disliked
AND ((t.id NOT IN (select tt.id
FROM `track` tt
JOIN `releasemedia` rm on (tt.releaseMediaId = rm.id)
JOIN `userartist` ua on (rm.id = ua.artistId)
JOIN `release` r on (rm.releaseId = r.id)
JOIN `userartist` ua on (r.artistId = ua.artistId)
WHERE ua.userId = {1} AND ua.isDisliked = 1
UNION
select tt.id
FROM `track` tt
JOIN `userartist` ua on (tt.artistId = ua.artistId)
WHERE ua.userId = {1} AND ua.isDisliked = 1))
# Release is not disliked
AND (t.id NOT IN (select tt.id

8
Roadie.Api.Library/Roadie.Library.csproj
View file

@ -9,8 +9,8 @@
<ItemGroup>
<PackageReference Include="AutoCompare.Core" Version="1.0.0" />
<PackageReference Include="CsvHelper" Version="12.2.2" />
<PackageReference Include="EFCore.BulkExtensions" Version="3.0.5" />
<PackageReference Include="CsvHelper" Version="12.2.3" />
<PackageReference Include="EFCore.BulkExtensions" Version="3.1.0" />
<PackageReference Include="FluentFTP" Version="28.0.5" />
<PackageReference Include="Hashids.net" Version="1.3.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.17" />
@ -30,7 +30,7 @@
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.3" />
<PackageReference Include="MimeMapping" Version="1.0.1.26" />
<PackageReference Include="NodaTime" Version="2.4.7" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.0.1" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
<PackageReference Include="RestSharp" Version="106.6.10" />
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0008" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0007" />
@ -39,7 +39,7 @@
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
<PackageReference Include="System.Runtime.Caching" Version="4.7.0" />
<PackageReference Include="z440.atl.core" Version="2.14.0" />
<PackageReference Include="z440.atl.core" Version="2.15.0" />
<PackageReference Include="zlib.net-mutliplatform" Version="1.0.4" />
</ItemGroup>

3
Roadie.Api/Roadie.Api.csproj
View file

@ -9,6 +9,7 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
<UserSecretsId>3f484b72-52aa-42ae-938d-4635f9511319</UserSecretsId>
<Version>1.1.3</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@ -42,7 +43,7 @@
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
<PackageReference Include="Serilog.Exceptions" Version="5.3.1" />
<PackageReference Include="Serilog.Exceptions" Version="5.4.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.LiteDB.NetStandard" Version="1.0.14" />