I'm crushing your head!

Author: linuxontheweb

coms/net/fs.js

@@ -83,7 +83,7 @@ MOST RECENT:
 							".validate": "!data.exists() && newData.isString() && newData.val().length < 5"
 						},
 						"blobId": {
-							".validate": "!data.exists() && newData.isNumber()"
+							".validate": "newData.isNumber()"
 						},
 						"sid": {
 							".validate": "newData.isString() && newData.val() === root.child('LOTW').child($ghid).child('cur_session_id').val()" 
@@ -780,7 +780,8 @@ log(val);
 	let do_inc;
 	if (blob_id === 0) {
 		use_blob_id = this.nextNodeId;
-cwarn(`UPDATING THE blobId of node(${node_id}) to ${use_blob_id}`);
+//cwarn(`UPDATING THE blobId of node(${node_id}) to ${use_blob_id}`);
+cwarn(`MAKE SURE THAT THE blobId PROPERTY OF THE NetFsDB NODE SOMEHOW GETS UPDATED TO: ${use_blob_id}`);
 		do_inc = true;
 		obj[`nodes/${node_id}/blobId`] = use_blob_id;
 		obj['next_node_id'] = {
@@ -804,13 +805,19 @@ cwarn(`UPDATING THE blobId of node(${node_id}) to ${use_blob_id}`);
 		sid: this.sid,
 		contents: B64(bytes)
 	};
+cwarn("SETBLOB!?!?!?");
+log(obj);
 	let rv = await UPDATE(UBASE(), obj);
 if (isErr(rv)){
 cerr(rv);
 return;
 }
 	if (do_inc) this.nextNodeId++;
-	return bytes.byteLength;
+return {
+blobId: use_blob_id,
+size: bytes.byteLength
+};
+//	return bytes.byteLength;
 }//»
 
 }//»
@@ -978,7 +985,7 @@ for (let k of keys){
 	let val;
 	if (obj.type==="d") val = -1;
 	else val = 0;
-	blobIds.push(obj.blobId);
+	blobIds.push(obj.blobId||0);
 	names.push(name);
 	vals.push(val);
 }
@@ -995,14 +1002,15 @@ globals.funcs["netfs.getUserDirList"] = get_user_dir_list;
 const fb_read = async(ghid, blobId, opts={}) => {//«
 //const fb_read = async(ghid, parid, name, opts={}) => {
 cwarn(`READ(LOTW/${ghid}/blobs/${blobId})`);
+	let is_text = opts.forceText || opts.text;
 	if (!blobId) {
-		if (opts.forceText) return "";
+		if (is_text) return "";
 		return new Uint8Array(0);
 	}
 	let rv = await GET(`LOTW/${ghid}/blobs/${blobId}`);
 	if (isErr(rv)) return;
 	let bytes = FROMB64(rv.val().contents);
-	if (opts.forceText) {
+	if (is_text) {
 		return new TextDecoder().decode(bytes);
 	}
 	return bytes;
@@ -1059,10 +1067,7 @@ if (!Number.isFinite(blob_id)){
 cerr(`INVALID BLOB_ID (NAN: ${blob_id})`);
 return;
 }
-if (blob_id <= 0){
-cerr(`BLOB_ID <= 0 (${blob_id})`);
-return;
-}
+
 let start_bytes;
 if (opts.append){
 let rv = await fb_read(uid, blob_id);

list.json

@@ -1 +1 @@
-["README.md/2181","app",["3d",["index.html/1098"]],"apps",["Audio.js/4093","BinView.js/9814","Folder.js/11292","Help.js/979","MediaPlayer.js/2074","Music.js/4844","Terminal.js/101102","TextEdit.js/5397","WorkMan.js/3808","YourApp.js/418","dev",["GetPoint.js/551","Grok.js/14796","Poker.js/36551","Three.js/5119"],"games",["Arcade.js/12602"],"hw",["MidiCtl.js/3691"],"media",["2Cameras.js/3258","Camera.js/3673","MediaPlayer.js/16115","VideoCutter.js/61912"],"template",["Basic.js/489","Template.js/396","WebAudio.js/2877"],"util",["HTML.js/1428","ImageView.js/2703","Unicoder.js/16896"]],"coms",["audio.js/1766","esprima.js/171872","extra.js/11321","fs.js/29011","games",["cfr.js/115420","poker.js/107498","slum.js/71075","zhold",["poker1.js/25062"]],"mail.js/44068","net",["fs.js/67648"],"shell.js/175037","template.js/336","test",["dummy.js/21"],"test.js/2026","yt.js/66863","zhold",["mail.js/22724"]],"desk",["index.html/1436"],"index.html/486","login",["index.html/11784"],"mods",["audio",["multi_freq_worklet.js/1502","random_walk_worklet.js/3039"],"games",["GBEmulator.js/9655","NESEmulator.js/222309","binjgb.wasm/87232"],"help",["shell.js/3591"],"hw",["midi.js/2323"],"lang",["shell.js/185870"],"term",["email.js/10406","less.js/19318","log.js/13292","vim.js/163457"],"util",["libwabt.js/1299054","math.js/12125","pretty.js/93856","showdown.js/87205","walt.js/204893","wasm.js/42764","wasmparser.js/34331","webmparser.js/58730"],"workers",["poker.js/37420"]],"node",["server.js/7969","svcs",["imap.js/17772","mount.js/16553","smtp.js/1359","template.js/1831","ws.js/2156","ytdl.js/11982"]],"shell",["index.html/1211"],"sys",["config.js/9942","desk.js/220193","fs.js/78832","terminal.js/4307","three.js/3443","util.js/33015"],"www",["blog.css/181","desk.css/1831","docs",["blog-template.html/291","help.html/9104","what-it-is.html/4370"],"examples",["test.sh/66"],"favicon.ico/15086","lotw256.png/41075","lotw48.png/2966","stuff",["noise.html/1669"]]]
+["README.md/2181","app",["3d",["index.html/1098"]],"apps",["Audio.js/4093","BinView.js/9814","Folder.js/11292","Help.js/979","MediaPlayer.js/2074","Music.js/4844","Terminal.js/101102","TextEdit.js/5397","WorkMan.js/3808","YourApp.js/418","dev",["GetPoint.js/551","Grok.js/14796","Poker.js/36551","Three.js/5119"],"games",["Arcade.js/12602"],"hw",["MidiCtl.js/3691"],"media",["2Cameras.js/3258","Camera.js/3673","MediaPlayer.js/16115","VideoCutter.js/61912"],"template",["Basic.js/489","Template.js/396","WebAudio.js/2877"],"util",["HTML.js/1428","ImageView.js/2703","Unicoder.js/16896"]],"coms",["audio.js/1766","esprima.js/171872","extra.js/11321","fs.js/29011","games",["cfr.js/115420","poker.js/107498","slum.js/71075","zhold",["poker1.js/25062"]],"mail.js/44068","net",["fs.js/67799"],"shell.js/175037","template.js/336","test",["dummy.js/21"],"test.js/2026","yt.js/66863","zhold",["mail.js/22724"]],"desk",["index.html/1436"],"index.html/486","login",["index.html/11784"],"mods",["audio",["multi_freq_worklet.js/1502","random_walk_worklet.js/3039"],"games",["GBEmulator.js/9655","NESEmulator.js/222309","binjgb.wasm/87232"],"help",["shell.js/3591"],"hw",["midi.js/2323"],"lang",["shell.js/185870"],"term",["email.js/10406","less.js/19318","log.js/13292","vim.js/163457"],"util",["libwabt.js/1299054","math.js/12125","pretty.js/93856","showdown.js/87205","walt.js/204893","wasm.js/42764","wasmparser.js/34331","webmparser.js/58730"],"workers",["poker.js/37420"]],"node",["server.js/7969","svcs",["imap.js/17772","mount.js/16553","smtp.js/1359","template.js/1831","ws.js/2156","ytdl.js/11982"]],"shell",["index.html/1211"],"sys",["config.js/9942","desk.js/220193","fs.js/78970","terminal.js/4307","three.js/3443","util.js/33015"],"www",["blog.css/181","desk.css/1831","docs",["blog-template.html/291","help.html/9104","what-it-is.html/4370"],"examples",["test.sh/66"],"favicon.ico/15086","lotw256.png/41075","lotw48.png/2966","stuff",["noise.html/1669"]]]

sys/fs.js

@@ -899,9 +899,11 @@ getValue(opts){return this.#_getVal(opts);}
 async setValue(val, opts){//«
 
 let rv = await globals.funcs["netfs.fbSetBlob"](this.appData.id, this.id, this.blobId, val, opts);
-if (isNum(rv) && rv >= 0){
-this.size = rv;
-return true;
+//if (isNum(rv) && rv >= 0){
+if (rv && isNum(rv.size) && rv.size >= 0){
+	this.blobId = rv.blobId;
+	this.size = rv;
+	return true;
 }
 cwarn("Unknown value returned from netfs.fbSetBlob!");
 log(rv);
@@ -2517,7 +2519,7 @@ let blobids = list.blobIds;
 for (let i=0; i < names.length; i++){
 let nm = names[i];
 let val = vals[i];
-let blobid = blobids[i];
+//let blobid = blobids[i];
 let kid;
 if (val === -1){
 	kid = mk_dir_kid(parobj, nm, {
@@ -2530,9 +2532,11 @@ else{
 		isNetFile: true,
 		appData
 	});
+	kid.blobId = blobids[i];
 }
 kid.id = ids[i];
-if (blobid) kid.blobId = blobid;
+//if (blobid) kid.blobId = blobid;
+//if (blobid) kid.blobId = blobid;
 //log(kid);
 kids[nm] = kid;
 }