mirror
/
photoview
mirror of https://github.com/photoview/photoview.git
1
Fork 0
Code

Make thumbnails optional 

to prevent app from crashing when in the middle of scanning
This commit is contained in:
viktorstrate 2021-02-07 18:13:08 +01:00
parent 254765a5d4
commit 54a83a4dc6
No known key found for this signature in database
GPG Key ID: 3F855605109C1E8A
7 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/graphql/generated.go
View File

@ -1593,7 +1593,7 @@ type Media {
"Local filepath for the media"
path: String!
"URL to display the media in a smaller resolution"
thumbnail: MediaURL!
thumbnail: MediaURL
"URL to display the photo in full resolution, will be null for videos"
highRes: MediaURL
"URL to get the video in a web format that can be played in the browser, will be null for photos"
@ -2928,14 +2928,11 @@ func (ec *executionContext) _Media_thumbnail(ctx context.Context, field graphql.
return graphql.Null
}
if resTmp == nil {
if !graphql.HasFieldError(ctx, fc) {
ec.Errorf(ctx, "must not be null")
}
return graphql.Null
}
res := resTmp.(*models.MediaURL)
fc.Result = res
return ec.marshalNMediaURL2ᚖgithubᚗcomᚋphotoviewᚋphotoviewᚋapiᚋgraphqlᚋmodelsᚐMediaURL(ctx, field.Selections, res)
return ec.marshalOMediaURL2ᚖgithubᚗcomᚋphotoviewᚋphotoviewᚋapiᚋgraphqlᚋmodelsᚐMediaURL(ctx, field.Selections, res)
}
func (ec *executionContext) _Media_highRes(ctx context.Context, field graphql.CollectedField, obj *models.Media) (ret graphql.Marshaler) {
@ -8195,9 +8192,6 @@ func (ec *executionContext) _Media(ctx context.Context, sel ast.SelectionSet, ob
}
}()
res = ec._Media_thumbnail(ctx, field, obj)
if res == graphql.Null {
atomic.AddUint32(&invalids, 1)
}
return res
})
case "highRes":
@ -9671,10 +9665,6 @@ func (ec *executionContext) marshalNMediaType2githubᚗcomᚋphotoviewᚋphotovi
return v
}
func (ec *executionContext) marshalNMediaURL2githubᚗcomᚋphotoviewᚋphotoviewᚋapiᚋgraphqlᚋmodelsᚐMediaURL(ctx context.Context, sel ast.SelectionSet, v models.MediaURL) graphql.Marshaler {
return ec._MediaURL(ctx, sel, &v)
}
func (ec *executionContext) marshalNMediaURL2ᚖgithubᚗcomᚋphotoviewᚋphotoviewᚋapiᚋgraphqlᚋmodelsᚐMediaURL(ctx context.Context, sel ast.SelectionSet, v *models.MediaURL) graphql.Marshaler {
if v == nil {
if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) {

10
api/graphql/resolvers/media.go
View File

@ -163,17 +163,21 @@ func (r *mediaResolver) HighRes(ctx context.Context, media *models.Media) (*mode
}
func (r *mediaResolver) Thumbnail(ctx context.Context, media *models.Media) (*models.MediaURL, error) {
var url models.MediaURL
var url []*models.MediaURL
err := r.Database.
Where("media_id = ?", media.ID).
Where("purpose = ? OR purpose = ?", models.PhotoThumbnail, models.VideoThumbnail).
First(&url).Error
Find(&url).Error
if err != nil {
return nil, errors.Wrapf(err, "could not query thumbnail (%s)", media.Path)
}
return &url, nil
if len(url) == 0 {
return nil, nil
}
return url[0], nil
}
func (r *mediaResolver) VideoWeb(ctx context.Context, media *models.Media) (*models.MediaURL, error) {

2
api/graphql/schema.graphql
View File

@ -237,7 +237,7 @@ type Media {
"Local filepath for the media"
path: String!
"URL to display the media in a smaller resolution"
thumbnail: MediaURL!
thumbnail: MediaURL
"URL to display the photo in full resolution, will be null for videos"
highRes: MediaURL
"URL to get the video in a web format that can be played in the browser, will be null for photos"

2
ui/src/components/albumGallery/AlbumBox.js
View File

@ -75,7 +75,7 @@ export const AlbumBox = ({ album, customLink, ...props }) => {
)
}
let thumbnail = album.thumbnail && album.thumbnail.thumbnail.url
let thumbnail = album.thumbnail?.thumbnail?.url
return (
<AlbumBoxLink {...props} to={customLink || `/album/${album.id}`}>

6
ui/src/components/photoGallery/ProtectedMedia.js
View File

@ -2,6 +2,8 @@ import React from 'react'
import PropTypes from 'prop-types'
const getProtectedUrl = url => {
if (url == null) return null
const imgUrl = new URL(url)
const tokenRegex = location.pathname.match(/^\/share\/([\d\w]+)(\/?.*)$/)
@ -26,7 +28,7 @@ export const ProtectedImage = ({ src, ...props }) => (
)
ProtectedImage.propTypes = {
src: PropTypes.string.isRequired,
src: PropTypes.string,
}
export const ProtectedVideo = ({ media, ...props }) => (
@ -35,7 +37,7 @@ export const ProtectedVideo = ({ media, ...props }) => (
controls
key={media.id}
crossOrigin="use-credentials"
poster={getProtectedUrl(media.thumbnail.url)}
poster={getProtectedUrl(media.thumbnail?.url)}
>
<source src={getProtectedUrl(media.videoWeb.url)} type="video/mp4" />
</video>

4
ui/src/components/photoGallery/presentView/PresentMedia.js
View File

@ -25,10 +25,10 @@ const PresentMedia = ({ media, imageLoaded, ...otherProps }) => {
if (media.type == 'photo') {
return (
<div {...otherProps}>
<StyledPhoto src={media.thumbnail.url} />
<StyledPhoto src={media.thumbnail?.url} />
<StyledPhoto
style={{ display: 'none' }}
src={media.highRes.url}
src={media.highRes?.url}
onLoad={e => {
e.target.style.display = 'initial'
imageLoaded && imageLoaded()

12
ui/src/components/sidebar/MediaSidebar.js
View File

@ -82,7 +82,7 @@ const PreviewVideo = styled(ProtectedVideo)`
const PreviewMedia = ({ media, previewImage }) => {
if (media.type == null || media.type == 'photo') {
return <PreviewImage src={previewImage.url} />
return <PreviewImage src={previewImage?.url} />
}
if (media.type == 'video') {
@ -94,7 +94,7 @@ const PreviewMedia = ({ media, previewImage }) => {
PreviewMedia.propTypes = {
media: PropTypes.object.isRequired,
previewImage: PropTypes.object.isRequired,
previewImage: PropTypes.object,
}
const Name = styled.div`
@ -194,12 +194,14 @@ const SidebarContent = ({ media, hidePreview }) => {
else if (media.thumbnail) previewImage = media.thumbnail
}
const imageAspect = previewImage
? previewImage.height / previewImage.width
: 3 / 2
return (
<div>
{!hidePreview && (
<PreviewImageWrapper
imageAspect={previewImage.height / previewImage.width}
>
<PreviewImageWrapper imageAspect={imageAspect}>
<PreviewMedia previewImage={previewImage} media={media} />
</PreviewImageWrapper>
)}