rt/wrolpi
1
0
Fork 0
mirror of https://github.com/lrnselfreliance/wrolpi.git synced 2026-10-26 19:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always previewing file that can be downloaded.

Browse source
This commit is contained in:
Roland 2023-08-04 11:32:47 -06:00
parent 939b10a1bc
commit d0d315cd67
No known key found for this signature in database
GPG key ID: 9D6DBD3ACF11AB93
2 changed files with 44 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

87
app/src/components/Common.js
View file

@ -550,55 +550,52 @@ export function CardPoster({to, file}) {
let posterPath = findPosterPath(file);
if (!posterPath && to && (to.startsWith('/download/') || to.startsWith('/media/'))) {
// No poster, link is to download a file directly.
return <ExternalCardLink to={to}>
<CardIcon onClick={() => {
window.location.href = to;
return null
}}>
{imageLabel}
<FileIcon file={file}/>
</CardIcon>
</ExternalCardLink>
} else if (!posterPath && to) {
// No poster, link to the full page.
return <Link to={to}>
<CardIcon onClick={() => navigate(to)}>
{imageLabel}
<FileIcon file={file}/>
</CardIcon>
</Link>
} else if (!posterPath) {
// No poster, no to, use a Preview.
return <PreviewLink file={file}>
<CardIcon>
{imageLabel}
<FileIcon file={file}/>
</CardIcon>
</PreviewLink>
}
if (posterPath) {
// FileGroup has a poster (screenshot/thumbnail) file.
posterPath = `/media/${encodeMediaPath(posterPath)}`;
posterPath = `/media/${encodeMediaPath(posterPath)}`;
const image = <>
{/* Replicate <Image label/> but with maxHeight applied to image */}
{imageLabel}
<img alt='poster' src={posterPath} style={{maxHeight: '163px', width: 'auto'}}/>
</>;
const image = <>
{/* Replicate <Image label/> but with maxHeight applied to image */}
{imageLabel}
<img alt='poster' src={posterPath} style={{maxHeight: '163px', width: 'auto'}}/>
</>;
if (to) {
// Link using React Router.
return <Link to={to} style={style}>
{image}
</Link>
} else {
// Preview the file.
return <div style={style}>
<PreviewLink file={file}>
if (to) {
// Link within this App.
console.debug(`${file['primary_path']} link with poster`);
return <Link to={to} style={style}>
{image}
</Link>
} else {
// Preview the file.
console.debug(`${file['primary_path']} preview with poster`);
return <div style={style}>
<PreviewLink file={file}>
{image}
</PreviewLink>
</div>
}
} else {
// FileGroup has no poster.
if (!to || (to.startsWith('/media/') || to.startsWith('/download/'))) {
// "to" is a downloadable file outside the app, preview the file.
console.debug(`${file['primary_path']} preview no poster`);
return <PreviewLink file={file}>
<CardIcon>
{imageLabel}
<FileIcon file={file}/>
</CardIcon>
</PreviewLink>
</div>
} else if (!posterPath && to) {
// Link to the full page in this App.
console.debug(`${file['primary_path']} link no poster`);
return <Link to={to}>
<CardIcon onClick={() => navigate(to)}>
{imageLabel}
<FileIcon file={file}/>
</CardIcon>
</Link>
}
}
}

3
app/src/components/FilePreview.js
View file

@ -140,6 +140,7 @@ function getSTLModal(previewFile) {
}
function getGenericModal(previewFile) {
// No special handler for this file type, just open it.
const path = previewFile.primary_path ?? previewFile.path;
const name = path.replace(/^.*[\\\/]/, '');
@ -214,7 +215,7 @@ export function FilePreviewProvider({children}) {
<pre>{path}</pre>
</ModalContent>
: null;
console.log('path', path);
console.log('Previewing', path);
setPreviewModal(<Modal closeIcon
size='fullscreen'