Fix Blob content tpye not parsed correctly

Added getBlob method to query result
SaltechSystems · Jul 25, 2020 · dc597fb · dc597fb
1 parent d03f2c3
commit dc597fb
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/lib/src/blob.dart b/lib/src/blob.dart
@@ -5,7 +5,7 @@ class Blob {
   Blob.data(this._contentType, this._data);
 
   Blob._fromMap(Map<String, dynamic> map) {
-    this._contentType = map["contentType"];
+    this._contentType = map["content_type"];
     this._digest = map["digest"];
     this._length = map["length"];
   }
@@ -21,24 +21,29 @@ class Blob {
   String get contentType => _contentType;
   String get digest => _digest;
   int get length => _length;
+
+  set dbName(String dbName) => this._dbname = dbName;
+  set documentID(String id) => this._documentID = id;
+  set documentKey(String key) => this._documentKey = key;
+
   Future<Uint8List> get content async {
-    if (_shouldLoadData) {
-      return await Database._methodChannel.invokeMethod(
+    if (_data == null) {
+      _data = await Database._methodChannel.invokeMethod(
           'getBlobContentFromDocumentWithId', <String, dynamic>{
         'database': _dbname,
         'id': _documentID,
         'key': _documentKey,
         'digest': _digest
       });
-    } else {
-      return _data;
     }
+
+    return _data;
   }
 
   /// Gets content of the current object as a Dictionary.
   ///
   /// - Returns: The Dictionary representing the content of the current object.
   Map<String, dynamic> toMap() {
-    return {"contentType": _contentType, "data": _data, "@type": "blob"};
+    return {"content_type": _contentType, "data": _data, "@type": "blob"};
   }
 }
diff --git a/lib/src/document.dart b/lib/src/document.dart
@@ -95,7 +95,7 @@ class Document {
     Map<String, dynamic> _result = getMap(key);
     if (_result is Map && _result["@type"] == "blob") {
       if (_result.containsKey("data")) {
-        return Blob.data(_result["contentType"], _result["data"]);
+        return Blob.data(_result["content_type"], _result["data"]);
       } else {
         var _blob = Blob._fromMap(_result);
         _blob._dbname = _dbname;

diff --git a/lib/src/query/result.dart b/lib/src/query/result.dart
@@ -1,6 +1,12 @@
 part of couchbase_lite;
 
 class Result {
+  Result.fromMap(Map<String, dynamic> map) {
+    this._internalMap = map;
+  }
+
+  Result();
+
   Map<String, dynamic> _internalMap = {};
   List<dynamic> _internalList = [];
 
@@ -33,7 +39,14 @@ class Result {
     }
   }
 
-  //TODO: implement getBlob()
+  Blob getBlob({int index, String key}) {
+    var result = getValue(index: index, key: key);
+    if (null != result) {
+      return Blob._fromMap(result);
+    } else {
+      return null;
+    }
+  }
 
   bool getBoolean({int index, String key}) {
     var result = getValue(index: index, key: key);