add usp-specific dating images name

Author: baskiton

SatsDecoder/systems/usp.py

@@ -5,6 +5,8 @@
 #
 #  SPDX-License-Identifier: MIT
 
+import pathlib
+
 import construct
 
 from SatsDecoder import utils
@@ -1477,12 +1479,22 @@
 class UspImageReceiver(ImageReceiver):
     def __init__(self, outdir):
         super().__init__(outdir, '.jpg')
+        self.last_fname = ''
+
+    def re_fname(self, fname, t):
+        if fname and self.dated_img:
+            if fname == self.last_fname:
+                t = self.last_date
+            self.last_fname = fname
+            x = pathlib.Path(fname)
+            return str(x.with_stem(x.stem + '_' + self.strftime(t)))
+        return fname
 
     def generate_fid(self, fname='', force=0, t=None):
         if self.current_fid.startswith('unknown_') and fname:
-            self.rename_image(self.current_fid, fname)
+            self.rename_image(self.current_fid, self.re_fname(fname, t))
         elif force or not (self.current_fid and self.merge_mode):
-            self.current_fid = fname or f'USP_unknown_{self.strftime(t)}'
+            self.current_fid = self.re_fname(fname, t) or f'USP_unknown_{self.strftime(t)}'
         return self.current_fid
 
     def push_data(self, data, t=None, **kw):

SatsDecoder/ui.py

@@ -591,6 +591,18 @@ def __init__(self, master, config, name):
         self.new_btn = ttk.Button(self.ctrl_frame, text='New image', command=self.new_img)
         self.new_btn.grid(column=4, row=2, sticky=tk.EW, pady=3, padx=3)
 
+        # specific ctrl
+        self.specific_frame = tk.Frame(self.ctrl_frame)
+        self.specific_frame.grid(column=0, columnspan=5, row=3, sticky=tk.EW)
+        self.specific_cfg = {}
+        if self.proto == 'usp':
+            cfg_name = 'usp dated image'
+            self.specific_cfg[cfg_name] = self.usp_dated_img_v = tk.IntVar(self.specific_frame, int(config.get(cfg_name, 0)))
+            self.usp_dated_img_ckb = ttk.Checkbutton(self.specific_frame, text='Dated images',
+                                                     variable=self.usp_dated_img_v, command=self.usp_set_dated_img)
+            self.usp_dated_img_ckb.grid(column=0, row=0, sticky=tk.EW, pady=3)
+            self.usp_set_dated_img()
+
         # history frame
         self.history_frame = HistoryFrame(self, config)
         self.history_frame.grid(column=0, row=1, sticky=tk.NSEW, padx=2, pady=2)
@@ -684,6 +696,10 @@ def new_img(self):
             self.dv_frame.set_img(img, 1)
             self.history_frame.put('img', self.proto, *args)
 
+    def usp_set_dated_img(self):
+        if self.decoder.ir and self.proto == 'usp':
+            self.decoder.ir.set_dated_img(self.usp_dated_img_v.get())
+
     def stop(self, _=None):
         if self.sk:
             s = self.sk
@@ -1069,6 +1085,9 @@ def close_df(self, name, df):
         self.config.set(name, 'filter', str(';'.join(k for k, v in df.history_frame.filters.items() if v.get())))
         self.config.set(name, 'autoscroll', str(df.history_frame.autoscroll_val.get()))
 
+        for k, v in df.specific_cfg.items():
+            self.config.set(name, k, str(v.get()))
+
     def about(self, evt=None):
         seq = queue.Queue(5)
         img = img_l = None