Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Save messages in append-StorageFile #1498

Closed
wants to merge 3 commits into from
Closed

Save messages in append-StorageFile #1498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ebe6eb
messages: pass all messages through "message" event
rigrig Oct 28, 2022
718d4a3
messages: optimize MESSAGES usage
rigrig Oct 28, 2022
a762dc0
messages: save messages in a StorageFile
rigrig Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions apps/messages/ChangeLog
View file
Open in desktop
Expand Up @@ -73,3 +73,8 @@
Move WIDGETS.messages.buzz() to require("messages").buzz()
0.52: Fix require("messages").buzz() regression
Fix background color in messages list after one unread message is shown
0.53: Always use "message" events, even for the default app/widget



0.XX: Save messages in a StorageFile
102 changes: 68 additions & 34 deletions apps/messages/app.js
View file
Open in desktop
Expand Up @@ -48,9 +48,47 @@ we should start a timeout for settings.unreadTimeout to return
to the clock. */
var unreadTimeout;
/// List of all our messages
var MESSAGES = require("messages").getMessages();
if (!Array.isArray(MESSAGES)) MESSAGES=[];
var MESSAGES, modified = [];
function saveMessages() {
// only write modified messages
require("messages").write(MESSAGES.filter(m => modified.includes(m.id)));
}
function set(msg, key, val) {
if (msg[key]!==val) {
msg[key] = val;
if (msg.id && !modified.includes(msg.id)) modified.push(msg.id);
}
}
function markRead(msg) {
if (msg.new) set(msg, "new", false);
}
function remove(msg) {
if (!MESSAGES.some(m => m.id===msg.id)) return; // already gone
MESSAGES = MESSAGES.filter(m => m.id!==msg.id);
modified = modified.filter(id => id!==msg.id);
require("messages").remove(msg);
}
try {
MESSAGES = require("messages").getMessages();
// Write them back to storage when we're done
E.on("kill", saveMessages);
} catch (e) {
g.clear();
E.showPrompt(/*LANG*/"Message file corrupt, erase all messages?", {title:/*LANG*/"Delete All Messages"}).then(isYes => {
if (isYes) { // OK: erase message file and reload this app
require("messages").clearAll();
load("messages.app.js");
} else {
load();// well, this app won't work... let's go back to the clock
}
});
}
// used by lib.js to inform app of updates
var onMessagesModified = function(msg) {
if (msg.t==="remove") {
remove(msg);
msg = undefined;
}
// TODO: if new, show this new one
if (msg && msg.id!=="music" && msg.new && active!="map" &&
!((require('Storage').readJSON('setting.json', 1) || {}).quiet)) {
Expand All @@ -60,11 +98,13 @@ var onMessagesModified = function(msg) {
if (msg.state && msg.state!="play") openMusic = false; // no longer playing music to go back to
if (active!="music") return; // don't open music over other screens
}
if (msg && msg.id && !modified.includes(msg.id)) modified.push(msg.id);
showMessage(msg&&msg.id);
};
function saveMessages() {
require("Storage").writeJSON("messages.json",MESSAGES)
}
Bangle.on("message", (type, msg) => {
msg.handled = true;
onMessagesModified(msg);
});

function showMapMessage(msg) {
active = "map";
Expand Down Expand Up @@ -96,8 +136,7 @@ function showMapMessage(msg) {
g.reset().clearRect(Bangle.appRect);
layout.render();
function back() { // mark as not new and return to menu
msg.new = false;
saveMessages();
markRead(msg);
layout = undefined;
checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:0});
}
Expand Down Expand Up @@ -129,8 +168,7 @@ function showMusicMessage(msg) {
updateLabelsInterval = undefined;
openMusic = false;
var wasNew = msg.new;
msg.new = false;
saveMessages();
markRead(msg);
layout = undefined;
if (wasNew) checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:0,openMusic:0});
else checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
Expand Down Expand Up @@ -212,26 +250,20 @@ function showMessageSettings(msg) {
showMessageScroller(msg);
},
/*LANG*/"Delete" : () => {
MESSAGES = MESSAGES.filter(m=>m.id!=msg.id);
saveMessages();
remove(msg);
checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
},
/*LANG*/"Mark Unread" : () => {
msg.new = true;
saveMessages();
set(msg, "new", true);
checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
},
/*LANG*/"Mark all read" : () => {
MESSAGES.forEach(msg => msg.new = false);
saveMessages();
MESSAGES.forEach(markRead);
checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
},
/*LANG*/"Delete all messages" : () => {
E.showPrompt(/*LANG*/"Are you sure?", {title:/*LANG*/"Delete All Messages"}).then(isYes => {
if (isYes) {
MESSAGES = [];
saveMessages();
}
if (isYes) require('messages').clearAll();
checkMessages({clockIfNoMsg:0,clockIfAllRead:0,showMsgIfUnread:0,openMusic:0});
});
},
Expand Down Expand Up @@ -285,15 +317,15 @@ function showMessage(msgid) {
}
function goBack() {
layout = undefined;
msg.new = false; saveMessages(); // read mail
markRead(msg); // read mail
cancelReloadTimeout(); // don't auto-reload to clock now
checkMessages({clockIfNoMsg:1,clockIfAllRead:0,showMsgIfUnread:0,openMusic:openMusic});
}
var buttons = [
];
if (msg.positive) {
buttons.push({type:"btn", src:atob("GRSBAAAAAYAAAcAAAeAAAfAAAfAAAfAAAfAAAfAAAfBgAfA4AfAeAfAPgfAD4fAA+fAAP/AAD/AAA/AAAPAAADAAAA=="), cb:()=>{
msg.new = false; saveMessages();
markRead(msg);
cancelReloadTimeout(); // don't auto-reload to clock now
Bangle.messageResponse(msg,true);
checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:openMusic});
Expand All @@ -302,7 +334,7 @@ function showMessage(msgid) {
if (msg.negative) {
if (buttons.length) buttons.push({width:32}); // nasty hack...
buttons.push({type:"btn", src:atob("FhaBADAAMeAB78AP/4B/fwP4/h/B/P4D//AH/4AP/AAf4AB/gAP/AB/+AP/8B/P4P4fx/A/v4B//AD94AHjAAMA="), cb:()=>{
msg.new = false; saveMessages();
markRead(msg);
cancelReloadTimeout(); // don't auto-reload to clock now
Bangle.messageResponse(msg,false);
checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:openMusic});
Expand Down Expand Up @@ -420,17 +452,19 @@ function cancelReloadTimeout() {
unreadTimeout = undefined;
}

g.clear();
if (MESSAGES !== undefined) { // only if loading MESSAGES worked
g.clear();

Bangle.loadWidgets();
Bangle.drawWidgets();
Bangle.loadWidgets();
Bangle.drawWidgets();

setTimeout(() => {
var unreadTimeoutMillis = (settings.unreadTimeout || 60) * 1000;
if (unreadTimeoutMillis) {
unreadTimeout = setTimeout(load, unreadTimeoutMillis);
}
// only openMusic on launch if music is new
var newMusic = MESSAGES.some(m => m.id === "music" && m.new);
checkMessages({ clockIfNoMsg: 0, clockIfAllRead: 0, showMsgIfUnread: 1, openMusic: newMusic && settings.openMusic });
}, 10); // if checkMessages wants to 'load', do that
setTimeout(() => {
var unreadTimeoutMillis = (settings.unreadTimeout || 60) * 1000;
if (unreadTimeoutMillis) {
unreadTimeout = setTimeout(load, unreadTimeoutMillis);
}
// only openMusic on launch if music is new
var newMusic = MESSAGES.some(m => m.id === "music" && m.new);
checkMessages({ clockIfNoMsg: 0, clockIfAllRead: 0, showMsgIfUnread: 1, openMusic: newMusic && settings.openMusic });
}, 10); // if checkMessages wants to 'load', do that
}