open-lab/lnreader
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: Add Last Read Sorting (Closes #255)

Browse Source
This commit is contained in:
Rajarshee Chatterjee
2022-06-12 09:20:26 +05:30
parent 6f30bfeeab
commit d44abc9039
2 changed files with 55 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/queries/LibraryQueries.js
+19 -3
View File
@@ -2,7 +2,7 @@ import * as SQLite from 'expo-sqlite';
const db = SQLite.openDatabase('lnreader.db');
const getLibraryQuery = (sort, filter) => `
SELECT novels.*, C.chaptersUnread, D.chaptersDownloaded
SELECT novels.*, C.chaptersUnread, D.chaptersDownloaded, H.lastReadAt
FROM novels
LEFT JOIN (
SELECT chapters.novelId, COUNT(*) AS chaptersUnread
@@ -18,6 +18,14 @@ const getLibraryQuery = (sort, filter) => `
GROUP BY chapters.novelId
) AS D
ON novels.novelId = D.novelId
LEFT JOIN (
SELECT history.historyNovelId as novelId, historyTimeRead AS lastReadAt
FROM history
GROUP BY history.historyNovelId
HAVING history.historyTimeRead = MAX(history.historyTimeRead)
ORDER BY history.historyTimeRead DESC
) AS H
ON novels.novelId = H.novelId
WHERE novels.followed = 1 ${filter ? 'AND ' + filter : ''}
${sort ? 'ORDER BY ' + sort : ''}
`;
@@ -29,7 +37,7 @@ export const getLibrary = (sort, filter) => {
getLibraryQuery(sort, filter),
null,
(txObj, { rows: { _array } }) => {
// console.log(_array);
// console.log(JSON.stringify(_array, null, 2));
resolve(_array);
},
(txObj, error) => {
@@ -42,7 +50,7 @@ export const getLibrary = (sort, filter) => {
const searchLibraryQuery = (searchText, sort, filter) =>
`
SELECT novels.*, C.chaptersUnread, D.chaptersDownloaded
SELECT novels.*, C.chaptersUnread, D.chaptersDownloaded, H.lastReadAt
FROM novels
LEFT JOIN (
SELECT chapters.novelId, COUNT(*) AS chaptersUnread
@@ -58,6 +66,14 @@ const searchLibraryQuery = (searchText, sort, filter) =>
GROUP BY chapters.novelId
) AS D
ON novels.novelId = D.novelId
LEFT JOIN (
SELECT history.historyNovelId as novelId, historyTimeRead AS lastReadAt
FROM history
GROUP BY history.historyNovelId
HAVING history.historyTimeRead = MAX(history.historyTimeRead)
ORDER BY history.historyTimeRead DESC
) AS H
ON novels.novelId = H.novelId
WHERE novels.followed = 1 AND novelName LIKE '%${searchText}%' ${
filter ? 'AND ' + filter : ''
}
src/screens/library/components/LibraryBottomSheet.js
+36 -28
View File
@@ -1,4 +1,4 @@
import React, { useState } from 'react';
import React, { useMemo, useState } from 'react';
import {
StyleSheet,
View,
@@ -68,33 +68,41 @@ const LibrarySheet = ({
</View>
);
const sortOrders = [
{
label: 'Date Added',
ASC: 'novels.novelId ASC',
DESC: 'novels.novelId DESC',
},
{
label: 'Alphabetically',
ASC: 'novels.novelName ASC',
DESC: 'novels.novelName DESC',
},
{
label: 'Unread',
ASC: 'novels.unread ASC',
DESC: 'novels.unread DESC',
},
{
label: 'Downloaded',
ASC: 'chaptersDownloaded ASC',
DESC: 'chaptersDownloaded DESC',
},
{
label: 'Total Chapters',
ASC: 'chaptersUnread ASC',
DESC: 'chaptersUnread DESC',
},
];
const sortOrders = useMemo(
() => [
{
label: 'Last Read',
ASC: 'lastReadAt ASC',
DESC: 'lastReadAt DESC',
},
{
label: 'Alphabetically',
ASC: 'novels.novelName ASC',
DESC: 'novels.novelName DESC',
},
{
label: 'Unread',
ASC: 'novels.unread ASC',
DESC: 'novels.unread DESC',
},
{
label: 'Downloaded',
ASC: 'chaptersDownloaded ASC',
DESC: 'chaptersDownloaded DESC',
},
{
label: 'Total Chapters',
ASC: 'chaptersUnread ASC',
DESC: 'chaptersUnread DESC',
},
{
label: 'Date Added',
ASC: 'novels.novelId ASC',
DESC: 'novels.novelId DESC',
},
],
[],
);
const SecondRoute = () => (
<View style={{ flex: 1 }}>