diff --git a/src/NzbDrone.Core/Tv/MovieRepository.cs b/src/NzbDrone.Core/Tv/MovieRepository.cs index 906ae98d9..0ad6fb48e 100644 --- a/src/NzbDrone.Core/Tv/MovieRepository.cs +++ b/src/NzbDrone.Core/Tv/MovieRepository.cs @@ -102,7 +102,7 @@ namespace NzbDrone.Core.Tv return pagingSpec; } - public override PagingSpec GetPaged(PagingSpec pagingSpec) + /*public override PagingSpec GetPaged(PagingSpec pagingSpec) { if (pagingSpec.SortKey == "downloadedQuality") { @@ -118,9 +118,10 @@ namespace NzbDrone.Core.Tv var q2 = mapper.Query("SELECT * from \"Movies\" , \"MovieFiles\", \"QualityDefinitions\" WHERE Movies.MovieFileId=MovieFiles.Id AND instr(MovieFiles.Quality, ('quality\": ' || QualityDefinitions.Quality || \",\")) > 0 ORDER BY QualityDefinitions.Title ASC;"); //var ok = q.BuildQuery(); + var q3 = Query.OrderBy("json_extract([t2].[quality], '$.quality') DESC"); - pagingSpec.Records = q.ToList(); - pagingSpec.TotalRecords = q2.Count(); + pagingSpec.Records = q3.ToList(); + pagingSpec.TotalRecords = q3.GetRowCount(); } else @@ -138,7 +139,7 @@ namespace NzbDrone.Core.Tv } return pagingSpec; - } + }*/ /*protected override SortBuilder GetPagedQuery(QueryBuilder query, PagingSpec pagingSpec) { @@ -184,7 +185,9 @@ namespace NzbDrone.Core.Tv var q = mapper.Query($"SELECT * from \"Movies\" , \"MovieFiles\", \"QualityDefinitions\" WHERE Movies.MovieFileId=MovieFiles.Id AND instr(MovieFiles.Quality, ('quality\": ' || QualityDefinitions.Quality || \",\")) > 0 AND {whereClause} ORDER BY QualityDefinitions.Title {direction} LIMIT {offset},{limit};"); var q2 = mapper.Query($"SELECT * from \"Movies\" , \"MovieFiles\", \"QualityDefinitions\" WHERE Movies.MovieFileId=MovieFiles.Id AND instr(MovieFiles.Quality, ('quality\": ' || QualityDefinitions.Quality || \",\")) > 0 AND {whereClause} ORDER BY QualityDefinitions.Title ASC;"); - //var ok = q.BuildQuery(); + var q3 = Query.OrderBy(m => m.MovieFile.Quality.Quality); + var ok = q3.BuildQuery(); + var t = ok; pagingSpec.Records = q.ToList(); pagingSpec.TotalRecords = q2.Count(); diff --git a/src/UI/Movies/Index/MoviesIndexLayout.js b/src/UI/Movies/Index/MoviesIndexLayout.js index 3b78ff663..e25f08598 100644 --- a/src/UI/Movies/Index/MoviesIndexLayout.js +++ b/src/UI/Movies/Index/MoviesIndexLayout.js @@ -63,7 +63,7 @@ module.exports = Marionette.Layout.extend({ cell : RelativeDateCell }, { - name : "downloadedQuality", + name : "movieFile.quality", label : "Downloaded", cell : DownloadedQualityCell, sortable : true @@ -215,7 +215,7 @@ module.exports = Marionette.Layout.extend({ }, { title: 'Downloaded', - name: 'downloadedQuality' + name: 'movieFile.quality' }, { title : 'Profile',