Skip to content

Commit

Permalink
Associate .pushpush files with app (#14)
Browse files Browse the repository at this point in the history 
* Associate file_handlers

* Import .pushpush files on double clicking it

* rename functions to be more coherent

* rename fileImport() function
  • Loading branch information
@garubi
garubi authored Feb 2, 2024
1 parent dff6139 commit 387b128
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 43 deletions.
6 changes: 3 additions & 3 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<h1>
Push Push Editor
</h1>
[<a href="" x-data @click.prevent="file_export()" title="Save current settings in a file for later import">Export to file</a>]
[<a href="" x-data @click.prevent="file_import()" title="Read configuration from file">Import from file</a>]
[<a href="" x-data @click.prevent="fileExport()" title="Save current settings in a file for later import">Export to file</a>]
[<a href="" x-data @click.prevent="openFilePicker()" title="Read configuration from file">Import from file</a>]
<div class="row" x-show="$store.pp.pp_import_error" x-transition>
<h2>Import failed</h2>
<p>Push Push said: <span x-text="$store.pp.pp_import_error"></span></p>
Expand Down Expand Up @@ -292,7 +292,7 @@ <h2>Configure Push Push</h2>
</div>

<div class="six columns right">
<button type="button" x-data @click.prevent="store()" :disabled= !$store.pp.device class="button-primary">Store in <span x-text=$store.pp.device></span></button>
<button type="button" x-data @click.prevent="storeInPushPush()" :disabled= !$store.pp.device class="button-primary">Store in <span x-text=$store.pp.device></span></button>
</div>
</div>
<div class="row" x-show="!$store.pp.device">
Expand Down
84 changes: 44 additions & 40 deletions docs/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ function connect( ){
fromPushPush.addListener("sysex", parseSysEx);
}

function store(){
function storeInPushPush(){
Alpine.store('pp').pp_loading = true;
var sysex = [];
sysex.push(X_REQ, X_SET);
sysex = syx_enqueue( sysex );
sysex = sysEnqueueParams( sysex );
toPushPush.sendSysex(PP_MANUF, sysex);
}

function syx_enqueue( sysex ){
function sysEnqueueParams( sysex ){
sysex.push(Alpine.store('pp').pp_ver_major, Alpine.store('pp').pp_ver_minor, Alpine.store('pp').pp_ver_patch, Alpine.store('pp').pp_model_id, Alpine.store('pp').pp_num_buttons, Alpine.store('pp').pp_keys_sequence_size);

var parameters = Alpine.store('pp').pp_parameters
Expand All @@ -107,12 +107,12 @@ function syx_enqueue( sysex ){
return sysex;
}

function syx_is_pushpush( sysex ){
function syxIsPushPush( sysex ){
if ( sysex[1] != PP_MIDI_MANUF_ID_1 || sysex[2] != PP_MIDI_MANUF_ID_2 || sysex[3] != PP_MIDI_PRODUCT_ID ) return false; // Discard all SysEx that's not for this device
return true;
}

function syx_is_repl( sysex ){
function sysIsReply( sysex ){
if ( sysex[4] != X_REP ) return false; // Discard all messages that are not a reply
return true;
}
Expand Down Expand Up @@ -150,8 +150,8 @@ function assignParams( sysex ){

function parseSysEx( sysex ){
console.log('sysex: ', sysex );
if ( !syx_is_pushpush ( sysex.data ) ) return null;
if ( !syx_is_repl ( sysex.data ) ) return null;
if ( !syxIsPushPush ( sysex.data ) ) return null;
if ( !sysIsReply ( sysex.data ) ) return null;

Alpine.store('pp').pp_loading = false;

Expand Down Expand Up @@ -181,56 +181,61 @@ function parseSysEx( sysex ){
}
}

async function file_import(){
async function openFilePicker(){
let fileHandle;
try{
const pickerOpts = {
types: [
{
description: "Push Push editor files",
accept: {
"*/*": [".pushpush"],
"text/pushpush": [".pushpush"],
},
},
],
excludeAcceptAllOption: true,
multiple: false,
};
[fileHandle] = await window.showOpenFilePicker( pickerOpts );
const file = await fileHandle.getFile();
const content = await file.text();
const sysex = content.split(" ");
try{

if( sysex[0] != 240 || sysex[sysex.length -1] != 247 ) throw new TypeError("Wrong data format");
if ( !syx_is_pushpush ( sysex ) ) throw new TypeError("Data not for Push Push");
if( Alpine.store('pp').device ){
if ( Alpine.store('pp').pp_model_id != sysex[9] ) throw new TypeError("Data not for the connected Push Push model");
}
if ( !syx_is_repl ( sysex ) ) throw new TypeError("Data not for Push Push config");
if( sysex[5] != X_GET ) throw new TypeError("Data not for Push Push config file");
if( sysex.length != 2+11+sysex[10]*sysex[11]*2 ) throw new TypeError("Invalid data");

assignParams( sysex );
}
catch (e) {
console.error(e.message);
Alpine.store('pp').pp_import_error = e.message;
[fileHandle] = await window.showopenFilePicker( pickerOpts );
fileImport( fileHandle );

}
catch (e) {
console.error(e.message);
}
}

async function fileImport( fileHandle ){
const file = await fileHandle.getFile();
const content = await file.text();
const sysex = content.split(" ");
try{

if( sysex[0] != 240 || sysex[sysex.length -1] != 247 ) throw new TypeError("Wrong data format");
if ( !syxIsPushPush ( sysex ) ) throw new TypeError("Data not for Push Push");
if( Alpine.store('pp').device ){
if ( Alpine.store('pp').pp_model_id != sysex[9] ) throw new TypeError("Data not for the connected Push Push model");
}
if ( !sysIsReply ( sysex ) ) throw new TypeError("Data not for Push Push config");
if( sysex[5] != X_GET ) throw new TypeError("Data not for Push Push config file");
if( sysex.length != 2+11+sysex[10]*sysex[11]*2 ) throw new TypeError("Invalid data");

assignParams( sysex );
}
catch (e) {
console.error(e.message);
Alpine.store('pp').pp_import_error = e.message;
}
}

async function file_export() {
async function fileExport() {
try{
const options = {
types: [
{
description: 'Push Push editor files',
accept: {
'*/*': ['.pushpush'],
"text/pushpush": ['.pushpush'],
},
},
],
Expand All @@ -239,7 +244,7 @@ async function file_export() {

var sysex = [];
sysex.push( 240, PP_MIDI_MANUF_ID_1, PP_MIDI_MANUF_ID_2, PP_MIDI_PRODUCT_ID, X_REP, X_GET);
sysex = syx_enqueue( sysex );
sysex = sysEnqueueParams( sysex );
sysex.push(247);
sysex = sysex.join(' ');

Expand All @@ -259,12 +264,11 @@ async function file_export() {
}


// fileHandle is an instance of FileSystemFileHandle..
async function writeFile(fileHandle, contents) {
// Create a FileSystemWritableFileStream to write to.
const writable = await fileHandle.createWritable();
// Write the contents of the file to the stream.
await writable.write(contents);
// Close the file and write the contents to disk.
await writable.close();
if ("launchQueue" in window) {
launchQueue.setConsumer(async (launchParams) => {
console.log("launchQueue");
for (const fileHandle of launchParams.files) {
fileImport( fileHandle );
}
});
}
8 changes: 8 additions & 0 deletions docs/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,13 @@
"description": "An animated preview of the editor",
"form_factor": "narrow"
}
],
"file_handlers": [
{
"action": "./index.html",
"accept": {
"text/pushpush": [".pushpush"]
}
}
]
}

0 comments on commit 387b128

Please sign in to comment.