From cea63e6a8e17b3f6591e08cbbb20155f25118641 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 19 Nov 2022 18:34:52 +0200
Subject: [PATCH] Moved dev file storage to inside meteor app folder Prevented
 verbose logging of file storage

---
 app/.gitignore                                           | 1 +
 app/imports/api/creature/archive/ArchiveCreatureFiles.js | 4 ++--
 app/imports/api/files/UserImages.js                      | 2 +-
 app/imports/api/files/s3FileStorage.js                   | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/.gitignore b/app/.gitignore
index da83c4f3..e4ba5ce6 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -3,6 +3,7 @@
 .demeteorized
 .cache
 .vscode
+fileStorage
 settings.json
 public/components
 public/_imports.html
diff --git a/app/imports/api/creature/archive/ArchiveCreatureFiles.js b/app/imports/api/creature/archive/ArchiveCreatureFiles.js
index 1b699c0b..c0d1094e 100644
--- a/app/imports/api/creature/archive/ArchiveCreatureFiles.js
+++ b/app/imports/api/creature/archive/ArchiveCreatureFiles.js
@@ -6,13 +6,13 @@ import { CreatureSchema } from '/imports/api/creature/creatures/Creatures.js';
 
 const ArchiveCreatureFiles = createS3FilesCollection({
   collectionName: 'archiveCreatureFiles',
-  storagePath: Meteor.isDevelopment ? '/DiceCloud/archiveCreatures/' : 'assets/app/archiveCreatures',
+  storagePath: Meteor.isDevelopment ? '../../../../../fileStorage/archiveCreatures' : 'assets/app/archiveCreatures',
   onBeforeUpload(file) {
     // Allow upload files under 10MB, and only in json format
     if (file.size > 10485760) {
       return 'Please upload with size equal or less than 10MB';
     }
-    if (!/json/i.test(file.extension)){
+    if (!/json/i.test(file.extension)) {
       return 'Please upload only a JSON file';
     }
     return true;
diff --git a/app/imports/api/files/UserImages.js b/app/imports/api/files/UserImages.js
index fad4576b..9638d2f0 100644
--- a/app/imports/api/files/UserImages.js
+++ b/app/imports/api/files/UserImages.js
@@ -2,7 +2,7 @@ import { createS3FilesCollection } from '/imports/api/files/s3FileStorage.js';
 
 const UserImages = createS3FilesCollection({
   collectionName: 'userImages',
-  storagePath: Meteor.isDevelopment ? '/DiceCloud/userImages/' : 'assets/app/userImages',
+  storagePath: Meteor.isDevelopment ? '../../../../../fileStorage/userImages' : 'assets/app/userImages',
   onBeforeUpload(file) {
     // Allow upload files under 10MB
     if (file.size > 10485760) {
diff --git a/app/imports/api/files/s3FileStorage.js b/app/imports/api/files/s3FileStorage.js
index 7103d044..1ef22730 100644
--- a/app/imports/api/files/s3FileStorage.js
+++ b/app/imports/api/files/s3FileStorage.js
@@ -50,7 +50,7 @@ if (Meteor.isServer && Meteor.settings.useS3) {
     storagePath,
     onBeforeUpload,
     onAfterUpload,
-    debug = !Meteor.isProduction,
+    debug,// = !Meteor.isProduction,
     allowClientCode = false,
   }) {
     const collection = new FilesCollection({
@@ -224,7 +224,7 @@ if (Meteor.isServer && Meteor.settings.useS3) {
     storagePath,
     onBeforeUpload,
     onAfterUpload,
-    debug = !Meteor.isProduction,
+    debug,// = !Meteor.isProduction,
     allowClientCode = false,
   }) {
     const collection = new FilesCollection({