Skip to content

Commit ba994f8

Browse files
committed
refactor(backend): remove PuterFSProvider from core
1 parent 8d4f788 commit ba994f8

File tree

8 files changed

+33
-264
lines changed

8 files changed

+33
-264
lines changed

extensions/puterfs/main.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -918,12 +918,10 @@ class PuterFSProvider {
918918
}
919919
}
920920

921-
const { TmpProxyFSProvider } = extension.import('fs');
922-
923921
extension.on('create.filesystem-types', event => {
924922
event.createFilesystemType('puterfs', {
925923
mount ({ path }) {
926-
return new TmpProxyFSProvider(path, new PuterFSProvider(path));
924+
return new PuterFSProvider(path);
927925
},
928926
});
929927
});

src/backend/src/filesystem/FilesystemService.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ const { UserActorType } = require('../services/auth/Actor');
2828
const { get_user } = require('../helpers');
2929
const BaseService = require('../services/BaseService');
3030
const { MANAGE_PERM_PREFIX } = require('../services/auth/permissionConts.mjs');
31-
const { PuterFSProvider } = require('../modules/puterfs/lib/PuterFSProvider.js');
3231
const { quot } = require('@heyputer/putility/src/libs/string.js');
3332

3433
class FilesystemService extends BaseService {
@@ -95,7 +94,7 @@ class FilesystemService extends BaseService {
9594
|| permission.startsWith(`${MANAGE_PERM_PREFIX}:${MANAGE_PERM_PREFIX}:fs:`); // owner has implicit rule to give others manage access;
9695
},
9796
checker: async ({ actor, permission }) => {
98-
if ( !(actor.type instanceof UserActorType) ) {
97+
if ( ! (actor.type instanceof UserActorType) ) {
9998
return undefined;
10099
}
101100

@@ -109,7 +108,7 @@ class FilesystemService extends BaseService {
109108
const owner_id = await node.get('user_id');
110109

111110
// These conditions should never happen
112-
if ( ! owner_id || ! actor.type.user.id ) {
111+
if ( !owner_id || !actor.type.user.id ) {
113112
throw new Error('something unexpected happened');
114113
}
115114

@@ -330,8 +329,8 @@ class FilesystemService extends BaseService {
330329
}
331330

332331
if ( ! (selector instanceof NodeSelector) ) {
333-
throw new Error('FileSystemService could not resolve the specified node value ' +
334-
quot('' + selector) + ` (type: ${typeof selector}) ` +
332+
throw new Error(`FileSystemService could not resolve the specified node value ${
333+
quot(`${ selector}`) } (type: ${typeof selector}) ` +
335334
'to a filesystem node selector');
336335
}
337336

src/backend/src/modules/puterfs/PuterFSModule.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const FSNodeContext = require('../../filesystem/FSNodeContext');
2222
const capabilities = require('../../filesystem/definitions/capabilities');
2323
const selectors = require('../../filesystem/node/selectors');
2424
const { RuntimeModule } = require('../../extension/RuntimeModule');
25-
const { TmpProxyFSProvider } = require('./TmpProxyFSProvider');
2625
const { MODE_READ, MODE_WRITE } = require('../../services/fs/FSLockService');
2726
const { UploadProgressTracker } = require('../../filesystem/storage/UploadProgressTracker');
2827

@@ -39,7 +38,6 @@ class PuterFSModule extends AdvancedBase {
3938
capabilities,
4039
selectors,
4140
FSNodeContext,
42-
TmpProxyFSProvider,
4341
lock: {
4442
MODE_READ,
4543
MODE_WRITE,

src/backend/src/modules/puterfs/PuterFSService.js

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/backend/src/modules/puterfs/TmpProxyFSProvider.js

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/backend/src/modules/puterfs/lib/PuterFSProvider.js

Lines changed: 0 additions & 137 deletions
This file was deleted.

src/backend/src/routers/filesystem_api/update.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
const APIError = require("../../api/APIError");
2-
const eggspress = require("../../api/eggspress");
3-
const FSNodeParam = require("../../api/filesystem/FSNodeParam");
4-
const StringParam = require("../../api/filesystem/StringParam");
5-
const { is_valid_url } = require("../../helpers");
6-
const { PuterFSProvider } = require("../../modules/puterfs/lib/PuterFSProvider");
7-
const { Context } = require("../../util/context");
1+
const APIError = require('../../api/APIError');
2+
const eggspress = require('../../api/eggspress');
3+
const FSNodeParam = require('../../api/filesystem/FSNodeParam');
4+
const StringParam = require('../../api/filesystem/StringParam');
5+
const { is_valid_url } = require('../../helpers');
6+
const { Context } = require('../../util/context');
87

98
module.exports = eggspress('/update-fsentry-thumbnail', {
109
subdomain: 'api',
@@ -25,22 +24,22 @@ module.exports = eggspress('/update-fsentry-thumbnail', {
2524
got: typeof req.values.thumbnail,
2625
});
2726
}
28-
27+
2928
if ( ! await req.values.fsNode.exists() ) {
3029
throw new APIError.create('subject_does_not_exist');
3130
}
32-
31+
3332
const svc = Context.get('services');
34-
33+
3534
const svc_mountpoint = svc.get('mountpoint');
3635
const provider =
3736
await svc_mountpoint.get_provider(req.values.fsNode.selector);
38-
37+
3938
provider.update_thumbnail({
4039
context: Context.get(),
4140
node: req.values.fsNode,
4241
thumbnail: req.body.thumbnail,
4342
});
44-
43+
4544
res.json({});
4645
});

0 commit comments

Comments
 (0)