update: bump 'common' version to 0.1.20

index.html

@@ -191,15 +191,14 @@ import { default as $, LogRecord, Rpc2 } from '/';
 let major = 0;
 let minor = 0;
 let busy = false;
+let save = false;
 let status = null;
 let locale = null;
 let unique = null;
-let writable = null;
+let filehandle = null;
-let filereader = null;
 let subcategories = [];
 
 window.addEventListener('beforeunload', (e) => {
-    writable?.abort();
     Rpc2.notify('exit');
     e.preventDefault();
     e.returnValue = '';
@@ -214,7 +213,7 @@ document.title += ` (${name})`;
 async function handlePrimaryButtonClick() {
     switch (status) {
         case 'IDLE':
-            let PickerOptions = {
+            [filehandle] = await showOpenFilePicker({
                 types: [
                     {
                         description: "Excel Spreadsheet",
@@ -223,17 +222,11 @@ async function handlePrimaryButtonClick() {
                         }
                     }
                 ]
-            };
+            });
-            let [handle] = await showOpenFilePicker(PickerOptions);
+            let chain = filehandle.getFile().then(f => Promise.all([f, f.arrayBuffer()]));
-            filereader = () => handle.getFile().then(file => new Promise((resolve, reject) => {
+            let [file, buffer] = await chain.catch(e => alert('(ERROR) ' + new String(e ?? 'Failed to load file')));
-                let reader = new FileReader();
-                reader.onload = () => resolve([file, reader.result]);
-                reader.onerror = () => reject(reader.error);
-                reader.readAsArrayBuffer(file);
-            }));
 
-            let [file, buffer] = await filereader().catch(e => alert('(ERROR) ' + new String(e ?? 'Unable to read data')));
+            save = await handle.requestPermission({ mode: 'readwrite' }) === 'granted';
-            writable = await handle.createWritable().catch(() => null);
             major = await Rpc2.invoke('loads', { params: [file.name, new Uint8Array(buffer).toBase64()] });
             $.get('#fileLabel').innerText = file.name;
             $.get('#fromLabel').innerText = parameters.account;
@@ -241,7 +234,7 @@ async function handlePrimaryButtonClick() {
             break;
         case 'READY':
             let locale = $('#locale').value;
-            let options = { locale, subcategories, mapping: new Object(), writable: new Boolean(writable), start: 2, limit: null };
+            let options = { locale, subcategories, save, mapping: new Object(), start: 2, limit: null };
 
             for (let element of $.all("input[type='number'].params")) {
                 parameters[element.id] = element.disabled ? null : element.valueAsNumber;
@@ -422,7 +415,6 @@ while (await new Promise(o => setTimeout(o, 1000, true))) {
         case 'IDLE':
             $('#send > span.text').innerText = 'Open';
             $('#send').classList.remove('pulse');
-            await writable?.abort().catch(() => void 0).finally(() => writable = null);
             break;
         case 'READY':
             $('#send > span.text').innerText = 'Send';
@@ -431,17 +423,18 @@ while (await new Promise(o => setTimeout(o, 1000, true))) {
             $('#remainingLabel').innerText = '';
             break;
         case 'CLOSING':
-            if (writable) try {
+            if (save) try {
                 $.all('#actions > button').forEach(e => e.disabled = true);
-                let data = await filereader().then(([_, b]) => Rpc2.invoke('merge', { params: [new Uint8Array(b).toBase64()] }));
+                let writable = await filehandle.createWritable({ mode: 'exclusive' });
+                let data = await filehandle.getFile().arrayBuffer().then(b => Rpc2.invoke('merge', { params: [new Uint8Array(b).toBase64()] }));
                 await writable.write(Uint8Array.fromBase64(data));
                 await writable.close();
                 await Rpc2.notify('close');
             } catch (e) {
+                if (Error.isError(e) && e.name === 'NoModificationAllowedError') continue;
                 alert('(ERROR) ' + new String(e ?? 'File operation failed'));
-                await writable.abort().catch(() => void 0);
             }
-            writable = null;
+            save = false;
             continue;
         case 'RUNNING':
             $('#send > span.text').innerText = 'Pause';

main.py

@@ -43,7 +43,7 @@ WEBMAIL = "https://email.ionos.fr/appsuite/#app=io.ox/mail&mailto=%s"
 def main(driver: Chrome, logger = logging.getLogger('main')):
     timer = Timer()
     parameters = vars(args)
-    sp = ServiceProvider.default()
+    sp = ServiceProvider(ServiceProvider.Options(application='Mailer'))
     
     class Status(Enum):
         IDLE = 0
@@ -228,17 +228,17 @@ def main(driver: Chrome, logger = logging.getLogger('main')):
             sleep(0.2); return True
     
     class Timeout(Action):
-        timer = Timer()
+        clock = Timer()
         
         @classmethod
         def prepare(cls):
-            cls.timer.clear()
+            cls.clock.clear()
-            cls.timer.start()
+            cls.clock.start()
             return True
         
         @classmethod
         def perform(cls):
-            if cls.timer.delta() > parameters['timeout']: raise cls
+            if cls.clock.delta() > parameters['timeout']: raise cls
             sleep(0.2); return True
     
     class Acknowledge(Action):
@@ -329,14 +329,14 @@ def main(driver: Chrome, logger = logging.getLogger('main')):
     
     def save():
         try:
-            file = Path(parameters['directory']).joinpath(filename or f'Mailer-{datetime.now().strftime('%Y%m%d-%H%M%S-%f')}.xlsx').resolve()
+            file = Path(parameters['directory']).joinpath(datetime.now().strftime('Mailer-%Y%m%d-%H%M%S-%f.xlsx')).resolve()
             logger.info('Saving document at %s', str(file))
             wb.save(file)
         except Exception as e:
             logger.error('Error while writing data', exc_info=e)
     
     exit = sp.pop('exit')
-    sp.set('exit', lambda: (save() if options.get('writable') and status.value >= 2 else None, exit()))
+    sp.set('exit', lambda: (save() if options.get('save') and status.value >= 2 else None, exit()))
     
     class MismatchedEmailSubject(Exception): pass
     class MismatchedEmailAddress(Exception): pass
@@ -414,13 +414,11 @@ def main(driver: Chrome, logger = logging.getLogger('main')):
                     occurrence[code] += 1
                     raise Skip()
                 
-                match options.get('occurrence'):
+                if (caps := options.get('occurrence')) is not None and caps > 0:
-                    case o if o is None:
+                    if code is None:
-                        pass
-                    case o if o > 0 and code is None:
                         logger.error("Column '%s' cannot be used for spam control", column.code)
                         raise Cancel()
-                    case o if o > 0 and occurrence[code] >= o:
+                    if occurrence[code] >= caps:
                         logger.info("[%d/%d] No Spam! Skipping '%s'", index-1, limit-1, email)
                         raise Skip()
                 
@@ -556,7 +554,7 @@ def main(driver: Chrome, logger = logging.getLogger('main')):
             logger.error('RPC communication failed', exc_info=e)
             sp.pop('exit')()
         
-        if options.get('writable'):
+        if options.get('save'):
             try:
                 logger.info('Saving document...')
                 status = Status.CLOSING