Skip to content

Commit c2a9506

Browse files
committed
fix: thumbnail service updates
1 parent ed0a83c commit c2a9506

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/backend/src/CoreModule.js

+1
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ const install = async ({ services, app, useapi }) => {
219219
services.registerService('counting', ConfigurableCountingService);
220220
services.registerService('thumbnails', StrategizedService, {
221221
strategy_key: 'engine',
222+
default_strategy: 'purejs',
222223
strategies: {
223224
napi: [NAPIThumbnailService],
224225
purejs: [PureJSThumbnailService],

src/backend/src/filesystem/hl_operations/hl_write.js

+9-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const UserParam = require("../../api/filesystem/UserParam");
2424
const config = require("../../config");
2525
const { chkperm, validate_fsentry_name } = require("../../helpers");
2626
const { TeePromise } = require("../../util/promise");
27-
const { pausing_tee, logging_stream, offset_write_stream } = require("../../util/streamutil");
27+
const { pausing_tee, logging_stream, offset_write_stream, stream_to_the_void } = require("../../util/streamutil");
2828
const { TYPE_DIRECTORY } = require("../FSNodeContext");
2929
const { LLRead } = require("../ll_operations/ll_read");
3030
const { RootNodeSelector, NodePathSelector } = require("../node/selectors");
@@ -299,7 +299,7 @@ class HLWrite extends HLFilesystemOperation {
299299
this.checkpoint('before thumbnail');
300300

301301
let thumbnail_promise = new TeePromise();
302-
let thumbnail; (async () => {
302+
(async () => {
303303
const reason = await (async () => {
304304
const { mime } = this.modules;
305305
const thumbnails = context.get('services').get('thumbnails');
@@ -324,7 +324,13 @@ class HLWrite extends HLFilesystemOperation {
324324
return { ...values.file, stream: thumbnail_stream };
325325
})();
326326

327-
thumbnail = await thumbnails.thumbify(thumb_file);
327+
let thumbnail;
328+
try {
329+
thumbnail = await thumbnails.thumbify(thumb_file);
330+
} catch (e) {
331+
stream_to_the_void(thumb_file.stream);
332+
return 'thumbnail error: ' + e.message;
333+
}
328334
thumbnail_promise.resolve(thumbnail);
329335
})();
330336
if ( reason ) {

0 commit comments

Comments
 (0)