settings.fileName {String}
diff --git a/package.js b/package.js
index aaeb151d..ad41b30f 100755
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
Package.describe({
name: 'ostrio:files',
- version: '1.9.6',
+ version: '1.9.7',
summary: 'File upload via DDP/HTTP to server, 3rd party storage support: AWS S3, GridFS, DropBox and others',
git: 'https://github.com/VeliovGroup/Meteor-Files',
documentation: 'README.md'
@@ -9,8 +9,8 @@ Package.describe({
Npm.depends({
'fs-extra': '5.0.0',
'request': '2.83.0',
- 'file-type': '7.4.0',
- 'eventemitter3': '3.0.0'
+ 'file-type': '7.5.0',
+ 'eventemitter3': '3.0.1'
});
Package.onUse(function(api) {
diff --git a/server.js b/server.js
index 2bc239ed..01a3645f 100644
--- a/server.js
+++ b/server.js
@@ -133,7 +133,7 @@ export class FilesCollection extends FilesCollectionCore {
check(this.collectionName, String);
if (this.public && !this.downloadRoute) {
- throw new Meteor.Error(500, `[FilesCollection.${this.collectionName}]: \"downloadRoute\" must be precisely provided on \"public\" collections! Note: \"downloadRoute\" must be equal or be inside of your web/proxy-server (relative) root.`);
+ throw new Meteor.Error(500, `[FilesCollection.${this.collectionName}]: "downloadRoute" must be precisely provided on "public" collections! Note: "downloadRoute" must be equal or be inside of your web/proxy-server (relative) root.`);
}
if (!_.isString(this.downloadRoute)) {
@@ -242,7 +242,7 @@ export class FilesCollection extends FilesCollectionCore {
}
if (this.public && !storagePath) {
- throw new Meteor.Error(500, `[FilesCollection.${this.collectionName}] \"storagePath\" must be set on \"public\" collections! Note: \"storagePath\" must be equal on be inside of your web/proxy-server (absolute) root.`);
+ throw new Meteor.Error(500, `[FilesCollection.${this.collectionName}] "storagePath" must be set on "public" collections! Note: "storagePath" must be equal on be inside of your web/proxy-server (absolute) root.`);
}
if (!storagePath) {
@@ -257,7 +257,7 @@ export class FilesCollection extends FilesCollectionCore {
this.storagePath = function () {
let sp = storagePath.apply(self, arguments);
if (!_.isString(sp)) {
- throw new Meteor.Error(400, `[FilesCollection.${self.collectionName}] \"storagePath\" function must return a String!`);
+ throw new Meteor.Error(400, `[FilesCollection.${self.collectionName}] "storagePath" function must return a String!`);
}
sp = sp.replace(/\/$/, '');
return nodePath.normalize(sp);
@@ -268,7 +268,7 @@ export class FilesCollection extends FilesCollectionCore {
fs.mkdirs(this.storagePath({}), { mode: this.parentDirPermissions }, (error) => {
if (error) {
- throw new Meteor.Error(401, `[FilesCollection.${self.collectionName}] Path \"${this.storagePath({})}\" is not writable!`, error);
+ throw new Meteor.Error(401, `[FilesCollection.${self.collectionName}] Path "${this.storagePath({})}" is not writable! ${error}`);
}
});
diff --git a/upload.js b/upload.js
index be4e7645..53a78f65 100644
--- a/upload.js
+++ b/upload.js
@@ -60,6 +60,7 @@ export class UploadInstance extends EventEmitter {
check(this.config, {
ddp: Match.Any,
file: Match.Any,
+ fileId: Match.Optional(String),
meta: Match.Optional(Object),
type: Match.Optional(String),
onError: Match.Optional(Function),
@@ -151,7 +152,7 @@ export class UploadInstance extends EventEmitter {
this.sentChunks = 0;
this.fileLength = 1;
this.EOFsent = false;
- this.fileId = Random.id();
+ this.fileId = this.config.fileId || Random.id();
this.FSName = this.collection.namingFunction ? this.collection.namingFunction(this.fileData) : this.fileId;
this.pipes = [];
diff --git a/write-stream.js b/write-stream.js
index aea0055a..d5396f14 100644
--- a/write-stream.js
+++ b/write-stream.js
@@ -41,12 +41,14 @@ export default class WriteStream {
fs.ensureFile(this.path, (efError) => {
bound(() => {
if (efError) {
- throw new Meteor.Error(500, '[FilesCollection] [writeStream] [ensureFile] [Error:]', efError);
+ this.abort();
+ throw new Meteor.Error(500, '[FilesCollection] [writeStream] [ensureFile] [Error:] ' + efError);
} else {
fs.open(this.path, 'r+', this.permissions, (oError, fd) => {
bound(() => {
if (oError) {
- throw new Meteor.Error(500, '[FilesCollection] [writeStream] [ensureFile] [open] [Error:]', oError);
+ this.abort();
+ throw new Meteor.Error(500, '[FilesCollection] [writeStream] [ensureFile] [open] [Error:] ' + oError);
} else {
this.fd = fd;
fdCache[this.path] = this;
|