Get original files

gallery.config-example.yml

@@ -58,6 +58,10 @@ sources:
     # Offline sources require an index file. Previews and meta data
     # should be extracted first before marking a source offline
     #offline: false
+    # Allows the original files to be downloaded via de webapp.  
+    # This adds a link to images of this source in the details view.  
+    # Sources set as `offline` won't be made available.  
+    #downloadable: true
     # Filename matcher for checksum recalculation
     # size-ctime-inode: this matcher should be used if possible, might
     #                   not work on windows

packages/cli/src/config/expand-defaults.js

@@ -30,6 +30,7 @@ export const expandConfigDefaults = (config, env) => {
       config.sources[i] = Object.assign({
         index: '{configDir}/{configPrefix}{basename(dir)}.idx',
         offline: false,
+        downloadable: false,
         excludeIfPresent: '.galleryignore'
       }, source)
     }

packages/server/src/app.js

@@ -75,6 +75,15 @@ export function createApp(context) {
   router.use(getAuthMiddleware(config))
 
   router.use('/files', express.static(config.storage.dir, {index: false, maxAge: '2d', immutable: true}));
+  for (const source of config.sources) {
+    if (!source.downloadable || source.offline) {
+      // If the source can't be downloaded or is offline we skip it
+      continue;
+    }
+    const basename = path.basename(source.index);
+    const idx = basename.replace(/\.[^.]+$/, '');
+    router.use('/sources/' + idx, express.static(source.dir, {index: false, maxAge: '2d', immutable: true, fallthrough: true}));
+  }
 
   const pluginApi = browserPlugin(context, '/plugins/')
   router.use('/plugins', pluginApi.static)
@@ -104,12 +113,24 @@ export function createApp(context) {
     const disabled = config?.webapp?.disabled || []
     const plugins = pluginApi.pluginEntries
     const entries = await getFirstEntries(50, req)
+    const sources = config.sources.map((value) => { 
+      // Don't return sources which we don't want to make downloadable
+      // (this is mainly to not make the index name available in the UI)
+      if (!value.downloadable || value.offline) {
+        return null;
+      }
+      return { 
+        downloadable: true,
+        index: path.basename(value.index).replace(/\.[^.]+$/, '')
+      } 
+    });
     return {
       disabled: !!req.username ? [...disabled, 'pwa'] : disabled,
       pluginManager: {
         plugins
       },
       entries,
+      sources,
     }
   }
 

packages/webapp/src/single/Details.tsx

@@ -78,7 +78,15 @@ export const Details = ({entry, dispatch}) => {
     ]
   }
 
-  const mainFilename = entry.files[0].filename.replace(/.*[/\\]/g, '')
+  const mainFileData = entry.files[0];
+  const mainFilename = mainFileData.filename.replace(/.*[/\\]/g, '')
+  const sourceConfig = appConfig.sources.find((value) => value && value.index === mainFileData.index);
+  const sourceLink = (text, withIcon = false) => {
+    if (!sourceConfig || sourceConfig.downloadable === false) return text;
+    return <a href={`sources/${mainFileData.index}/${mainFileData.filename}`} target="_blank">
+      {text} {withIcon ? <FontAwesomeIcon icon={icons.faArrowUpRightFromSquare} className="text-gray-300"/> : ''}
+    </a>
+  };
 
   const hasAddress = entry => entry.road || entry.city || entry.country
 
@@ -136,11 +144,16 @@ export const Details = ({entry, dispatch}) => {
               <FontAwesomeIcon icon={icons.faIdCard} className="text-gray-300"/>
             </div>
             <div>
-              <p>{mainFilename}</p>
+              <p>
+                {sourceLink(mainFilename)}
+              </p>
               <p>{simpleSearchLink(entry.type, 'type', entry.type)} {entry.id.substring(0, 7)}</p>
-              <p>{entry.duration > 0 && (
-                <>{humanizeDuration(entry.duration)}, </>
-              )}{entry.width}x{entry.height}</p>
+              <p>
+                {entry.duration > 0 && (
+                  <>{humanizeDuration(entry.duration)}, </>
+                )}
+                {sourceLink(`${entry.width}x${entry.height}`, true)}
+              </p>
             </div>
           </div>
           <div className="flex">