Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-09-22 01:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Revert "use tempdirs"

Browse source 
This reverts commit a7d51cf21b.
This commit is contained in:
David Arnold 2020-10-21 12:51:04 -05:00 • committed by Denis Perov
parent 80d0ec0898
commit 1cddd607ec
3 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
models/attachments.js
View file

@ -5,8 +5,6 @@ import { createOnAfterUpload } from './lib/fsHooks/createOnAfterUpload';
import { createInterceptDownload } from './lib/fsHooks/createInterceptDownload'; import { createInterceptDownload } from './lib/fsHooks/createInterceptDownload';
import { createOnAfterRemove } from './lib/fsHooks/createOnAfterRemove'; import { createOnAfterRemove } from './lib/fsHooks/createOnAfterRemove';
const os = require('os');
let attachmentBucket; let attachmentBucket;
if (Meteor.isServer) { if (Meteor.isServer) {
attachmentBucket = createBucket('attachments'); attachmentBucket = createBucket('attachments');
@ -33,7 +31,6 @@ const insertActivity = (fileObj, activityType) =>
Attachments = new FilesCollection({ Attachments = new FilesCollection({
debug: false, // Change to `true` for debugging debug: false, // Change to `true` for debugging
collectionName: 'attachments', collectionName: 'attachments',
storagePath: os.tmpdir(),
allowClientCode: true, allowClientCode: true,
onAfterUpload: function onAfterUpload(fileRef) { onAfterUpload: function onAfterUpload(fileRef) {
createOnAfterUpload(attachmentBucket).call(this, fileRef); createOnAfterUpload(attachmentBucket).call(this, fileRef);

3
models/avatars.js
View file

@ -5,8 +5,6 @@ import { createOnAfterUpload } from './lib/fsHooks/createOnAfterUpload';
import { createInterceptDownload } from './lib/fsHooks/createInterceptDownload'; import { createInterceptDownload } from './lib/fsHooks/createInterceptDownload';
import { createOnAfterRemove } from './lib/fsHooks/createOnAfterRemove'; import { createOnAfterRemove } from './lib/fsHooks/createOnAfterRemove';
const os = require('os');
let avatarsBucket; let avatarsBucket;
if (Meteor.isServer) { if (Meteor.isServer) {
avatarsBucket = createBucket('avatars'); avatarsBucket = createBucket('avatars');
@ -15,7 +13,6 @@ if (Meteor.isServer) {
Avatars = new FilesCollection({ Avatars = new FilesCollection({
debug: false, // Change to `true` for debugging debug: false, // Change to `true` for debugging
collectionName: 'avatars', collectionName: 'avatars',
storagePath: os.tmpdir(),
allowClientCode: true, allowClientCode: true,
onBeforeUpload(file) { onBeforeUpload(file) {
if (file.size <= 72000 && file.type.startsWith('image/')) { if (file.size <= 72000 && file.type.startsWith('image/')) {

26
server/migrations.js
View file

@ -23,6 +23,9 @@ import Swimlanes from '../models/swimlanes';
import Triggers from '../models/triggers'; import Triggers from '../models/triggers';
import UnsavedEdits from '../models/unsavedEdits'; import UnsavedEdits from '../models/unsavedEdits';
import Users from '../models/users'; import Users from '../models/users';
const fs = require('fs');
// Anytime you change the schema of one of the collection in a non-backward // Anytime you change the schema of one of the collection in a non-backward
// compatible way you have to write a migration in this file using the following // compatible way you have to write a migration in this file using the following
// API: // API:
@ -1128,17 +1131,14 @@ Migrations.add('add-card-details-show-lists', () => {
}); });
Migrations.add('migrate-attachments-collectionFS-to-ostrioFiles', () => { Migrations.add('migrate-attachments-collectionFS-to-ostrioFiles', () => {
const os = require('os');
const fs = require('fs');
const path = require('path');
tmdir = os.tmpdir();
AttachmentsOld.find().forEach(function(fileObj) { AttachmentsOld.find().forEach(function(fileObj) {
//console.log('File: ', fileObj.userId); //console.log('File: ', fileObj.userId);
// This directory must be writable on server, so a test run first // This directory must be writable on server, so a test run first
// We are going to copy the files locally, then move them to mongo bucket // We are going to copy the files locally, then move them to S3
const fileName = path.join(tmpdir, `${fileObj._id}-${fileObj.name()}`); const fileName = `./assets/app/uploads/attachments/${
fileObj._id
}-${fileObj.name()}`;
const newFileName = fileObj.name(); const newFileName = fileObj.name();
// This is "example" variable, change it to the userId that you might be using. // This is "example" variable, change it to the userId that you might be using.
@ -1196,18 +1196,16 @@ Migrations.add('migrate-attachments-collectionFS-to-ostrioFiles', () => {
readStream.pipe(writeStream); readStream.pipe(writeStream);
}); });
}); });
Migrations.add('migrate-avatars-collectionFS-to-ostrioFiles', () => {
const os = require('os');
const fs = require('fs');
const path = require('path');
tmdir = os.tmpdir();
Migrations.add('migrate-avatars-collectionFS-to-ostrioFiles', () => {
AvatarsOld.find().forEach(function(fileObj) { AvatarsOld.find().forEach(function(fileObj) {
//console.log('File: ', fileObj.userId); //console.log('File: ', fileObj.userId);
// This directory must be writable on server, so a test run first // This directory must be writable on server, so a test run first
// We are going to copy the files locally, then move them to mongo bucket // We are going to copy the files locally, then move them to S3
const fileName = path.join(tmpdir, `${fileObj._id}-${fileObj.name()}`); const fileName = `./assets/app/uploads/avatars/${
fileObj._id
}-${fileObj.name()}`;
const newFileName = fileObj.name(); const newFileName = fileObj.name();
// This is "example" variable, change it to the userId that you might be using. // This is "example" variable, change it to the userId that you might be using.