From d48a3392581e389a7f3c22de75cd2758bf683f5b Mon Sep 17 00:00:00 2001 From: Sam McAlilly <38969506+smcalilly@users.noreply.github.com> Date: Wed, 3 Feb 2021 22:17:44 -0600 Subject: [PATCH 01/14] Create app.js --- apps/obliquestrategies/app.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 apps/obliquestrategies/app.js diff --git a/apps/obliquestrategies/app.js b/apps/obliquestrategies/app.js new file mode 100644 index 000000000..515a6e778 --- /dev/null +++ b/apps/obliquestrategies/app.js @@ -0,0 +1,29 @@ +const strategies = ['Abandon normal instruments', 'Accept advice', 'Accretion', 'A line has two sides', 'Allow an easement (an easement is the abandonment of a stricture)', 'Are there sections? Consider transitions', 'Ask people to work against their better judgement', 'Ask your body', 'Assemble some of the instruments in a group and treat the group', 'Balance the consistency principle with the inconsistency principle', 'Be dirty', 'Breathe more deeply', 'Bridges -build -burn', 'Cascades', 'Change instrument roles', 'Change nothing and continue with immaculate consistency', "Children's voices -speaking -singing", 'Cluster analysis', 'Consider different fading systems', 'Consult other sources -promising -unpromising', 'Convert a melodic element into a rhythmic element', 'Courage!', 'Cut a vital connection', 'Decorate, decorate', "Define an area as `safe' and use it as an anchor", 'Destroy -nothing -the most important thing', 'Discard an axiom', 'Disconnect from desire', 'Discover the recipes you are using and abandon them', 'Distorting time', 'Do nothing for as long as possible', "Don't be afraid of things because they're easy to do", "Don't be frightened of cliches", "Don't be frightened to display your talents", "Don't break the silence", "Don't stress one thing more than another", 'Do something boring', 'Do the washing up', 'Do the words need changing?', 'Do we need holes?', 'Emphasize differences', 'Emphasize repetitions', 'Emphasize the flaws', 'Faced with a choice, do both (given by Dieter Rot)', 'Feedback recordings into an acoustic situation', 'Fill every beat with something', 'Get your neck massaged', 'Ghost echoes', 'Give the game away', 'Give way to your worst impulse', 'Go slowly all the way round the outside', 'Honor thy error as a hidden intention', 'How would you have done it?', 'Humanize something free of error', 'Imagine the music as a moving chain or caterpillar', 'Imagine the music as a set of disconnected events', 'Infinitesimal gradations', 'Intentions -credibility of -nobility of -humility of', 'Into the impossible', 'Is it finished?', 'Is there something missing?', 'Is the tuning appropriate?', 'Just carry on', 'Left channel, right channel, centre channel', 'Listen in total darkness, or in a very large room, very quietly', 'Listen to the quiet voice', 'Look at a very small object, look at its centre', 'Look at the order in which you do things', 'Look closely at the most embarrassing details and amplify them', 'Lowest common denominator check -single beat -single note -single', 'riff', 'Make a blank valuable by putting it in an exquisite frame', 'Make an exhaustive list of everything you might do and do the last', 'thing on the list', 'Make a sudden, destructive unpredictable action; incorporate', 'Mechanicalize something idiosyncratic', 'Mute and continue', 'Only one element of each kind', '(Organic) machinery', 'Overtly resist change', 'Put in earplugs', 'Remember those quiet evenings', 'Remove ambiguities and convert to specifics', 'Remove specifics and convert to ambiguities', 'Repetition is a form of change', 'Reverse', 'Short circuit (example: a man eating peas with the idea that they will', 'improve his virility shovels them straight into his lap)', 'Shut the door and listen from outside', 'Simple subtraction', 'Spectrum analysis', 'Take a break', 'Take away the elements in order of apparent non-importance', 'Tape your mouth (given by Ritva Saarikko)', 'The inconsistency principle', 'The tape is now the music', 'Think of the radio', 'Tidy up', 'Trust in the you of now', 'Turn it upside down', 'Twist the spine', 'Use an old idea', 'Use an unacceptable color', 'Use fewer notes', 'Use filters', 'Use "unqualified" people', 'Water', 'What are you really thinking about just now? Incorporate', 'What is the reality of the situation?', 'What mistakes did you make last time?', 'What would your closest friend do?', "What wouldn't you do?", 'Work at a different speed', 'You are an engineer', 'You can only make one dot at a time', "You don't have to be ashamed of using your own ideas", '[blank white card]'] + +const spentStrategies = [] + +function chooseObliqueness() { + const strategy = strategies[Math.floor(Math.random() * strategies.length)]; + spentStrategies.push(strategy); + return strategy +} + +// app intro +E.showMessage('oblique strategies\n\ncopied from\nbrian eno\n\nclick btn2'); + +setWatch(() => { + // beep! + Bangle.beep(); + + // get the strategy + const strategy = chooseObliqueness(); + + // configure font + g.setFontAlign(0,0); + + // show the oblique strategy + E.showMessage(strategy.replace(/\s/g, '\n')); + + // clear the screen + setTimeout(() => g.clear(), 10000); +}, BTN2, { repeat: true }); From 57cd1176255025720ac588fe2bf33cd9270e5b41 Mon Sep 17 00:00:00 2001 From: Sam McAlilly <38969506+smcalilly@users.noreply.github.com> Date: Wed, 3 Feb 2021 22:20:04 -0600 Subject: [PATCH 02/14] Create app-icon.js --- apps/obliquestrategies/app-icon.js | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 apps/obliquestrategies/app-icon.js diff --git a/apps/obliquestrategies/app-icon.js b/apps/obliquestrategies/app-icon.js new file mode 100644 index 000000000..c513aa80b --- /dev/null +++ b/apps/obliquestrategies/app-icon.js @@ -0,0 +1,2 @@ +require("heatshrink").decompress(atob("/4Ac+4CB8EAj4FC+AFK/AFH+YFE/YFB/gFB+IFHEYXwg41DAoPD7AFCh0AAoZoBAoovCAoMIAodAjF8AoXMvgFC/HP/k8AoXHAof/+f83gFC+H8hAFC/F8jALDjkcOIXwhgpCBYMPMoRdBh/MAocAnAFC4AFDCgMAFIX+AoILCAoRfCCIMDAoqPCDoQABL4IFGhgFIDQJYBAo7/VAAI=")) +} From b9e5be7004e52e7590cf9eeab321f946dd71a9bf Mon Sep 17 00:00:00 2001 From: Sam McAlilly <38969506+smcalilly@users.noreply.github.com> Date: Wed, 3 Feb 2021 22:23:17 -0600 Subject: [PATCH 03/14] Update apps.json --- apps.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/apps.json b/apps.json index 8e2423bfd..e448fb3f0 100644 --- a/apps.json +++ b/apps.json @@ -2739,6 +2739,17 @@ {"name":"tapelaunch.app.js","url":"app.js"}, {"name":"tapelaunch.img","url":"icon.js","evaluate":true} ] +}, +{ "id": "oblique", + "name": "Oblique Strategies", + "icon": "eno.png", + "version":"0.01", + "description": "Oblique Strategies for creative vigor. Copied from Brian Eno.", + "tags": "tool", + "storage": [ + {"name":"obliquestrategies.app.js","url":"app.js"}, + {"name":"eno.img","url":"app-icon.js","evaluate":true} + ] } ] From f5444623280c4060fec3fbe58b27816b3964cab9 Mon Sep 17 00:00:00 2001 From: Sam McAlilly <38969506+smcalilly@users.noreply.github.com> Date: Wed, 3 Feb 2021 22:25:21 -0600 Subject: [PATCH 04/14] Add files via upload --- apps/obliquestrategies/eno.png | Bin 0 -> 3601 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 apps/obliquestrategies/eno.png diff --git a/apps/obliquestrategies/eno.png b/apps/obliquestrategies/eno.png new file mode 100644 index 0000000000000000000000000000000000000000..5f3418cc9a5eb99e2c666983c5aa4b9335caa8a8 GIT binary patch literal 3601 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 Date: Wed, 3 Feb 2021 22:30:18 -0600 Subject: [PATCH 05/14] Update apps.json --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index e448fb3f0..11472d964 100644 --- a/apps.json +++ b/apps.json @@ -2740,7 +2740,7 @@ {"name":"tapelaunch.img","url":"icon.js","evaluate":true} ] }, -{ "id": "oblique", +{ "id": "obliquestrategies", "name": "Oblique Strategies", "icon": "eno.png", "version":"0.01", From 81bd42f14bd83038f342b37c4ff920156d6099ea Mon Sep 17 00:00:00 2001 From: Sam McAlilly <38969506+smcalilly@users.noreply.github.com> Date: Wed, 3 Feb 2021 22:34:10 -0600 Subject: [PATCH 06/14] Update apps.json --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index 11472d964..5699c3537 100644 --- a/apps.json +++ b/apps.json @@ -2744,7 +2744,7 @@ "name": "Oblique Strategies", "icon": "eno.png", "version":"0.01", - "description": "Oblique Strategies for creative vigor. Copied from Brian Eno.", + "description": "Oblique Strategies for creativity. Copied from Brian Eno.", "tags": "tool", "storage": [ {"name":"obliquestrategies.app.js","url":"app.js"}, From 9938b25a2428ac41c21939ae3da6a5abaf87475b Mon Sep 17 00:00:00 2001 From: Sam McAlilly Date: Wed, 3 Feb 2021 22:56:23 -0600 Subject: [PATCH 07/14] add oblique strategies to the app loader --- apps.json | 8 ++++---- apps/{obliquestrategies => oblique}/app.js | 0 apps/{obliquestrategies => oblique}/eno.png | Bin .../app-icon.js => oblique/icon.js} | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) rename apps/{obliquestrategies => oblique}/app.js (100%) rename apps/{obliquestrategies => oblique}/eno.png (100%) rename apps/{obliquestrategies/app-icon.js => oblique/icon.js} (74%) diff --git a/apps.json b/apps.json index 5699c3537..04c8b1580 100644 --- a/apps.json +++ b/apps.json @@ -2740,15 +2740,15 @@ {"name":"tapelaunch.img","url":"icon.js","evaluate":true} ] }, -{ "id": "obliquestrategies", +{ "id": "oblique", "name": "Oblique Strategies", "icon": "eno.png", - "version":"0.01", + "version": "0.01", "description": "Oblique Strategies for creativity. Copied from Brian Eno.", "tags": "tool", "storage": [ - {"name":"obliquestrategies.app.js","url":"app.js"}, - {"name":"eno.img","url":"app-icon.js","evaluate":true} + {"name":"oblique.app.js","url":"app.js"}, + {"name":"eno.img","url":"icon.js","evaluate":true} ] } diff --git a/apps/obliquestrategies/app.js b/apps/oblique/app.js similarity index 100% rename from apps/obliquestrategies/app.js rename to apps/oblique/app.js diff --git a/apps/obliquestrategies/eno.png b/apps/oblique/eno.png similarity index 100% rename from apps/obliquestrategies/eno.png rename to apps/oblique/eno.png diff --git a/apps/obliquestrategies/app-icon.js b/apps/oblique/icon.js similarity index 74% rename from apps/obliquestrategies/app-icon.js rename to apps/oblique/icon.js index c513aa80b..747879509 100644 --- a/apps/obliquestrategies/app-icon.js +++ b/apps/oblique/icon.js @@ -1,2 +1 @@ -require("heatshrink").decompress(atob("/4Ac+4CB8EAj4FC+AFK/AFH+YFE/YFB/gFB+IFHEYXwg41DAoPD7AFCh0AAoZoBAoovCAoMIAodAjF8AoXMvgFC/HP/k8AoXHAof/+f83gFC+H8hAFC/F8jALDjkcOIXwhgpCBYMPMoRdBh/MAocAnAFC4AFDCgMAFIX+AoILCAoRfCCIMDAoqPCDoQABL4IFGhgFIDQJYBAo7/VAAI=")) -} +require("heatshrink").decompress(atob("/4Ac+4CB8EAj4FC+AFK/AFH+YFE/YFB/gFB+IFHEYXwg41DAoPD7AFCh0AAoZoBAoovCAoMIAodAjF8AoXMvgFC/HP/k8AoXHAof/+f83gFC+H8hAFC/F8jALDjkcOIXwhgpCBYMPMoRdBh/MAocAnAFC4AFDCgMAFIX+AoILCAoRfCCIMDAoqPCDoQABL4IFGhgFIDQJYBAo7/VAAI=")) \ No newline at end of file From b1ed54ef86ba00dc0f4dcad06fc58cd6c361a80e Mon Sep 17 00:00:00 2001 From: Sam McAlilly Date: Wed, 3 Feb 2021 23:01:56 -0600 Subject: [PATCH 08/14] change oblique image --- apps/oblique/icon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/oblique/icon.js b/apps/oblique/icon.js index 747879509..4410b1581 100644 --- a/apps/oblique/icon.js +++ b/apps/oblique/icon.js @@ -1 +1 @@ -require("heatshrink").decompress(atob("/4Ac+4CB8EAj4FC+AFK/AFH+YFE/YFB/gFB+IFHEYXwg41DAoPD7AFCh0AAoZoBAoovCAoMIAodAjF8AoXMvgFC/HP/k8AoXHAof/+f83gFC+H8hAFC/F8jALDjkcOIXwhgpCBYMPMoRdBh/MAocAnAFC4AFDCgMAFIX+AoILCAoRfCCIMDAoqPCDoQABL4IFGhgFIDQJYBAo7/VAAI=")) \ No newline at end of file +require("heatshrink").decompress(atob("mEwgP/ADn3AQPggEfAoXwApX4Ao/zAon7AoP8AoPxAo4jC+EHGoYFB4fYAoUOgAFDNYIFFF4QFBhAFDoEYvgFC5l8AoX45/8ngFC44FD//z/m8AoXw/kIAoX4vkYBYccjhxC+EMFIQLBh5lCLoMP5gFDgE4AoXAAoYUBgApC/wFBBYQFCL4QRBgYFFR4QdCAAJfBAo0MApAaBLAIFHf6oABA")) \ No newline at end of file From e7f330490479eae2f29c835a73143cc3239381ed Mon Sep 17 00:00:00 2001 From: Sam McAlilly Date: Wed, 3 Feb 2021 23:06:41 -0600 Subject: [PATCH 09/14] change oblique image --- apps/oblique/icon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/oblique/icon.js b/apps/oblique/icon.js index 4410b1581..681cc6d10 100644 --- a/apps/oblique/icon.js +++ b/apps/oblique/icon.js @@ -1 +1 @@ -require("heatshrink").decompress(atob("mEwgP/ADn3AQPggEfAoXwApX4Ao/zAon7AoP8AoPxAo4jC+EHGoYFB4fYAoUOgAFDNYIFFF4QFBhAFDoEYvgFC5l8AoX45/8ngFC44FD//z/m8AoXw/kIAoX4vkYBYccjhxC+EMFIQLBh5lCLoMP5gFDgE4AoXAAoYUBgApC/wFBBYQFCL4QRBgYFFR4QdCAAJfBAo0MApAaBLAIFHf6oABA")) \ No newline at end of file +require("heatshrink").decompress(atob("mEwwkE/4A///zmfzn4fbDhQqBAAQMHj4XJ+SQGh4MDl4vKgMRAAgXEF5X/iAXWkEQIoQ0BC4kTC5UwC4cAC4sSC5XxgIXJkJwDPBAXJiCQCmbEGC5kTn7PBC4vzkMRC5UQgUikYuFmILBC5SwCVYMikMSmf/gaPLEYMBMQMwW4fzgUyL5YwCkQLBAATKBmJfMiIlBB4Q1BBYPwC5oZCiMSOgKUB+RHMkQlBN4MjCYMDC50jiMzgMiYgMBgQXMTYMziM/a4QXBgLvM+MBmcSiYIDkAXBHgQXI+cj+ciOQQABkMibIIXKAAMzmYqBDAUBkEAkRHKLQcgiBJB+bBBgZTBC5MvC4apBU4UAl53Lj4XCbYUCCYIzCC5RsBWwakCQYYXKAAUxBwMRYYUykUyC5swLwMBiESUQM/O5a/COwQYBAIIyBmAXLZ4IsBBoYABgUwBAYXHmUABogFCl4XL/8yiINESIMjNAIvLLoYWDQAYXLLoh1Ckc//7fBC5LUCC4gCBgUQBQoXFWYp1BRwIsBQAoXNn5JBNAgXHdgIAEiH/C4QAGC4kgEgsD+YHFAAYXEEY0v+QuIiMfa4gAh+cz/8z+c/AIIXQAQIVBAwQYQABI=")) \ No newline at end of file From 2eef8fc019e2809a9c18091081a727fb101f3dc6 Mon Sep 17 00:00:00 2001 From: Sam McAlilly Date: Wed, 3 Feb 2021 23:13:00 -0600 Subject: [PATCH 10/14] fix oblique js icon --- apps.json | 2 +- apps/oblique/{icon.js => app-icon.js} | 0 package.json | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename apps/oblique/{icon.js => app-icon.js} (100%) diff --git a/apps.json b/apps.json index 04c8b1580..0c011f038 100644 --- a/apps.json +++ b/apps.json @@ -2748,7 +2748,7 @@ "tags": "tool", "storage": [ {"name":"oblique.app.js","url":"app.js"}, - {"name":"eno.img","url":"icon.js","evaluate":true} + {"name":"oblique.img","url":"app-icon.js","evaluate":true} ] } diff --git a/apps/oblique/icon.js b/apps/oblique/app-icon.js similarity index 100% rename from apps/oblique/icon.js rename to apps/oblique/app-icon.js diff --git a/package.json b/package.json index b796044c9..386730a81 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,6 @@ "start": "npx http-server -c-1" }, "dependencies": { - "acorn": "^7.2.0" + "acorn": "^7.4.1" } } From 3837586da13263b25b024817106b388a0cd0deab Mon Sep 17 00:00:00 2001 From: Sam McAlilly Date: Wed, 3 Feb 2021 23:16:20 -0600 Subject: [PATCH 11/14] revert package.json update --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 386730a81..b796044c9 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,6 @@ "start": "npx http-server -c-1" }, "dependencies": { - "acorn": "^7.4.1" + "acorn": "^7.2.0" } } From 27bdf73f6bbf6539ab051f8e7a0c92c2fc6541f1 Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Thu, 4 Feb 2021 08:10:42 +0000 Subject: [PATCH 12/14] fileman 0.03: Update RegExp use (Was using backreference instead of character code) --- apps.json | 2 +- apps/fileman/ChangeLog | 1 + apps/fileman/fileman.app.js | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps.json b/apps.json index 8e2423bfd..d63e7954e 100644 --- a/apps.json +++ b/apps.json @@ -2315,7 +2315,7 @@ "name": "File manager", "shortName":"FileManager", "icon": "icons8-filing-cabinet-48.png", - "version":"0.02", + "version":"0.03", "description": "Simple file manager, allows user to examine watch storage and display, load or delete individual files", "tags": "tools", "readme": "README.md", diff --git a/apps/fileman/ChangeLog b/apps/fileman/ChangeLog index 72ee0b566..f5af86229 100644 --- a/apps/fileman/ChangeLog +++ b/apps/fileman/ChangeLog @@ -1,2 +1,3 @@ 0.01: New app! 0.02: Improve handling of large amounts of files (fix #579) +0.03: Update RegExp use (Was using backreference instead of character code) diff --git a/apps/fileman/fileman.app.js b/apps/fileman/fileman.app.js index 03e135cb2..6a3c5598d 100644 --- a/apps/fileman/fileman.app.js +++ b/apps/fileman/fileman.app.js @@ -91,8 +91,8 @@ function drawMenu() { function get_pruned_file_list() { // get storagefile list - var sf = STOR.list(/\1$/).map(s=>s.slice(0,-1)); - var sffilter = f=>!sf.includes(f.slice(0,-1)) || f.endsWith("\1"); + var sf = STOR.list(/\x01$/).map(s=>s.slice(0,-1)); + var sffilter = f=>!sf.includes(f.slice(0,-1)) || f.endsWith("\x01"); // get files - put '.' last var fl = STOR.list(/^[^\.]/).filter(sffilter); fl.sort(); From 09e207ac3dab64ea759adf46305cb6de1251f562 Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Thu, 4 Feb 2021 08:11:21 +0000 Subject: [PATCH 13/14] Update banglerun interface's use of RegExp char code (was actually a backreference) --- apps/banglerun/interface.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/banglerun/interface.html b/apps/banglerun/interface.html index f9aa2fa1a..403f28258 100644 --- a/apps/banglerun/interface.html +++ b/apps/banglerun/interface.html @@ -141,7 +141,7 @@ function downloadTrack(trackid, callback) { function getTrackList() { Util.showModal("Loading Tracks..."); domTracks.innerHTML = ""; - Puck.eval(`require("Storage").list(/banglerun_.*\\1/).map(fn=>{fn=fn.slice(0,-1);var f=require("Storage").open(fn,"r");f.readLine();return fn+","+f.readLine()})`,trackLines=>{ + Puck.eval(`require("Storage").list(/banglerun_.*\\x01/).map(fn=>{fn=fn.slice(0,-1);var f=require("Storage").open(fn,"r");f.readLine();return fn+","+f.readLine()})`,trackLines=>{ var html = `

\n`; trackLines.forEach(l => { From 28c9dc67c67f6ccc6d656cd9086a251e4f3fa01f Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Thu, 4 Feb 2021 08:56:49 +0000 Subject: [PATCH 14/14] fix regex complaint --- apps/.eslintrc.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/.eslintrc.json b/apps/.eslintrc.json index f1726032a..9d4f8a4aa 100644 --- a/apps/.eslintrc.json +++ b/apps/.eslintrc.json @@ -155,6 +155,7 @@ // TODO: "no-undef": "warn", "no-undef": "off", "no-unused-vars": "off", - "no-useless-escape": "off" + "no-useless-escape": "off", + "no-control-regex" : "off" } }