[#211] Refresh Library after a update (#212)

Library had to be refreshed manually to see the latest manga updates.
This commit is contained in:
Daniel
2023-01-06 17:35:26 +01:00
committed by GitHub
parent dca968fdb7
commit 7642b5808c
3 changed files with 37 additions and 10 deletions

View File

@@ -79,18 +79,18 @@ const sortManga = (
return result; return result;
}; };
const LibraryMangaGrid: React.FC<IMangaGridProps> = ({ const LibraryMangaGrid: React.FC<IMangaGridProps & { lastLibraryUpdate: number }> = ({
mangas, isLoading, hasNextPage, lastPageNum, setLastPageNum, message, mangas, isLoading, hasNextPage, lastPageNum, setLastPageNum, message, lastLibraryUpdate,
}) => { }) => {
const [query] = useQueryParam('query', StringParam); const [query] = useQueryParam('query', StringParam);
const { options } = useLibraryOptionsContext(); const { options } = useLibraryOptionsContext();
const { unread, downloaded } = options; const { unread, downloaded } = options;
const sortedManga = useMemo(() => sortManga(mangas, options.sorts, options.sortDesc), const sortedManga = useMemo(() => sortManga(mangas, options.sorts, options.sortDesc),
[mangas, options.sorts, options.sortDesc]); [mangas, lastLibraryUpdate, options.sorts, options.sortDesc]);
const filteredManga = useMemo(() => filterManga(sortedManga, query, unread, downloaded), const filteredManga = useMemo(() => filterManga(sortedManga, query, unread, downloaded),
[sortedManga, query, unread, downloaded]); [sortedManga, lastLibraryUpdate, query, unread, downloaded]);
const showFilteredOutMessage = (unread != null || downloaded != null || query) const showFilteredOutMessage = (unread != null || downloaded != null || query)
&& filteredManga.length === 0 && mangas.length > 0; && filteredManga.length === 0 && mangas.length > 0;

View File

@@ -27,7 +27,11 @@ function Progress({ progress }: IProgressProps) {
const baseWebsocketUrl = JSON.parse(window.localStorage.getItem('serverBaseURL')!).replace('http', 'ws'); const baseWebsocketUrl = JSON.parse(window.localStorage.getItem('serverBaseURL')!).replace('http', 'ws');
function UpdateChecker() { interface IUpdateCheckerProps {
handleFinishedUpdate: (time: number) => void
}
function UpdateChecker({ handleFinishedUpdate }: IUpdateCheckerProps) {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [progress, setProgress] = useState(0); const [progress, setProgress] = useState(0);
@@ -44,16 +48,36 @@ function UpdateChecker() {
useEffect(() => { useEffect(() => {
const wsc = new WebSocket(`${baseWebsocketUrl}/api/v1/update`); const wsc = new WebSocket(`${baseWebsocketUrl}/api/v1/update`);
wsc.onmessage = (e) => {
const data = JSON.parse(e.data) as IUpdateStatus;
const { COMPLETE = [], RUNNING = [], PENDING = [] } = data.statusMap;
setLoading(data.running); // "loading" can't be used since it will be outdated once the state gets changed
// it could be used by adding it as a dependency of "useEffect" but then the socket would
// get closed and connected again every time it changes
let updateStarted = false;
wsc.onmessage = (e) => {
const { running, statusMap } = JSON.parse(e.data) as IUpdateStatus;
const { COMPLETE = [], RUNNING = [], PENDING = [] } = statusMap;
const currentProgress = 100 * ( const currentProgress = 100 * (
COMPLETE.length / (COMPLETE.length + RUNNING.length + PENDING.length) COMPLETE.length / (COMPLETE.length + RUNNING.length + PENDING.length)
); );
const isUpdateFinished = currentProgress === 100;
const ignoreFaultyMessage = !updateStarted && !running && isUpdateFinished;
// for some reason the server sends 100% completed manga updates when connecting to the
// socket while no update is running
if (ignoreFaultyMessage) {
return;
}
updateStarted = running;
setLoading(running);
setProgress(Number.isNaN(currentProgress) ? 0 : currentProgress); setProgress(Number.isNaN(currentProgress) ? 0 : currentProgress);
if (isUpdateFinished) {
handleFinishedUpdate(Date.now());
}
}; };
return () => wsc.close(); return () => wsc.close();

View File

@@ -21,6 +21,7 @@ import { useQuery } from 'util/client';
import UpdateChecker from '../components/library/UpdateChecker'; import UpdateChecker from '../components/library/UpdateChecker';
export default function Library() { export default function Library() {
const [lastLibraryUpdate, setLastLibraryUpdate] = useState(Date.now());
const { data: tabsData, error: tabsError, loading } = useQuery<ICategory[]>('/api/v1/category'); const { data: tabsData, error: tabsError, loading } = useQuery<ICategory[]>('/api/v1/category');
const tabs = tabsData ?? []; const tabs = tabsData ?? [];
@@ -43,7 +44,7 @@ export default function Library() {
<> <>
<AppbarSearch /> <AppbarSearch />
<LibraryToolbarMenu /> <LibraryToolbarMenu />
<UpdateChecker /> <UpdateChecker handleFinishedUpdate={setLastLibraryUpdate} />
</>, </>,
); );
return () => { return () => {
@@ -76,6 +77,7 @@ export default function Library() {
return ( return (
<LibraryMangaGrid <LibraryMangaGrid
mangas={mangas} mangas={mangas}
lastLibraryUpdate={lastLibraryUpdate}
hasNextPage={false} hasNextPage={false}
lastPageNum={lastPageNum} lastPageNum={lastPageNum}
setLastPageNum={setLastPageNum} setLastPageNum={setLastPageNum}
@@ -114,6 +116,7 @@ export default function Library() {
: ( : (
<LibraryMangaGrid <LibraryMangaGrid
mangas={mangas} mangas={mangas}
lastLibraryUpdate={lastLibraryUpdate}
hasNextPage={false} hasNextPage={false}
lastPageNum={lastPageNum} lastPageNum={lastPageNum}
setLastPageNum={setLastPageNum} setLastPageNum={setLastPageNum}