Improve zmodem state transitions

Fixes #46, I think
sorenisanerd · Sep 2, 2022 · d0982d6 · d0982d6
1 parent 26c419f
commit d0982d6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/bindata/static/js/gotty.js b/bindata/static/js/gotty.js
diff --git a/bindata/static/js/gotty.js.map b/bindata/static/js/gotty.js.map
diff --git a/js/src/MyModal.tsx b/js/src/MyModal.tsx
@@ -18,7 +18,10 @@ export class MyModal extends Component<ModalProps, {}> {
 
   componentDidMount() {
     Modal.getOrCreateInstance(this.ref.current!).show();
-    this.ref.current?.addEventListener('hide.bs.modal', () => { this.props.dismissHandler && this.props.dismissHandler(); });
+
+    this.ref.current?.addEventListener('hide.bs.modal', () => {
+      this.props.dismissHandler && this.props.dismissHandler();
+    });
   }
 
   componentWillUnmount() {

diff --git a/js/src/zmodem.tsx b/js/src/zmodem.tsx
@@ -106,6 +106,8 @@ interface ReceiveFileModalState {
 }
 
 export class ReceiveFileModal extends Component<ReceiveFileModalProps, ReceiveFileModalState> {
+    skipped: boolean;
+
     constructor(props) {
         super(props)
         this.setState({ state: "notstarted" })
@@ -136,7 +138,6 @@ export class ReceiveFileModal extends Component<ReceiveFileModalProps, ReceiveFi
     }
 
     finish() {
-        console.log('finished');
         if (this.props.onFinish) this.props.onFinish();
     }
 
@@ -147,6 +148,11 @@ export class ReceiveFileModal extends Component<ReceiveFileModalProps, ReceiveFi
     }
 
     skip() {
+        if (this.skipped) {
+            return
+        }
+        this.skipped = true;
+
         this.props.xfer.skip()
         this.setState({ state: "skipped" })
     }
@@ -172,6 +178,7 @@ export class ReceiveFileModal extends Component<ReceiveFileModalProps, ReceiveFi
     render() {
         if (this.state.state != "done")
             return <MyModal title="Incoming file"
+                dismissHandler={() => this.skip()}
                 buttons={this.buttons()}>
                 Accept <code>{this.props.xfer.get_details().name}</code> ({this.props.xfer.get_details().size.toLocaleString(undefined, { maximumFractionDigits: 0 })} bytes)?
                 {this.progress()}
@@ -223,7 +230,9 @@ export class SendFileModal extends Component<SendFileModalProps, SendFileModalSt
     render() {
         if (this.state.state != "done")
             return <MyModal title="Send file(s)"
-                buttons={this.buttons()}>
+                buttons={this.buttons()}
+                dismissHandler={() => this.props.session.close()}
+                >
                 <div class="mb-3">
                     <label for="formFileMultiple" class="form-label">
                         Remote requested file transfer