Merge pull request #165 from mbret/develop

release

packages/api/src/constants.ts

@@ -14,6 +14,7 @@ export const METADATA_EXTRACTOR_SUPPORTED_EXTENSIONS = [
   "application/x-cbz",
   "application/epub+zip",
   "application/zip",
+  "application/x-zip-compressed",
   "application/x-rar"
 ]
 export const COVER_ALLOWED_EXT = [".jpg", ".jpeg", ".png"]

packages/web/src/books/states.ts

@@ -3,23 +3,21 @@ import { useProtectedTagIds, useTagsByIds } from "../tags/helpers"
 import { getLinkState, useLink, useLinks } from "../links/states"
 import {
   getBookDownloadsState,
-  booksDownloadStateSignal,
-  DownloadState
+  booksDownloadStateSignal
 } from "../download/states"
 import { useCollections } from "../collections/useCollections"
-import { from, map, switchMap } from "rxjs"
+import { map, switchMap } from "rxjs"
 import { plugin as localPlugin } from "../plugins/local"
 import { latestDatabase$ } from "../rxdb/useCreateDatabase"
-import { isDefined, useForeverQuery, useQuery, useSignalValue } from "reactjrx"
+import { useForeverQuery, useSignalValue } from "reactjrx"
 import { keyBy } from "lodash"
 import { Database } from "../rxdb"
 import { BookDocType, CollectionDocType } from "@oboku/shared"
 import { DeepReadonlyObject, MangoQuery } from "rxdb"
-import { useVisibleBooks } from "./useVisibleBooks"
-import { DeepReadonlyArray, RxDocument } from "rxdb/dist/types/types"
+import { DeepReadonlyArray } from "rxdb/dist/types/types"
 import { useMemo } from "react"
-import { getBooksQueryObj } from "./dbHelpers"
-import { CollectionDocMethods } from "../rxdb/collections/collection"
+import { observeBooks } from "./dbHelpers"
+import { libraryStateSignal } from "../library/states"
 
 export const getBooksByIds = async (database: Database) => {
   const result = await database.collections.book.find({}).exec()
@@ -33,31 +31,40 @@ export const getBooksByIds = async (database: Database) => {
 export const useBooks = ({
   queryObj = {},
   isNotInterested,
-  ids
+  ids,
+  includeProtected: _includeProtected
 }: {
   queryObj?: MangoQuery<BookDocType>
   isNotInterested?: "none" | "with" | "only"
   ids?: DeepReadonlyArray<string>
+  includeProtected?: boolean
 } = {}) => {
   const serializedIds = JSON.stringify(ids)
+  const { isLibraryUnlocked } = useSignalValue(libraryStateSignal)
+  const includeProtected = _includeProtected || isLibraryUnlocked
 
   return useForeverQuery({
     queryKey: [
       "rxdb",
       "get",
       "many",
       "books",
-      { isNotInterested, serializedIds },
+      { isNotInterested, serializedIds, includeProtected },
       queryObj
     ],
-    queryFn: () => {
-      const finalQueryObj = getBooksQueryObj({ queryObj, isNotInterested, ids })
-
-      return latestDatabase$.pipe(
-        switchMap((db) => db.collections.book.find(finalQueryObj).$),
+    queryFn: () =>
+      latestDatabase$.pipe(
+        switchMap((db) =>
+          observeBooks({
+            db,
+            includeProtected,
+            ids,
+            isNotInterested,
+            queryObj
+          })
+        ),
         map((items) => items.map((item) => item.toJSON()))
       )
-    }
   })
 }
 
@@ -268,23 +275,6 @@ export const useEnrichedBookState = ({
   )
 }
 
-/**
- * @deprecated
- */
-export const useDownloadedBookWithUnsafeProtectedIdsState = () => {
-  const downloadState = useSignalValue(booksDownloadStateSignal)
-  const { data: books } = useBooks()
-
-  return useMemo(
-    () =>
-      books?.filter(
-        (book) =>
-          downloadState[book._id]?.downloadState === DownloadState.Downloaded
-      ),
-    [downloadState, books]
-  )
-}
-
 /**
  * @deprecated
  */
@@ -296,7 +286,11 @@ export const useBooksAsArrayState = ({
   >
 }) => {
   const { data: books = {}, isPending } = useBooksDic()
-  const visibleBookIds = useVisibleBookIds() ?? []
+  const { data: visibleBooks } = useBooks()
+  const visibleBookIds = useMemo(
+    () => visibleBooks?.map((item) => item._id) ?? [],
+    [visibleBooks]
+  )
 
   const bookResult: (BookQueryResult & {
     downloadState: ReturnType<typeof getBookDownloadsState>
@@ -325,27 +319,6 @@ export const useBooksAsArrayState = ({
   }
 }
 
-export const useVisibleBookIds = (
-  params: Parameters<typeof useVisibleBooks>[0] = {}
-) => {
-  return useVisibleBooks(params).data?.map((book) => book._id)
-}
-
-/**
- * @deprecated
- */
-export const useBookTagsState = ({
-  bookId,
-  tags = {}
-}: {
-  bookId: string
-  tags: ReturnType<typeof useTagsByIds>["data"]
-}) => {
-  const { data: book } = useBook({ id: bookId })
-
-  return book?.tags?.map((id) => tags[id]).filter(isDefined)
-}
-
 /**
  * @deprecated
  */
@@ -365,4 +338,3 @@ export const useBookLinksState = ({
 export const books$ = latestDatabase$.pipe(
   switchMap((database) => database?.book.find({}).$)
 )
-

packages/web/src/collections/CollectionDetailsScreen.tsx

@@ -4,7 +4,6 @@ import { useNavigate, useParams } from "react-router-dom"
 import EmptyLibraryAsset from "../assets/empty-library.svg"
 import CollectionBgSvg from "../assets/series-bg.svg"
 import { BookListWithControls } from "../books/bookList/BookListWithControls"
-import { useVisibleBookIds } from "../books/states"
 import { signal, useSignalValue } from "reactjrx"
 import {
   ListActionSorting,
@@ -13,6 +12,8 @@ import {
 import { useCollectionActionsDrawer } from "./CollectionActionsDrawer/useCollectionActionsDrawer"
 import { useCollection } from "./useCollection"
 import { COLLECTION_EMPTY_ID } from "../constants.shared"
+import { useMemo } from "react"
+import { useBooks } from "../books/states"
 
 type ScreenParams = {
   id: string
@@ -40,10 +41,15 @@ export const CollectionDetailsScreen = () => {
     id
   })
 
-  const visibleBooks = useVisibleBookIds({
+  const { data: visibleBooks } = useBooks({
     ids: collection?.books ?? []
   })
 
+  const visibleBookIds = useMemo(
+    () => visibleBooks?.map((item) => item._id) ?? [],
+    [visibleBooks]
+  )
+
   const { open: openActionDrawer } = useCollectionActionsDrawer(
     id,
     (changes) => {
@@ -110,7 +116,7 @@ export const CollectionDetailsScreen = () => {
             </div>
           </Box>
           <BookListWithControls
-            data={visibleBooks ?? []}
+            data={visibleBookIds}
             sorting={sorting}
             viewMode={viewMode}
             onViewModeChange={(value) => {

packages/web/src/collections/useCollections.ts

@@ -2,7 +2,7 @@ import { CollectionDocType, directives, ReadingStateState } from "@oboku/shared"
 import { useLocalSettings } from "../settings/states"
 import { useForeverQuery, useSignalValue } from "reactjrx"
 import { latestDatabase$ } from "../rxdb/useCreateDatabase"
-import { map, switchMap } from "rxjs"
+import { map, switchMap, tap } from "rxjs"
 import { MangoQuery } from "rxdb"
 import { getMetadataFromCollection } from "./getMetadataFromCollection"
 import { DeepReadonlyArray } from "rxdb/dist/types/types"
@@ -18,6 +18,7 @@ export const useCollections = ({
   ids,
   isNotInterested,
   readingState = "any",
+  includeProtected: _includeProtected,
   ...options
 }: {
   queryObj?: MangoQuery<CollectionDocType>
@@ -31,12 +32,14 @@ export const useCollections = ({
   isNotInterested?: "with" | "none" | "only" | undefined
   readingState?: "ongoing" | "finished" | "any"
   ids?: DeepReadonlyArray<string>
+  includeProtected?: boolean
 } = {}) => {
   const { hideDirectivesFromCollectionName } = useLocalSettings()
   const serializedBookIds = JSON.stringify(bookIds)
   const serializedIds = JSON.stringify(ids)
   const { isLibraryUnlocked } = useSignalValue(libraryStateSignal)
   const { showCollectionWithProtectedContent } = useLocalSettings()
+  const includeProtected = _includeProtected || isLibraryUnlocked
 
   return useForeverQuery({
     queryKey: [
@@ -47,7 +50,7 @@ export const useCollections = ({
         serializedBookIds,
         serializedIds,
         showCollectionWithProtectedContent,
-        isLibraryUnlocked,
+        includeProtected,
         hideDirectivesFromCollectionName,
         isNotInterested
       },
@@ -64,11 +67,10 @@ export const useCollections = ({
            */
           observeBooks({
             db,
-            includeProtected: isLibraryUnlocked
-            // isNotInterested
+            includeProtected
           }).pipe(
             switchMap((books) => {
-              const protectedBookIds = books.map(({ _id }) => _id)
+              const visibleBooks = books.map(({ _id }) => _id)
               const notInterestedBookIds = books
                 .filter(({ isNotInterested }) => !!isNotInterested)
                 .map(({ _id }) => _id)
@@ -99,7 +101,7 @@ export const useCollections = ({
                 map((collections) =>
                   collections.filter((collection) => {
                     if (
-                      isLibraryUnlocked ||
+                      includeProtected ||
                       collection.books.length === 0 ||
                       showCollectionWithProtectedContent === "hasNormalContent"
                     )
@@ -111,7 +113,7 @@ export const useCollections = ({
                      */
                     const extraBooksFromCollection = difference(
                       collection.books,
-                      protectedBookIds
+                      visibleBooks
                     )
 
                     const hasSuspiciousExtraBook =

packages/web/src/download/useDownloadedBooks.ts

@@ -0,0 +1,18 @@
+import { useMemo } from "react"
+import { useSignalValue } from "reactjrx"
+import { useBooks } from "../books/states"
+import { booksDownloadStateSignal, DownloadState } from "./states"
+
+export const useDownloadedBooks = () => {
+  const downloadState = useSignalValue(booksDownloadStateSignal)
+  const { data: books } = useBooks()
+
+  return useMemo(
+    () =>
+      books?.filter(
+        (book) =>
+          downloadState[book._id]?.downloadState === DownloadState.Downloaded
+      ),
+    [downloadState, books]
+  )
+}

packages/web/src/home/helpers.ts

@@ -2,12 +2,12 @@ import { useMemo } from "react"
 import { ReadingStateState } from "@oboku/shared"
 import { useBooksSortedBy } from "../books/helpers"
 import { useProtectedTagIds } from "../tags/helpers"
-import { useVisibleBooks } from "../books/useVisibleBooks"
+import { useBooks } from "../books/states"
 
 export const useContinueReadingBooks = () => {
   const { isPending } = useProtectedTagIds()
 
-  const { data: booksAsArray, isLoading: isBooksPending } = useVisibleBooks({
+  const { data: booksAsArray, isLoading: isBooksPending } = useBooks({
     isNotInterested: "none"
   })
   const booksSortedByDate = useBooksSortedBy(booksAsArray, "activity")
@@ -28,7 +28,7 @@ export const useContinueReadingBooks = () => {
 }
 
 export const useRecentlyAddedBooks = () => {
-  const { data: booksAsArray } = useVisibleBooks({
+  const { data: booksAsArray } = useBooks({
     isNotInterested: "none"
   })
 

packages/web/src/library/collections/LibraryCollectionScreen.tsx → packages/web/src/library/shelves/LibraryCollectionScreen.tsx

@@ -15,7 +15,7 @@ import { useMeasureElement } from "../../common/utils"
 import { CollectionList } from "../../collections/list/CollectionList"
 import { useDebouncedCallback } from "use-debounce"
 import { signal, useSignalValue } from "reactjrx"
-import { useShelve } from "./useShelve"
+import { useShelves } from "./useShelves"
 import { FilterBar } from "./FilterBar"
 import { useCreateCollection } from "../../collections/useCreateCollection"
 import { collectionsListSignal } from "./state"
@@ -48,7 +48,7 @@ export const LibraryCollectionScreen = () => {
     collectionsListSignal,
     ({ viewMode }) => ({ viewMode })
   )
-  const { data: collections = [] } = useShelve()
+  const { data: collections = [] } = useShelves()
 
   const onScroll = useDebouncedCallback((value: Scroll) => {
     libraryCollectionScreenPreviousScrollState.setValue(value)

packages/web/src/library/collections/useShelve.ts → packages/web/src/library/shelves/useShelves.ts

@@ -6,7 +6,7 @@ import { collectionsListSignal } from "./state"
 import { useCollection } from "../../collections/useCollection"
 import { COLLECTION_EMPTY_ID } from "../../constants.shared"
 
-export const useShelve = () => {
+export const useShelves = () => {
   const { showNotInterestedCollections } = useSignalValue(
     libraryStateSignal,
     ({ showNotInterestedCollections }) => ({ showNotInterestedCollections })

packages/web/src/navigation/AppNavigator.tsx

@@ -25,7 +25,7 @@ import { StatisticsScreen } from "../settings/StatisticsScreen"
 import { BackToReadingDialog } from "../reading/BackToReadingDialog"
 import { ProblemsScreen } from "../problems/ProblemsScreen"
 import { LibraryBooksScreen } from "../library/LibraryBooksScreen"
-import { LibraryCollectionScreen } from "../library/collections/LibraryCollectionScreen"
+import { LibraryCollectionScreen } from "../library/shelves/LibraryCollectionScreen"
 import { LibraryTagsScreen } from "../library/LibraryTagsScreen"
 import { memo, useEffect, useRef } from "react"
 import { UnlockLibraryDialog } from "../auth/UnlockLibraryDialog"