CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: special cases in thumbnail urls

Browse Source 
fixed #390

Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
Stefan Dej 2021-11-28 12:19:07 +01:00
parent f1ab29e4e6
commit a75b133dea
No known key found for this signature in database
GPG Key ID: 5D3A5823133D2246
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/panels/GcodefilesPanel.vue
View File

@ -900,7 +900,7 @@ export default class GcodefilesPanel extends Mixins(BaseMixin) {
thumb.height >= thumbnailSmallMin && thumb.height <= thumbnailSmallMax thumb.height >= thumbnailSmallMin && thumb.height <= thumbnailSmallMax
) )
if (thumbnail && 'relative_path' in thumbnail) return this.apiUrl+'/server/files/'+this.currentPath+'/'+thumbnail.relative_path+'?timestamp='+item.modified.getTime() if (thumbnail && 'relative_path' in thumbnail) return this.apiUrl+'/server/files/'+this.currentPath+'/'+encodeURIComponent(thumbnail.relative_path)+'?timestamp='+item.modified.getTime()
} }
return '' return ''
@ -910,7 +910,7 @@ export default class GcodefilesPanel extends Mixins(BaseMixin) {
if (item.thumbnails?.length) { if (item.thumbnails?.length) {
const thumbnail = item.thumbnails.find(thumb => thumb.width >= thumbnailBigMin) const thumbnail = item.thumbnails.find(thumb => thumb.width >= thumbnailBigMin)
if (thumbnail && 'relative_path' in thumbnail) return this.apiUrl+'/server/files/'+this.currentPath+'/'+thumbnail.relative_path+'?timestamp='+item.modified.getTime() if (thumbnail && 'relative_path' in thumbnail) return this.apiUrl+'/server/files/'+this.currentPath+'/'+encodeURIComponent(thumbnail.relative_path)+'?timestamp='+item.modified.getTime()
} }
return '' return ''
@ -1014,7 +1014,7 @@ export default class GcodefilesPanel extends Mixins(BaseMixin) {
downloadFile() { downloadFile() {
const filename = (this.currentPath+'/'+this.contextMenu.item.filename) const filename = (this.currentPath+'/'+this.contextMenu.item.filename)
const href = this.apiUrl + '/server/files/' + encodeURI(filename) const href = this.apiUrl + '/server/files/' + encodeURIComponent(filename)
window.open(href) window.open(href)
} }

4
src/components/panels/JobqueuePanel.vue
View File

@ -206,7 +206,7 @@ export default class JobqueuePanel extends Mixins(BaseMixin) {
) )
const path = item.filename.lastIndexOf('/') !== -1 ? 'gcodes/'+item.filename.slice(0, item.filename.lastIndexOf('/')) : 'gcodes' const path = item.filename.lastIndexOf('/') !== -1 ? 'gcodes/'+item.filename.slice(0, item.filename.lastIndexOf('/')) : 'gcodes'
if (thumbnail && 'relative_path' in thumbnail) return this.apiUrl+'/server/files/'+path+'/'+thumbnail.relative_path+'?timestamp='+item.metadata?.modified.getTime() if (thumbnail && 'relative_path' in thumbnail) return this.apiUrl+'/server/files/'+path+'/'+encodeURIComponent(thumbnail.relative_path)+'?timestamp='+item.metadata?.modified.getTime()
} }
return '' return ''
@ -217,7 +217,7 @@ export default class JobqueuePanel extends Mixins(BaseMixin) {
const thumbnail = item?.metadata?.thumbnails.find((thumb: any) => thumb.width >= thumbnailBigMin) const thumbnail = item?.metadata?.thumbnails.find((thumb: any) => thumb.width >= thumbnailBigMin)
const path = item.filename.lastIndexOf('/') !== -1 ? 'gcodes/'+item.filename.slice(0, item.filename.lastIndexOf('/')) : 'gcodes' const path = item.filename.lastIndexOf('/') !== -1 ? 'gcodes/'+item.filename.slice(0, item.filename.lastIndexOf('/')) : 'gcodes'
if (thumbnail && 'relative_path' in thumbnail) return this.apiUrl+'/server/files/'+path+'/'+thumbnail.relative_path+'?timestamp='+item.metadata?.modified.getTime() if (thumbnail && 'relative_path' in thumbnail) return this.apiUrl+'/server/files/'+path+'/'+encodeURIComponent(thumbnail.relative_path)+'?timestamp='+item.metadata?.modified.getTime()
} }
return '' return ''