Skip to content

Commit 3a7d3da

Browse files
committed
I'm crushing your head!
1 parent 3a79ee8 commit 3a7d3da

3 files changed

Lines changed: 25 additions & 16 deletions

File tree

coms/net/fs.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ MOST RECENT:
8383
".validate": "!data.exists() && newData.isString() && newData.val().length < 5"
8484
},
8585
"blobId": {
86-
".validate": "!data.exists() && newData.isNumber()"
86+
".validate": "newData.isNumber()"
8787
},
8888
"sid": {
8989
".validate": "newData.isString() && newData.val() === root.child('LOTW').child($ghid).child('cur_session_id').val()"
@@ -780,7 +780,8 @@ log(val);
780780
let do_inc;
781781
if (blob_id === 0) {
782782
use_blob_id = this.nextNodeId;
783-
cwarn(`UPDATING THE blobId of node(${node_id}) to ${use_blob_id}`);
783+
//cwarn(`UPDATING THE blobId of node(${node_id}) to ${use_blob_id}`);
784+
cwarn(`MAKE SURE THAT THE blobId PROPERTY OF THE NetFsDB NODE SOMEHOW GETS UPDATED TO: ${use_blob_id}`);
784785
do_inc = true;
785786
obj[`nodes/${node_id}/blobId`] = use_blob_id;
786787
obj['next_node_id'] = {
@@ -804,13 +805,19 @@ cwarn(`UPDATING THE blobId of node(${node_id}) to ${use_blob_id}`);
804805
sid: this.sid,
805806
contents: B64(bytes)
806807
};
808+
cwarn("SETBLOB!?!?!?");
809+
log(obj);
807810
let rv = await UPDATE(UBASE(), obj);
808811
if (isErr(rv)){
809812
cerr(rv);
810813
return;
811814
}
812815
if (do_inc) this.nextNodeId++;
813-
return bytes.byteLength;
816+
return {
817+
blobId: use_blob_id,
818+
size: bytes.byteLength
819+
};
820+
// return bytes.byteLength;
814821
}//»
815822

816823
}//»
@@ -978,7 +985,7 @@ for (let k of keys){
978985
let val;
979986
if (obj.type==="d") val = -1;
980987
else val = 0;
981-
blobIds.push(obj.blobId);
988+
blobIds.push(obj.blobId||0);
982989
names.push(name);
983990
vals.push(val);
984991
}
@@ -995,14 +1002,15 @@ globals.funcs["netfs.getUserDirList"] = get_user_dir_list;
9951002
const fb_read = async(ghid, blobId, opts={}) => {//«
9961003
//const fb_read = async(ghid, parid, name, opts={}) => {
9971004
cwarn(`READ(LOTW/${ghid}/blobs/${blobId})`);
1005+
let is_text = opts.forceText || opts.text;
9981006
if (!blobId) {
999-
if (opts.forceText) return "";
1007+
if (is_text) return "";
10001008
return new Uint8Array(0);
10011009
}
10021010
let rv = await GET(`LOTW/${ghid}/blobs/${blobId}`);
10031011
if (isErr(rv)) return;
10041012
let bytes = FROMB64(rv.val().contents);
1005-
if (opts.forceText) {
1013+
if (is_text) {
10061014
return new TextDecoder().decode(bytes);
10071015
}
10081016
return bytes;
@@ -1059,10 +1067,7 @@ if (!Number.isFinite(blob_id)){
10591067
cerr(`INVALID BLOB_ID (NAN: ${blob_id})`);
10601068
return;
10611069
}
1062-
if (blob_id <= 0){
1063-
cerr(`BLOB_ID <= 0 (${blob_id})`);
1064-
return;
1065-
}
1070+
10661071
let start_bytes;
10671072
if (opts.append){
10681073
let rv = await fb_read(uid, blob_id);

list.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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"]]]
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/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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -899,9 +899,11 @@ getValue(opts){return this.#_getVal(opts);}
899899
async setValue(val, opts){//«
900900

901901
let rv = await globals.funcs["netfs.fbSetBlob"](this.appData.id, this.id, this.blobId, val, opts);
902-
if (isNum(rv) && rv >= 0){
903-
this.size = rv;
904-
return true;
902+
//if (isNum(rv) && rv >= 0){
903+
if (rv && isNum(rv.size) && rv.size >= 0){
904+
this.blobId = rv.blobId;
905+
this.size = rv;
906+
return true;
905907
}
906908
cwarn("Unknown value returned from netfs.fbSetBlob!");
907909
log(rv);
@@ -2517,7 +2519,7 @@ let blobids = list.blobIds;
25172519
for (let i=0; i < names.length; i++){
25182520
let nm = names[i];
25192521
let val = vals[i];
2520-
let blobid = blobids[i];
2522+
//let blobid = blobids[i];
25212523
let kid;
25222524
if (val === -1){
25232525
kid = mk_dir_kid(parobj, nm, {
@@ -2530,9 +2532,11 @@ else{
25302532
isNetFile: true,
25312533
appData
25322534
});
2535+
kid.blobId = blobids[i];
25332536
}
25342537
kid.id = ids[i];
2535-
if (blobid) kid.blobId = blobid;
2538+
//if (blobid) kid.blobId = blobid;
2539+
//if (blobid) kid.blobId = blobid;
25362540
//log(kid);
25372541
kids[nm] = kid;
25382542
}

0 commit comments

Comments
 (0)