From 05c53ca01d71a01a608c9ae345475abd67c9939b Mon Sep 17 00:00:00 2001 From: Romulus Urakagi Tsai Date: Mon, 18 Nov 2019 01:47:26 +0000 Subject: [PATCH] Trying to upload an attachment with Meteor-Files --- .meteor/packages | 1 + .meteor/versions | 2 + ...neFBdzt-提議者電子郵件(第一波+第二波).xlsx | Bin 0 -> 29409 bytes client/components/cards/attachments.js | 24 ++-- client/lib/utils.js | 28 +++-- models/attachments.js | 47 ++++++-- rebuild-wekan.bat | 112 +++++++++--------- server/publications/boards.js | 2 +- 8 files changed, 132 insertions(+), 84 deletions(-) create mode 100644 atachments/attachments-gAjLYeSrtAneFBdzt-提議者電子郵件(第一波+第二波).xlsx diff --git a/.meteor/packages b/.meteor/packages index f234baea6..a455c6392 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -96,3 +96,4 @@ konecty:mongo-counter percolate:synced-cron easylogic:summernote cfs:filesystem +ostrio:files diff --git a/.meteor/versions b/.meteor/versions index 3b45f9864..9b5fb93e7 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -133,6 +133,8 @@ oauth2@1.2.1 observe-sequence@1.0.16 ongoworks:speakingurl@1.1.0 ordered-dict@1.1.0 +ostrio:cookies@2.5.0 +ostrio:files@1.13.0 peerlibrary:assert@0.2.5 peerlibrary:base-component@0.16.0 peerlibrary:blaze-components@0.15.1 diff --git a/atachments/attachments-gAjLYeSrtAneFBdzt-提議者電子郵件(第一波+第二波).xlsx b/atachments/attachments-gAjLYeSrtAneFBdzt-提議者電子郵件(第一波+第二波).xlsx new file mode 100644 index 0000000000000000000000000000000000000000..4e89ac5d963442fcbb4394886d48f214e3ea9945 GIT binary patch literal 29409 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 literal 0 HcmV?d00001 diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js index e4439155e..604dc0783 100644 --- a/client/components/cards/attachments.js +++ b/client/components/cards/attachments.js @@ -149,20 +149,28 @@ Template.previewClipboardImagePopup.events({ if (results && results.file) { window.oPasted = pastedResults; const card = this; - const file = new FS.File(results.file); + const settings = { + file: results.file, + streams: 'dynamic', + chunkSize: 'dynamic' + }; if (!results.name) { // if no filename, it's from clipboard. then we give it a name, with ext name from MIME type + // FIXME: Check this behavior if (typeof results.file.type === 'string') { - file.name(results.file.type.replace('image/', 'clipboard.')); + settings.fileName = new Date().getTime() + results.file.type.replace('.+/', ''); } } - file.updatedAt(new Date()); - file.boardId = card.boardId; - file.cardId = card._id; - file.userId = Meteor.userId(); - const attachment = Attachments.insert(file); + settings.meta = {}; + settings.meta.updatedAt = new Date().getTime(); + settings.meta.boardId = card.boardId; + settings.meta.cardId = card._id; + settings.meta.userId = Meteor.userId(); + console.log('settings', settings); + const attachment = Attachments.insert(settings, false); - if (attachment && attachment._id && attachment.isImage()) { + // TODO: Check image cover behavior + if (attachment && attachment._id && attachment.isImage) { card.setCover(attachment._id); } diff --git a/client/lib/utils.js b/client/lib/utils.js index cc3526c03..2694396f0 100644 --- a/client/lib/utils.js +++ b/client/lib/utils.js @@ -34,21 +34,27 @@ Utils = { if (!card) { return next(); } - const file = new FS.File(fileObj); + let settings = { + file: fileObj, + streams: 'dynamic', + chunkSize: 'dynamic' + }; + settings.meta = {}; if (card.isLinkedCard()) { - file.boardId = Cards.findOne(card.linkedId).boardId; - file.cardId = card.linkedId; + settings.meta.boardId = Cards.findOne(card.linkedId).boardId; + settings.meta.cardId = card.linkedId; } else { - file.boardId = card.boardId; - file.swimlaneId = card.swimlaneId; - file.listId = card.listId; - file.cardId = card._id; + settings.meta.boardId = card.boardId; + settings.meta.swimlaneId = card.swimlaneId; + settings.meta.listId = card.listId; + settings.meta.cardId = card._id; } - file.userId = Meteor.userId(); - if (file.original) { + settings.meta.userId = Meteor.userId(); + // FIXME: What is this? +/* if (file.original) { file.original.name = fileObj.name; - } - return next(Attachments.insert(file)); + }*/ + return next(Attachments.insert(settings, false)); }, shrinkImage(options) { // shrink image to certain size diff --git a/models/attachments.js b/models/attachments.js index 9b8ec04f3..fd03e6d24 100644 --- a/models/attachments.js +++ b/models/attachments.js @@ -1,3 +1,29 @@ +import { FilesCollection } from 'meteor/ostrio:files'; + +Attachments = new FilesCollection({ + storagePath: storagePath(), + debug: true, // FIXME: Remove debug mode + collectionName: 'attachments2', + allowClientCode: false, // Disallow remove files from Client +}); + +if (Meteor.isServer) { + Meteor.startup(() => { + Attachments.collection._ensureIndex({ cardId: 1 }); + }); + + // TODO: Permission related + // TODO: Add Activity update + // TODO: publish and subscribe +// Meteor.publish('files.attachments.all', function () { +// return Attachments.find().cursor; +// }); +} else { +// Meteor.subscribe('files.attachments.all'); +} + +// ---------- Deprecated fallback ---------- // + const localFSStore = process.env.ATTACHMENTS_STORE_PATH; const storeName = 'attachments'; const defaultStoreOptions = { @@ -171,16 +197,16 @@ if (localFSStore) { ...defaultStoreOptions, }); } -Attachments = new FS.Collection('attachments', { +DeprecatedAttachs = new FS.Collection('attachments', { stores: [store], }); if (Meteor.isServer) { Meteor.startup(() => { - Attachments.files._ensureIndex({ cardId: 1 }); + DeprecatedAttachs.files._ensureIndex({ cardId: 1 }); }); - Attachments.allow({ + DeprecatedAttachs.allow({ insert(userId, doc) { return allowIsBoardMember(userId, Boards.findOne(doc.boardId)); }, @@ -206,10 +232,10 @@ if (Meteor.isServer) { }); } -// XXX Enforce a schema for the Attachments CollectionFS +// XXX Enforce a schema for the DeprecatedAttachs CollectionFS if (Meteor.isServer) { - Attachments.files.after.insert((userId, doc) => { + DeprecatedAttachs.files.after.insert((userId, doc) => { // If the attachment doesn't have a source field // or its source is different than import if (!doc.source || doc.source !== 'import') { @@ -227,7 +253,7 @@ if (Meteor.isServer) { } else { // Don't add activity about adding the attachment as the activity // be imported and delete source field - Attachments.update( + DeprecatedAttachs.update( { _id: doc._id, }, @@ -240,7 +266,7 @@ if (Meteor.isServer) { } }); - Attachments.files.before.remove((userId, doc) => { + DeprecatedAttachs.files.before.remove((userId, doc) => { Activities.insert({ userId, type: 'card', @@ -253,11 +279,16 @@ if (Meteor.isServer) { }); }); - Attachments.files.after.remove((userId, doc) => { + DeprecatedAttachs.files.after.remove((userId, doc) => { Activities.remove({ attachmentId: doc._id, }); }); } +function storagePath(defaultPath) { + const storePath = process.env.ATTACHMENTS_STORE_PATH; + return storePath ? storePath : defaultPath; +} + export default Attachments; diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat index 056148995..8ea786cbb 100644 --- a/rebuild-wekan.bat +++ b/rebuild-wekan.bat @@ -1,56 +1,56 @@ -@ECHO OFF - -REM NOTE: THIS .BAT DOES NOT WORK !! -REM Use instead this webpage instructions to build on Windows: -REM https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows -REM Please add fix PRs, like config of MongoDB etc. - -md C:\repos -cd C:\repos - -REM Install chocolatey -@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" - -choco install -y git curl python2 dotnet4.5.2 nano mongodb-3 mongoclient meteor - -curl -O https://nodejs.org/dist/v8.16.1/node-v8.16.1-x64.msi -call node-v8.16.1-x64.msi - -call npm config -g set msvs_version 2015 -call meteor npm config -g set msvs_version 2015 - -call npm -g install npm -call npm -g install node-gyp -call npm -g install fibers -cd C:\repos -git clone https://github.com/wekan/wekan.git -cd wekan -git checkout edge -echo "Building Wekan." -REM del /S /F /Q packages -REM ## REPOS BELOW ARE INCLUDED TO WEKAN -REM md packages -REM cd packages -REM git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router -REM git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core -REM git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git -REM git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git -REM git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git -REM git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git -REM git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git -REM move meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc -REM move meteor-accounts-oidc/packages/switch_oidc wekan_oidc -REM del /S /F /Q meteor-accounts-oidc -REM sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js -cd .. -REM del /S /F /Q node_modules -call meteor npm install -REM del /S /F /Q .build -call meteor build .build --directory -copy fix-download-unicode\cfs_access-point.txt .build\bundle\programs\server\packages\cfs_access-point.js -cd .build\bundle\programs\server -call meteor npm install -REM cd C:\repos\wekan\.meteor\local\build\programs\server -REM del node_modules -cd C:\repos\wekan -call start-wekan.bat +@ECHO OFF + +REM NOTE: THIS .BAT DOES NOT WORK !! +REM Use instead this webpage instructions to build on Windows: +REM https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows +REM Please add fix PRs, like config of MongoDB etc. + +md C:\repos +cd C:\repos + +REM Install chocolatey +@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" + +choco install -y git curl python2 dotnet4.5.2 nano mongodb-3 mongoclient meteor + +curl -O https://nodejs.org/dist/v8.16.1/node-v8.16.1-x64.msi +call node-v8.16.1-x64.msi + +call npm config -g set msvs_version 2015 +call meteor npm config -g set msvs_version 2015 + +call npm -g install npm +call npm -g install node-gyp +call npm -g install fibers +cd C:\repos +git clone https://github.com/wekan/wekan.git +cd wekan +git checkout edge +echo "Building Wekan." +REM del /S /F /Q packages +REM ## REPOS BELOW ARE INCLUDED TO WEKAN +REM md packages +REM cd packages +REM git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router +REM git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core +REM git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git +REM git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git +REM git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git +REM git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git +REM git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git +REM move meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc +REM move meteor-accounts-oidc/packages/switch_oidc wekan_oidc +REM del /S /F /Q meteor-accounts-oidc +REM sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js +cd .. +REM del /S /F /Q node_modules +call meteor npm install +REM del /S /F /Q .build +call meteor build .build --directory +copy fix-download-unicode\cfs_access-point.txt .build\bundle\programs\server\packages\cfs_access-point.js +cd .build\bundle\programs\server +call meteor npm install +REM cd C:\repos\wekan\.meteor\local\build\programs\server +REM del node_modules +cd C:\repos\wekan +call start-wekan.bat diff --git a/server/publications/boards.js b/server/publications/boards.js index e30958332..79e578b85 100644 --- a/server/publications/boards.js +++ b/server/publications/boards.js @@ -128,7 +128,7 @@ Meteor.publishRelations('board', function(boardId, isArchived) { // Gather queries and send in bulk const cardComments = this.join(CardComments); cardComments.selector = _ids => ({ cardId: _ids }); - const attachments = this.join(Attachments); + const attachments = this.join(Attachments.collection); attachments.selector = _ids => ({ cardId: _ids }); const checklists = this.join(Checklists); checklists.selector = _ids => ({ cardId: _ids });