alchemy-media 0.9.0-alpha.2 → 0.9.0-alpha.4

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.9.0-alpha.4 (2024-10-10)
+
+* Make `MediaRaw#addFile(url)` support data uris too
+
+## 0.9.0-alpha.3 (2024-08-16)
+
+* Implement Alchemy v1.4 `Field` changes
+
 ## 0.9.0-alpha.2 (2024-02-19)
 
 * Add `getFile()` method to `MediaFile` and `MediaRaw` documents

package/helper_field/file_field_type.js

@@ -68,30 +68,31 @@ if (Blast.isBrowser) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  0.9.0
  *
- * @param    {Mixed}        value
- * @param    {Object}       data
- * @param    {Datasource}   datasource
- * @param    {Function}     callback
+ * @param    {Alchemy.OperationalContext.SaveFieldToDatasource}   context
+ * @param    {*} value
  *
- * @return   {Mixed}
+ * @return   {Pledge<ObjectId>|ObjectId}
  */
-FileField.setMethod(function _toDatasource(value, data, datasource, callback) {
+FileField.setMethod(function _toDatasource(context, value) {
 
-	var options = Object.assign({}, this.options);
+	let options = Object.assign({}, this.options);
 
-	if (typeof value == 'string' && (value.startsWith('http') || value.startsWith('/'))) {
+	let pass_through_media_file = typeof value == 'string' && (value.startsWith('http') || value.startsWith('/'));
 
-		this.getModel('MediaFile').addFile(value, options, function addedFile(err, result) {
-
-			if (err != null) {
-				return callback(err);
-			}
+	if (!pass_through_media_file) {
+		if (value && typeof value == 'object' && !alchemy.isObjectId(value)) {
+			pass_through_media_file = true;
+		}
+	}
 
-			callback(null, result._id);
-		});
-	} else {
-		callback(null, this.cast(value));
+	if (!pass_through_media_file) {
+		return this.cast(value);
 	}
+
+	return Swift.waterfall(
+		() => this.getModel('MediaFile').addFile(value, options),
+		result => result._id,
+	);
 });

package/model/media_file_model.js

@@ -151,6 +151,8 @@ MediaFile.Document.setFieldGetter(function path() {
  *
  * @param    {String|ObjectID}   id
  * @param    {Function}          callback
+ *
+ * @return   {Pledge<Alchemy.Document.MediaFile>}
  */
 MediaFile.setMethod(function getFile(id, callback) {
 
@@ -165,6 +167,9 @@ MediaFile.setMethod(function getFile(id, callback) {
 		}
 	};
 
+	let pledge = new Swift();
+	pledge.done(callback);
+
 	Function.series(function findInExtra(next) {
 		if (!alchemy.plugins.media.extra_media_model) {
 			return next();
@@ -209,15 +214,17 @@ MediaFile.setMethod(function getFile(id, callback) {
 	}, async function done(err) {
 
 		if (err) {
-			return callback(err);
+			return pledge.reject(err);
 		}
 
 		if (!result.MediaRaw) {
 			await result.populate('MediaRaw');
 		}
 
-		callback(null, result);
+		pledge.resolve(result);
 	});
+
+	return pledge;
 });
 
 /**

package/model/media_raw_model.js

@@ -192,7 +192,7 @@ MediaRaw.Document.setMethod(function extraImportFromStream(input) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  0.7.1
+ * @version  0.9.0
  *
  * @param    {String}   file      The path to the file, can be a URL
  * @param    {Object}   options
@@ -217,8 +217,11 @@ MediaRaw.setMethod(function addFile(file, options, callback) {
 		file = file.path;
 	}
 
+	let is_url = file.startsWith('http://') || file.startsWith('https://'),
+	    is_data_uri = !is_url && file.startsWith('data:');
+
 	// If the given file is actually a url, we'll need to download it first
-	if (file.startsWith('http://') || file.startsWith('https://')) {
+	if (is_url || is_data_uri) {
 
 		// Set the url as the origin
 		options.origin = file;
@@ -232,16 +235,18 @@ MediaRaw.setMethod(function addFile(file, options, callback) {
 				return callback(err);
 			}
 
-			if (!options.filename) {
-				options.filename = filename;
-			}
+			if (!is_data_uri) {
+				if (!options.filename) {
+					options.filename = filename;
+				}
 
-			if (!options.filename) {
-				options.filename = Url.parse(file).pathname.split('/').last();
-			}
+				if (!options.filename) {
+					options.filename = Url.parse(file).pathname.split('/').last();
+				}
 
-			if (!options.name) {
-				options.name = options.filename.beforeLast('.') || options.filename;
+				if (!options.name) {
+					options.name = options.filename.beforeLast('.') || options.filename;
+				}
 			}
 
 			that.addFile(tempfile, options, callback);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemy-media",
 	"description": "The media plugin for Alchemy",
-	"version": "0.9.0-alpha.2",
+	"version": "0.9.0-alpha.4",
 	"repository": {
 		"type" : "git",
 		"url"  : "https://github.com/11ways/alchemy-media.git"