liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: import assets from disk module

Browse Source
This commit is contained in:
NGPixel
2019-10-20 14:42:10 -04:00
parent 186174f8fe
commit f1668b9ac5
4 changed files with 106 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/models/assets.js
View File

@@ -95,8 +95,7 @@ module.exports = class Asset extends Model {
kind: _.startsWith(opts.mimetype, 'image/') ? 'image' : 'binary',
mime: opts.mimetype,
fileSize: opts.size,
folderId: opts.folderId,
authorId: opts.user.id
folderId: opts.folderId
}
// Save asset data
@@ -105,6 +104,9 @@ module.exports = class Asset extends Model {
if (asset) {
// Patch existing asset
if (opts.mode === 'upload') {
assetRow.authorId = opts.user.id
}
await WIKI.models.assets.query().patch(assetRow).findById(asset.id)
await WIKI.models.knex('assetData').where({
id: asset.id
@@ -113,6 +115,7 @@ module.exports = class Asset extends Model {
})
} else {
// Create asset entry
assetRow.authorId = opts.user.id
asset = await WIKI.models.assets.query().insert(assetRow)
await WIKI.models.knex('assetData').insert({
id: asset.id,
@@ -121,7 +124,11 @@ module.exports = class Asset extends Model {
}
// Move temp upload to cache
await fs.move(opts.path, path.join(process.cwd(), `data/cache/${fileHash}.dat`), { overwrite: true })
if (opts.mode === 'upload') {
await fs.move(opts.path, path.join(process.cwd(), `data/cache/${fileHash}.dat`), { overwrite: true })
} else {
await fs.copy(opts.path, path.join(process.cwd(), `data/cache/${fileHash}.dat`), { overwrite: true })
}
// Add to Storage
if (!opts.skipStorage) {