retold-remote 0.0.1 → 0.0.2

package/source/cli/commands/RetoldRemote-Command-Serve.js

@@ -21,6 +21,17 @@ class RetoldRemoteCommandServe extends libCommandLineCommand
 		this.options.CommandOptions.push(
 			{ Name: '-H, --hashed-filenames', Description: 'Enable hashed filenames mode (short hashes instead of full paths in URLs).', Default: false });
 
+		this.options.CommandOptions.push(
+			{ Name: '-c, --cache-path [path]', Description: 'Root cache directory (defaults to ./dist/retold-cache/).', Default: '' });
+		this.options.CommandOptions.push(
+			{ Name: '--cache-thumbnails [path]', Description: 'Override thumbnails cache directory.', Default: '' });
+		this.options.CommandOptions.push(
+			{ Name: '--cache-archives [path]', Description: 'Override archives cache directory.', Default: '' });
+		this.options.CommandOptions.push(
+			{ Name: '--cache-video-frames [path]', Description: 'Override video-frames cache directory.', Default: '' });
+		this.options.CommandOptions.push(
+			{ Name: '--cache-audio-waveforms [path]', Description: 'Override audio-waveforms cache directory.', Default: '' });
+
 		this.addCommand();
 	}
 
@@ -51,12 +62,34 @@ class RetoldRemoteCommandServe extends libCommandLineCommand
 
 		let tmpHashedFilenames = !!(this.CommandOptions.hashedFilenames);
 
+		// Resolve cache paths: individual overrides > root override > default
+		let tmpCacheRoot = this.CommandOptions.cachePath
+			? libPath.resolve(this.CommandOptions.cachePath)
+			: null;
+		let tmpCacheThumbnails = this.CommandOptions.cacheThumbnails
+			? libPath.resolve(this.CommandOptions.cacheThumbnails)
+			: null;
+		let tmpCacheArchives = this.CommandOptions.cacheArchives
+			? libPath.resolve(this.CommandOptions.cacheArchives)
+			: null;
+		let tmpCacheVideoFrames = this.CommandOptions.cacheVideoFrames
+			? libPath.resolve(this.CommandOptions.cacheVideoFrames)
+			: null;
+		let tmpCacheAudioWaveforms = this.CommandOptions.cacheAudioWaveforms
+			? libPath.resolve(this.CommandOptions.cacheAudioWaveforms)
+			: null;
+
 		tmpSetupServer(
 			{
 				ContentPath: tmpContentPath,
 				DistPath: tmpDistPath,
 				Port: tmpPort,
-				HashedFilenames: tmpHashedFilenames
+				HashedFilenames: tmpHashedFilenames,
+				CacheRoot: tmpCacheRoot,
+				CacheThumbnails: tmpCacheThumbnails,
+				CacheArchives: tmpCacheArchives,
+				CacheVideoFrames: tmpCacheVideoFrames,
+				CacheAudioWaveforms: tmpCacheAudioWaveforms
 			},
 			function (pError, pServerInfo)
 			{

package/source/providers/Pict-Provider-GalleryFilterSort.js

@@ -84,6 +84,44 @@ class GalleryFilterSortProvider extends libPictProvider
 			return pItems;
 		}
 
+		let tmpRemote = this.pict.AppData.RetoldRemote;
+		let tmpCaseSensitive = tmpRemote.SearchCaseSensitive || false;
+		let tmpRegex = tmpRemote.SearchRegex || false;
+
+		if (tmpRegex)
+		{
+			// Regex mode
+			let tmpRegexObj;
+			try
+			{
+				tmpRegexObj = new RegExp(pQuery, tmpCaseSensitive ? '' : 'i');
+			}
+			catch (pError)
+			{
+				// Invalid regex — store error for UI feedback and return all items
+				tmpRemote._searchRegexError = pError.message;
+				return pItems;
+			}
+
+			tmpRemote._searchRegexError = null;
+			return pItems.filter((pItem) =>
+			{
+				return tmpRegexObj.test(pItem.Name);
+			});
+		}
+
+		// Plain text mode
+		tmpRemote._searchRegexError = null;
+
+		if (tmpCaseSensitive)
+		{
+			return pItems.filter((pItem) =>
+			{
+				return pItem.Name.includes(pQuery);
+			});
+		}
+
+		// Default: case-insensitive substring match
 		let tmpQuery = pQuery.toLowerCase();
 		return pItems.filter((pItem) =>
 		{
@@ -103,7 +141,7 @@ class GalleryFilterSortProvider extends libPictProvider
 
 		return pItems.filter((pItem) =>
 		{
-			if (pItem.Type === 'folder')
+			if (pItem.Type === 'folder' || pItem.Type === 'archive')
 			{
 				return true;
 			}
@@ -138,7 +176,7 @@ class GalleryFilterSortProvider extends libPictProvider
 
 		return pItems.filter((pItem) =>
 		{
-			if (pItem.Type === 'folder')
+			if (pItem.Type === 'folder' || pItem.Type === 'archive')
 			{
 				return true;
 			}
@@ -159,7 +197,7 @@ class GalleryFilterSortProvider extends libPictProvider
 
 		return pItems.filter((pItem) =>
 		{
-			if (pItem.Type === 'folder')
+			if (pItem.Type === 'folder' || pItem.Type === 'archive')
 			{
 				return true;
 			}
@@ -193,7 +231,7 @@ class GalleryFilterSortProvider extends libPictProvider
 
 		return pItems.filter((pItem) =>
 		{
-			if (pItem.Type === 'folder')
+			if (pItem.Type === 'folder' || pItem.Type === 'archive')
 			{
 				return true;
 			}
@@ -229,11 +267,13 @@ class GalleryFilterSortProvider extends libPictProvider
 
 		return pItems.slice().sort((pA, pB) =>
 		{
-			// 'folder-first' mode: folders always sort before files
+			// 'folder-first' mode: containers (folders + archives) always sort before files
 			if (pSortField === 'folder-first')
 			{
-				if (pA.Type === 'folder' && pB.Type !== 'folder') return -1;
-				if (pA.Type !== 'folder' && pB.Type === 'folder') return 1;
+				let tmpAIsContainer = (pA.Type === 'folder' || pA.Type === 'archive');
+				let tmpBIsContainer = (pB.Type === 'folder' || pB.Type === 'archive');
+				if (tmpAIsContainer && !tmpBIsContainer) return -1;
+				if (!tmpAIsContainer && tmpBIsContainer) return 1;
 				// Both same type: sort by name ascending
 				let tmpNameA = (pA.Name || '').toLowerCase();
 				let tmpNameB = (pB.Name || '').toLowerCase();
@@ -316,7 +356,7 @@ class GalleryFilterSortProvider extends libPictProvider
 		for (let i = 0; i < tmpRaw.length; i++)
 		{
 			let tmpItem = tmpRaw[i];
-			if (tmpItem.Type === 'folder')
+			if (tmpItem.Type === 'folder' || tmpItem.Type === 'archive')
 			{
 				continue;
 			}
@@ -417,7 +457,15 @@ class GalleryFilterSortProvider extends libPictProvider
 		// Search query
 		if (tmpRemote.SearchQuery)
 		{
-			tmpChips.push({ key: 'search', label: 'Search: "' + tmpRemote.SearchQuery + '"' });
+			let tmpSearchLabel = 'Search: "' + tmpRemote.SearchQuery + '"';
+			let tmpSearchFlags = [];
+			if (tmpRemote.SearchCaseSensitive) tmpSearchFlags.push('Aa');
+			if (tmpRemote.SearchRegex) tmpSearchFlags.push('.*');
+			if (tmpSearchFlags.length > 0)
+			{
+				tmpSearchLabel += ' [' + tmpSearchFlags.join(', ') + ']';
+			}
+			tmpChips.push({ key: 'search', label: tmpSearchLabel });
 		}
 
 		return tmpChips;
@@ -487,6 +535,7 @@ class GalleryFilterSortProvider extends libPictProvider
 		else if (pKey === 'search')
 		{
 			tmpRemote.SearchQuery = '';
+			tmpRemote._searchRegexError = null;
 		}
 	}
 
@@ -502,6 +551,9 @@ class GalleryFilterSortProvider extends libPictProvider
 		}
 
 		tmpRemote.SearchQuery = '';
+		tmpRemote.SearchCaseSensitive = false;
+		tmpRemote.SearchRegex = false;
+		tmpRemote._searchRegexError = null;
 		tmpRemote.GalleryFilter = 'all';
 		tmpRemote.FilterState =
 		{