Cache comment for new QSO

Author: gitandy

README.md

@@ -132,7 +132,7 @@ Types marked with auto are prefilled but can be overwritten. Types marked with m
 | Callsign     | xx9xx                    |         | format checked                                                  |
 | Locator/QTH  | @xx99xx or @QTH(Locator) |         | format checked                                                  |
 | Name         | 'xxxx                    |         | _ for spaces                                                    |
-| Comment      | #xxxx                    |         | _ for spaces                                                    |
+| Comment      | #xxxx                    | memory  | _ for spaces                                                    |
 | Band         | valid ADIF band          | memory  |                                                                 |
 | Mode         | valid ADIF mode          | memory  |                                                                 | 
 | RST rcvd     | .599                     | auto    | default CW 599, phone 59                                        |
@@ -143,8 +143,8 @@ Types marked with auto are prefilled but can be overwritten. Types marked with m
 | Time         | HHMMt                    | memory  | partly time will be filled                                      |
 | Date         | YYYYMMDDd                | memory  | partly date will be filled                                      |
 | Date/Time    | =                        | auto    | sync date/time to now                                           |
-| Frequency    | 99999f                   |         | in kHz                                                          |
-| TX Power     | 99p                      |         | in W                                                            | 
+| Frequency    | 99999f                   | memory  | in kHz                                                          |
+| TX Power     | 99p                      | memory  | in W                                                            | 
 | Your Call    | -cxx9xx                  | memory  |                                                                 | 
 | Your Locator | -lxx99xx                 | memory  |                                                                 | 
 | Your Name    | -nxxxx                   | memory  | _ for spaces                                                    |

src/hamcc/hamcc.py

@@ -129,6 +129,7 @@ def __init__(self, my_call: str = '', my_loc: str = '', my_name: str = '',
         # Optional
         self.__freq__ = init_qso.get('FREQ', '')
         self.__pwr__ = init_qso.get('TX_PWR', '')
+        self.__comment__ = init_qso.get('COMMENT', '')
 
         # Special
         self.__event__ = event
@@ -242,6 +243,8 @@ def clear(self):
             self.__cur_qso__['TX_PWR'] = self.__pwr__
         if self.__freq__:
             self.__cur_qso__['FREQ'] = self.__freq__
+        if self.__comment__:
+            self.__cur_qso__['COMMENT'] = self.__comment__
 
         if self.__event__:
             self.clear_event()
@@ -274,6 +277,7 @@ def reset(self):
         # Optional
         self.__freq__ = ''
         self.__pwr__ = ''
+        self.__comment__ = ''
 
         # Special
         self.__event__ = ''
@@ -600,8 +604,10 @@ def evaluate(self, seq: str) -> str:
         elif seq.startswith('#'):  # Comment
             if seq == '#':
                 self.__cur_qso__.pop('COMMENT', '')
+                self.__comment__ = ''
                 return ''
-            self.__cur_qso__['COMMENT'] = seq[1:].replace('_', ' ')
+            self.__comment__ = seq[1:].replace('_', ' ')
+            self.__cur_qso__['COMMENT'] = self.__comment__
         elif seq.startswith('\''):  # Name
             if seq == '\'':
                 self.__cur_qso__.pop('NAME', '')

test/test_instantiate.py

@@ -15,6 +15,104 @@ def test_20_exception(self):
         self.assertRaises(Exception, hamcc.CassiopeiaConsole, 'XX1XXX222', 'AA11aa')
         self.assertRaises(Exception, hamcc.CassiopeiaConsole, 'XX1XXX', 'AA11zz')
 
+    def test_30_init_qso(self):
+        init_qso = {
+            'STATION_CALLSIGN': 'XX1XXX',
+            'MY_GRIDSQUARE': 'AA11aa',
+            'QSO_DATE': '20241122',
+            'TIME_ON': '2233',
+            'BAND': '2M',
+            'MODE': 'SSB',
+            'CALL': '1Y1YY',
+            'GRIDSQUARE': 'BB22bb',
+            'MY_NAME': 'Tester',
+            'COMMENT': 'Test Comment',
+            'FREQ': '123456',
+            'TX_PWR': '23',
+            'NAME': 'Nobody',
+        }
+
+        init_res = {
+            'STATION_CALLSIGN': 'XX1XXX',
+            'MY_GRIDSQUARE': 'AA11aa',
+            'QSO_DATE': '20241122',
+            'TIME_ON': '2233',
+            'BAND': '2M',
+            'MODE': 'SSB',
+            'CALL': '',
+            'GRIDSQUARE': '',
+            'MY_NAME': 'Tester',
+            'COMMENT': 'Test Comment',
+            'RST_RCVD': '59',
+            'RST_SENT': '59',
+            'FREQ': '123456',
+            'TX_PWR': '23',
+        }
+
+        cc = hamcc.CassiopeiaConsole('XX1XXX', 'AA11aa', 'Tester',
+                                     init_qso=init_qso)
+
+        self.assertDictEqual(init_res, cc.current_qso)
+
+    def test_40_qso(self):
+        qso = [
+            '20241122d',
+            '2233t',
+            '2m',
+            's',
+            '1Y1YY',
+            '@BB22bb',
+            '#Test_Comment',
+            '123456f',
+            '23p',
+            '\'Nobody',
+        ]
+
+        qso_res = {
+            'STATION_CALLSIGN': 'XX1XXX',
+            'MY_GRIDSQUARE': 'AA11aa',
+            'QSO_DATE': '20241122',
+            'TIME_ON': '2233',
+            'BAND': '2m',
+            'MODE': 'SSB',
+            'CALL': '1Y1YY',
+            'NAME': 'Nobody',
+            'GRIDSQUARE': 'BB22bb',
+            'MY_NAME': 'Tester',
+            'COMMENT': 'Test Comment',
+            'RST_RCVD': '59',
+            'RST_SENT': '59',
+            'FREQ': '123.456',
+            'TX_PWR': '23',
+        }
+
+        new_qso = {
+            'STATION_CALLSIGN': 'XX1XXX',
+            'MY_GRIDSQUARE': 'AA11aa',
+            'QSO_DATE': '20241122',
+            'TIME_ON': '2233',
+            'BAND': '2m',
+            'MODE': 'SSB',
+            'CALL': '',
+            'GRIDSQUARE': '',
+            'MY_NAME': 'Tester',
+            'COMMENT': 'Test Comment',
+            'RST_RCVD': '59',
+            'RST_SENT': '59',
+            'FREQ': '123.456',
+            'TX_PWR': '23',
+        }
+
+        cc = hamcc.CassiopeiaConsole('XX1XXX', 'AA11aa', 'Tester')
+
+        for e in qso:
+            self.assertEqual('', cc.evaluate(e))
+
+        self.assertDictEqual(qso_res, cc.current_qso)
+        self.assertIn('Last QSO cached: 1Y1YY', cc.append_char('\n'))
+
+        self.assertDictEqual(new_qso, cc.current_qso)
+
 
 if __name__ == '__main__':
     unittest.main()