Merge remote-tracking branch 'origin/develop' into experimental

core/src/filesystem/scanner/library_scan_job.rs

@@ -404,10 +404,16 @@ impl JobExt for LibraryScanJob {
 				// If the library is not collection-priority, each subdirectory is its own series.
 				// Therefore, we only scan one level deep when walking a series whose library is not
 				// collection-priority to avoid scanning duplicates which are part of other series
-				let max_depth = self
+				let mut max_depth = self
 					.config
 					.as_ref()
 					.and_then(|o| (!o.is_collection_based()).then_some(1));
+				if path_buf == PathBuf::from(&self.path) {
+					// The exception is when the series "is" the libray (i.e. the root of the library contains
+					// books). This is kind of an anti-pattern wrt collection-priority, but it needs to be handled
+					// in order to avoid the scanner re-scanning the entire library...
+					max_depth = Some(1);
+				}
 
 				let Some(Ok(ignore_rules)) =
 					self.config.as_ref().map(|o| o.ignore_rules.build())

core/src/filesystem/scanner/series_scan_job.rs

@@ -102,6 +102,7 @@ impl JobExt for SeriesScanJob {
 		ctx: &WorkerCtx,
 	) -> Result<WorkingState<Self::Output, Self::Task>, JobError> {
 		let mut output = Self::Output::default();
+		let path_buf = PathBuf::from(self.path.clone());
 		let library = ctx
 			.db
 			.library()
@@ -123,7 +124,13 @@ impl JobExt for SeriesScanJob {
 		// If the library is not collection-priority, each subdirectory is its own series.
 		// Therefore, we only scan one level deep when walking a series whose library is not
 		// collection-priority to avoid scanning duplicates which are part of other series
-		let max_depth = (!library_config.is_collection_based()).then_some(1);
+		let mut max_depth = (!library_config.is_collection_based()).then_some(1);
+		if path_buf == PathBuf::from(&library.path) {
+			// The exception is when the series "is" the libray (i.e. the root of the library contains
+			// books). This is kind of an anti-pattern wrt collection-priority, but it needs to be handled
+			// in order to avoid the scanner re-scanning the entire library...
+			max_depth = Some(1);
+		}
 
 		self.config = Some(library_config);
 

packages/browser/src/components/readers/imageBased/paged/PageSet.tsx

@@ -45,6 +45,7 @@ const PageSet = forwardRef<HTMLDivElement, Props>(
 		const renderSet = () => {
 			const shouldDisplayDoubleSpread =
 				displayedPages.length > 1 &&
+				currentPage != 1 &&
 				dimensionSet.every((dimensions) => !dimensions || dimensions.isPortrait)
 
 			if (shouldDisplayDoubleSpread) {

packages/browser/src/components/readers/imageBased/paged/PagedReader.tsx

@@ -51,11 +51,17 @@ function PagedReader({ currentPage, media, onPageChange, getPageUrl }: PagedRead
 	const pageSetRef = useRef<HTMLDivElement | null>(null)
 
 	// TODO: this needs to be aware of overflow / if the page is too small to render double spread
-	const displayedPages = useMemo(
-		() =>
-			doubleSpread ? [currentPage, currentPage + 1].filter((p) => p <= media.pages) : [currentPage],
-		[currentPage, doubleSpread, media.pages],
-	)
+	const displayedPages = useMemo(() => {
+		if (readingDirection === 'ltr') {
+			return doubleSpread
+				? [currentPage, currentPage + 1].filter((p) => p <= media.pages)
+				: [currentPage]
+		} else {
+			return doubleSpread
+				? [currentPage + 1, currentPage].filter((p) => p <= media.pages)
+				: [currentPage]
+		}
+	}, [currentPage, doubleSpread, media.pages])
 
 	/**
 	 * If the image parts are collective >= 80% of the screen width, we want to fix the side navigation
@@ -91,7 +97,8 @@ function PagedReader({ currentPage, media, onPageChange, getPageUrl }: PagedRead
 	 */
 	const handleLeftwardPageChange = useCallback(() => {
 		const direction = readingDirection === 'ltr' ? -1 : 1
-		if (doubleSpread) {
+		const skip = readingDirection === 'ltr' ? 2 : 1
+		if (doubleSpread && currentPage > skip) {
 			const adjustedForBounds = currentPage + direction * 2 < 1 ? 1 : currentPage + direction * 2
 			doChangePage(adjustedForBounds)
 		} else {
@@ -104,7 +111,8 @@ function PagedReader({ currentPage, media, onPageChange, getPageUrl }: PagedRead
 	 */
 	const handleRightwardPageChange = useCallback(() => {
 		const direction = readingDirection === 'ltr' ? 1 : -1
-		if (doubleSpread) {
+		const skip = readingDirection === 'ltr' ? 1 : 2
+		if (doubleSpread && currentPage > skip) {
 			const adjustedForBounds =
 				currentPage + direction * 2 > media.pages ? media.pages : currentPage + direction * 2
 			doChangePage(adjustedForBounds)