retold-remote 0.0.3 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "retold-remote",
-	"version": "0.0.3",
+	"version": "0.0.5",
 	"description": "Retold Remote - NAS media browser with gallery views and keyboard navigation",
 	"main": "source/Pict-RetoldRemote-Bundle.js",
 	"bin": {
@@ -37,7 +37,7 @@
 		"pict-section-filebrowser": "^0.0.2",
 		"pict-service-commandlineutility": "^1.0.19",
 		"pict-view": "^1.0.67",
-		"retold-content-system": "^1.0.4",
+		"retold-content-system": "^1.0.8",
 		"yauzl": "^3.2.0"
 	},
 	"optionalDependencies": {

package/source/Pict-Application-RetoldRemote.js

@@ -20,6 +20,7 @@ const libViewMediaViewer = require('./views/PictView-Remote-MediaViewer.js');
 const libViewImageViewer = require('./views/PictView-Remote-ImageViewer.js');
 const libViewVideoExplorer = require('./views/PictView-Remote-VideoExplorer.js');
 const libViewAudioExplorer = require('./views/PictView-Remote-AudioExplorer.js');
+const libViewVLCSetup = require('./views/PictView-Remote-VLCSetup.js');
 
 // Application configuration
 const _DefaultConfiguration = require('./Pict-Application-RetoldRemote-Configuration.json');
@@ -51,6 +52,7 @@ class RetoldRemoteApplication extends libContentEditorApplication
 		this.pict.addView('RetoldRemote-SettingsPanel', libViewSettingsPanel.default_configuration, libViewSettingsPanel);
 		this.pict.addView('RetoldRemote-VideoExplorer', libViewVideoExplorer.default_configuration, libViewVideoExplorer);
 		this.pict.addView('RetoldRemote-AudioExplorer', libViewAudioExplorer.default_configuration, libViewAudioExplorer);
+		this.pict.addView('RetoldRemote-VLCSetup', libViewVLCSetup.default_configuration, libViewVLCSetup);
 
 		// Add new providers
 		this.pict.addProvider('RetoldRemote-Provider', libProviderRetoldRemote.default_configuration, libProviderRetoldRemote);
@@ -78,6 +80,7 @@ class RetoldRemoteApplication extends libContentEditorApplication
 			RawFileList: [],                // Unfiltered server response
 			GalleryItems: [],               // Filtered+sorted file list (single source of truth)
 			GalleryCursorIndex: 0,          // Currently highlighted item
+			FolderCursorHistory: {},        // Map of folder path -> last cursor index
 			GalleryFilter: 'all',           // 'all', 'images', 'video', 'audio', 'documents'
 			SearchQuery: '',
 			SearchCaseSensitive: false,
@@ -356,6 +359,44 @@ class RetoldRemoteApplication extends libContentEditorApplication
 		}
 	}
 
+	/**
+	 * Navigate to a file with an explicit media type override, bypassing
+	 * extension-based detection.
+	 *
+	 * @param {string} pFilePath - Relative file path
+	 * @param {string} pMediaType - 'image', 'video', 'audio', or 'text'
+	 */
+	navigateToFileAs(pFilePath, pMediaType)
+	{
+		if (!pFilePath)
+		{
+			return;
+		}
+
+		let tmpRemote = this.pict.AppData.RetoldRemote;
+
+		// Update the hash
+		let tmpFragProvider = this.pict.providers['RetoldRemote-Provider'];
+		let tmpFragId = tmpFragProvider ? tmpFragProvider.getFragmentIdentifier(pFilePath) : pFilePath;
+		window.location.hash = '#/view/' + tmpFragId;
+
+		// Update parent state for compatibility
+		this.pict.AppData.ContentEditor.CurrentFile = pFilePath;
+		this.pict.AppData.ContentEditor.ActiveEditor = 'binary';
+
+		let tmpViewer = this.pict.views['RetoldRemote-MediaViewer'];
+		if (tmpViewer)
+		{
+			tmpViewer.showMedia(pFilePath, pMediaType);
+		}
+
+		let tmpTopBar = this.pict.views['ContentEditor-TopBar'];
+		if (tmpTopBar)
+		{
+			tmpTopBar.updateInfo();
+		}
+	}
+
 	/**
 	 * Override loadFileList to also populate the gallery and fetch folder summary.
 	 */
@@ -467,7 +508,8 @@ class RetoldRemoteApplication extends libContentEditorApplication
 				{
 					// Fallback if provider not ready
 					tmpRemote.GalleryItems = pFileList || [];
-					tmpRemote.GalleryCursorIndex = 0;
+					let tmpSavedIndex = tmpRemote.FolderCursorHistory && tmpRemote.FolderCursorHistory[tmpSelf.pict.AppData.PictFileBrowser.CurrentLocation || ''];
+					tmpRemote.GalleryCursorIndex = (typeof tmpSavedIndex === 'number' && tmpSavedIndex < (pFileList || []).length) ? tmpSavedIndex : 0;
 					let tmpGalleryView = tmpSelf.pict.views['RetoldRemote-Gallery'];
 					if (tmpGalleryView)
 					{

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

@@ -1,7 +1,7 @@
 const libPictProvider = require('pict-provider');
 
 const _ImageExtensions = { 'png': true, 'jpg': true, 'jpeg': true, 'gif': true, 'webp': true, 'svg': true, 'bmp': true, 'ico': true, 'avif': true, 'tiff': true, 'tif': true };
-const _VideoExtensions = { 'mp4': true, 'webm': true, 'mov': true, 'mkv': true, 'avi': true, 'wmv': true, 'flv': true, 'm4v': true };
+const _VideoExtensions = { 'mp4': true, 'webm': true, 'mov': true, 'mkv': true, 'avi': true, 'wmv': true, 'flv': true, 'm4v': true, 'ogv': true, 'mpg': true, 'mpeg': true, 'mpe': true, 'mpv': true, 'm2v': true, 'ts': true, 'mts': true, 'm2ts': true, 'vob': true, '3gp': true, '3g2': true, 'f4v': true, 'rm': true, 'rmvb': true, 'divx': true, 'asf': true, 'mxf': true, 'dv': true, 'nsv': true, 'nuv': true, 'y4m': true, 'wtv': true, 'swf': true, 'dat': true };
 const _AudioExtensions = { 'mp3': true, 'wav': true, 'ogg': true, 'flac': true, 'aac': true, 'm4a': true, 'wma': true };
 const _DocumentExtensions = { 'pdf': true, 'epub': true, 'mobi': true };
 
@@ -60,7 +60,18 @@ class GalleryFilterSortProvider extends libPictProvider
 
 		// Write result
 		tmpRemote.GalleryItems = tmpItems;
-		tmpRemote.GalleryCursorIndex = 0;
+
+		// Restore cursor position if we have a saved one for this folder
+		let tmpCurrentLocation = (this.pict.AppData.PictFileBrowser && this.pict.AppData.PictFileBrowser.CurrentLocation) || '';
+		let tmpSavedIndex = tmpRemote.FolderCursorHistory && tmpRemote.FolderCursorHistory[tmpCurrentLocation];
+		if (typeof tmpSavedIndex === 'number' && tmpSavedIndex < tmpItems.length)
+		{
+			tmpRemote.GalleryCursorIndex = tmpSavedIndex;
+		}
+		else
+		{
+			tmpRemote.GalleryCursorIndex = 0;
+		}
 
 		// Re-render gallery
 		let tmpGalleryView = this.pict.views['RetoldRemote-Gallery'];

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

@@ -234,6 +234,26 @@ class GalleryNavigationProvider extends libPictProvider
 				this.moveCursor(tmpItems.length - 1);
 				break;
 
+			case '1':
+				pEvent.preventDefault();
+				this.openCurrentAs('image');
+				break;
+
+			case '2':
+				pEvent.preventDefault();
+				this.openCurrentAs('video');
+				break;
+
+			case '3':
+				pEvent.preventDefault();
+				this.openCurrentAs('audio');
+				break;
+
+			case '4':
+				pEvent.preventDefault();
+				this.openCurrentAs('text');
+				break;
+
 			case 'f':
 				pEvent.preventDefault();
 				{
@@ -415,6 +435,66 @@ class GalleryNavigationProvider extends libPictProvider
 	 */
 	_handleViewerKey(pEvent)
 	{
+		let tmpRemote = this.pict.AppData.RetoldRemote;
+
+		// Video action menu mode — intercept keys for menu options
+		if (tmpRemote.VideoMenuActive && tmpRemote.CurrentViewerMediaType === 'video')
+		{
+			switch (pEvent.key)
+			{
+				case 'Escape':
+					pEvent.preventDefault();
+					this.closeViewer();
+					return;
+
+				case 'ArrowRight':
+				case 'j':
+					pEvent.preventDefault();
+					this.nextFile();
+					return;
+
+				case 'ArrowLeft':
+				case 'k':
+					pEvent.preventDefault();
+					this.prevFile();
+					return;
+
+				case 'e':
+					pEvent.preventDefault();
+					let tmpVEX = this.pict.views['RetoldRemote-VideoExplorer'];
+					if (tmpVEX)
+					{
+						tmpVEX.showExplorer(tmpRemote.CurrentViewerFile);
+					}
+					return;
+
+				case ' ':
+				case 'Enter':
+					pEvent.preventDefault();
+					let tmpViewer = this.pict.views['RetoldRemote-MediaViewer'];
+					if (tmpViewer)
+					{
+						tmpViewer.playVideo();
+					}
+					return;
+
+				case 't':
+					pEvent.preventDefault();
+					let tmpMediaViewer = this.pict.views['RetoldRemote-MediaViewer'];
+					if (tmpMediaViewer)
+					{
+						tmpMediaViewer.loadVideoMenuFrame();
+					}
+					return;
+
+				case 'v':
+					pEvent.preventDefault();
+					this._streamWithVLC();
+					return;
+			}
+			return;
+		}
+
 		switch (pEvent.key)
 		{
 			case 'Escape':
@@ -472,13 +552,38 @@ class GalleryNavigationProvider extends libPictProvider
 
 			case 'Enter':
 				pEvent.preventDefault();
-				this._openWithVLC();
+				this._streamWithVLC();
+				break;
+
+			case 'v':
+				pEvent.preventDefault();
+				this._streamWithVLC();
 				break;
 
 			case 'd':
 				pEvent.preventDefault();
 				this._toggleDistractionFree();
 				break;
+
+			case '1':
+				pEvent.preventDefault();
+				this.switchViewerType('image');
+				break;
+
+			case '2':
+				pEvent.preventDefault();
+				this.switchViewerType('video');
+				break;
+
+			case '3':
+				pEvent.preventDefault();
+				this.switchViewerType('audio');
+				break;
+
+			case '4':
+				pEvent.preventDefault();
+				this.switchViewerType('text');
+				break;
 		}
 	}
 
@@ -601,6 +706,10 @@ class GalleryNavigationProvider extends libPictProvider
 
 		if (tmpItem.Type === 'folder' || tmpItem.Type === 'archive')
 		{
+			// Remember cursor position in the current folder before navigating away
+			let tmpCurrentLocation = (this.pict.AppData.PictFileBrowser && this.pict.AppData.PictFileBrowser.CurrentLocation) || '';
+			tmpRemote.FolderCursorHistory[tmpCurrentLocation] = tmpIndex;
+
 			// Navigate into the folder or archive
 			let tmpApp = this.pict.PictApplication;
 			if (tmpApp && tmpApp.loadFileList)
@@ -619,6 +728,59 @@ class GalleryNavigationProvider extends libPictProvider
 		}
 	}
 
+	/**
+	 * Open the currently selected gallery item, forcing a specific media type
+	 * regardless of its file extension.
+	 *
+	 * @param {string} pMediaType - 'image', 'video', 'audio', or 'text'
+	 */
+	openCurrentAs(pMediaType)
+	{
+		let tmpRemote = this.pict.AppData.RetoldRemote;
+		let tmpItems = tmpRemote.GalleryItems || [];
+		let tmpIndex = tmpRemote.GalleryCursorIndex || 0;
+
+		if (tmpIndex >= tmpItems.length)
+		{
+			return;
+		}
+
+		let tmpItem = tmpItems[tmpIndex];
+
+		if (tmpItem.Type === 'folder' || tmpItem.Type === 'archive')
+		{
+			return;
+		}
+
+		let tmpApp = this.pict.PictApplication;
+		if (tmpApp && tmpApp.navigateToFileAs)
+		{
+			tmpApp.navigateToFileAs(tmpItem.Path, pMediaType);
+		}
+	}
+
+	/**
+	 * Re-open the currently viewed file with a different media type.
+	 *
+	 * @param {string} pMediaType - 'image', 'video', 'audio', or 'text'
+	 */
+	switchViewerType(pMediaType)
+	{
+		let tmpRemote = this.pict.AppData.RetoldRemote;
+		let tmpFilePath = tmpRemote.CurrentViewerFile;
+
+		if (!tmpFilePath)
+		{
+			return;
+		}
+
+		let tmpViewer = this.pict.views['RetoldRemote-MediaViewer'];
+		if (tmpViewer)
+		{
+			tmpViewer.showMedia(tmpFilePath, pMediaType);
+		}
+	}
+
 	/**
 	 * Navigate up one directory level.
 	 */
@@ -631,6 +793,10 @@ class GalleryNavigationProvider extends libPictProvider
 			return;
 		}
 
+		// Remember cursor position in the current folder before navigating away
+		let tmpRemote = this.pict.AppData.RetoldRemote;
+		tmpRemote.FolderCursorHistory[tmpCurrentLocation] = tmpRemote.GalleryCursorIndex || 0;
+
 		let tmpParent = tmpCurrentLocation.indexOf('/') >= 0
 			? tmpCurrentLocation.replace(/\/[^/]+\/?$/, '')
 			: '';
@@ -1276,6 +1442,47 @@ class GalleryNavigationProvider extends libPictProvider
 		});
 	}
 
+	/**
+	 * Stream the current media file to VLC on the client device via vlc:// protocol link.
+	 */
+	_streamWithVLC()
+	{
+		let tmpRemote = this.pict.AppData.RetoldRemote;
+		let tmpMediaType = tmpRemote.CurrentViewerMediaType;
+
+		if (tmpMediaType !== 'video' && tmpMediaType !== 'audio')
+		{
+			return;
+		}
+
+		let tmpFilePath = tmpRemote.CurrentViewerFile;
+		if (!tmpFilePath)
+		{
+			return;
+		}
+
+		let tmpProvider = this.pict.providers['RetoldRemote-Provider'];
+		let tmpContentPath = tmpProvider ? tmpProvider.getContentURL(tmpFilePath) : ('/content/' + encodeURIComponent(tmpFilePath));
+		let tmpStreamURL = window.location.origin + tmpContentPath;
+		// On Windows, VLC's native handler expects the raw URL.
+		// On macOS/Linux our custom handlers URL-decode, so we encode.
+		let tmpIsWindows = /Windows/.test(navigator.userAgent);
+		let tmpVLCURL = tmpIsWindows
+			? ('vlc://' + tmpStreamURL)
+			: ('vlc://' + encodeURIComponent(tmpStreamURL));
+
+		this._showToast('Opening VLC...');
+
+		// Use a temporary anchor element to trigger the protocol handler
+		// without navigating the current page away
+		let tmpLink = document.createElement('a');
+		tmpLink.href = tmpVLCURL;
+		tmpLink.style.display = 'none';
+		document.body.appendChild(tmpLink);
+		tmpLink.click();
+		document.body.removeChild(tmpLink);
+	}
+
 	/**
 	 * Show a brief toast notification in the viewer.
 	 *

package/source/server/RetoldRemote-MediaService.js

@@ -19,7 +19,7 @@ const libToolDetector = require('./RetoldRemote-ToolDetector.js');
 const libThumbnailCache = require('./RetoldRemote-ThumbnailCache.js');
 
 const _ImageExtensions = { 'png': true, 'jpg': true, 'jpeg': true, 'gif': true, 'webp': true, 'svg': true, 'bmp': true, 'ico': true, 'avif': true, 'tiff': true, 'tif': true, 'heic': true, 'heif': true };
-const _VideoExtensions = { 'mp4': true, 'webm': true, 'mov': true, 'mkv': true, 'avi': true, 'wmv': true, 'flv': true, 'm4v': true, 'ogv': true };
+const _VideoExtensions = { 'mp4': true, 'webm': true, 'mov': true, 'mkv': true, 'avi': true, 'wmv': true, 'flv': true, 'm4v': true, 'ogv': true, 'mpg': true, 'mpeg': true, 'mpe': true, 'mpv': true, 'm2v': true, 'ts': true, 'mts': true, 'm2ts': true, 'vob': true, '3gp': true, '3g2': true, 'f4v': true, 'rm': true, 'rmvb': true, 'divx': true, 'asf': true, 'mxf': true, 'dv': true, 'nsv': true, 'nuv': true, 'y4m': true, 'wtv': true, 'swf': true, 'dat': true };
 const _AudioExtensions = { 'mp3': true, 'wav': true, 'ogg': true, 'flac': true, 'aac': true, 'm4a': true, 'wma': true, 'oga': true };
 const _DocumentExtensions = { 'pdf': true, 'epub': true, 'mobi': true, 'doc': true, 'docx': true };
 
@@ -475,7 +475,7 @@ class RetoldRemoteMediaService extends libFableServiceProviderBase
 		{
 			let tmpOutputFormat = pFormat === 'webp' ? 'webp' : 'mjpeg';
 			// Extract a frame at 10% into the video
-			let tmpCmd = `ffmpeg -ss 00:00:02 -i "${pFullPath}" -vframes 1 -vf "scale=${pWidth}:${pHeight}:force_original_aspect_ratio=decrease" -f image2 -c:v ${tmpOutputFormat} pipe:1`;
+			let tmpCmd = `ffmpeg -ss 00:00:02 -i "${pFullPath}" -vframes 1 -vf "scale=${pWidth}:${pHeight}:force_original_aspect_ratio=decrease" -f ${tmpOutputFormat} pipe:1`;
 			let tmpBuffer = libChildProcess.execSync(tmpCmd, { maxBuffer: 10 * 1024 * 1024, timeout: 30000 });
 			return fCallback(null, tmpBuffer);
 		}

package/source/server/RetoldRemote-VideoFrameService.js

@@ -147,7 +147,8 @@ class RetoldRemoteVideoFrameService extends libFableServiceProviderBase
 
 			let tmpCodec = (pFormat === 'png') ? 'png' : (pFormat === 'webp') ? 'webp' : 'mjpeg';
 
-			let tmpCmd = `ffmpeg -ss ${tmpTimeStr} -i "${pAbsPath}" -vframes 1 -vf "scale=${pWidth}:${pHeight}:force_original_aspect_ratio=decrease" -c:v ${tmpCodec} -y "${pOutputPath}"`;
+			let tmpMuxer = (pFormat === 'png') ? 'image2' : (pFormat === 'webp') ? 'webp' : 'mjpeg';
+			let tmpCmd = `ffmpeg -ss ${tmpTimeStr} -i "${pAbsPath}" -vframes 1 -vf "scale=${pWidth}:${pHeight}:force_original_aspect_ratio=decrease" -f ${tmpMuxer} -y "${pOutputPath}"`;
 			libChildProcess.execSync(tmpCmd, { stdio: 'ignore', timeout: 30000 });
 			return libFs.existsSync(pOutputPath);
 		}

package/source/views/PictView-Remote-Layout.js

@@ -340,6 +340,7 @@ class RetoldRemoteLayoutView extends libPictView
 				tmpSettingsView.render();
 			}
 		}
+
 	}
 
 	_setupResizeHandle()