cmdbox 0.6.0.2__py3-none-any.whl → 0.6.0.3__py3-none-any.whl

cmdbox/app/features/cli/cmdbox_audit_search.py

@@ -316,26 +316,26 @@ class AuditSearch(audit_base.AuditBase):
         Returns:
             int: レスポンスコード
         """
-        def _date_format(pg_enabled, col, date_format):
+        def _date_format(pg_enabled, cal, col, date_format):
             if col not in ['clmsg_date', 'svmsg_date']:
                 return col
             if pg_enabled:
                 if date_format == '%u':
-                    return f"to_char({col}, 'D')"
+                    return f"to_char({cal}, 'D')"
                 elif date_format == '%m':
-                    return f"to_char({col}, 'MM')"
+                    return f"to_char({cal}, 'MM')"
                 elif date_format == '%Y':
-                    return f"to_char({col}, 'YYYY')"
+                    return f"to_char({cal}, 'YYYY')"
                 elif date_format == '%Y/%m':
-                    return f"to_char({col}, 'YYYY/MM')"
+                    return f"to_char({cal}, 'YYYY/MM')"
                 elif date_format == '%Y/%m/%d':
-                    return f"to_char({col}, 'YYYY/MM/DD')"
+                    return f"to_char({cal}, 'YYYY/MM/DD')"
                 elif date_format == '%Y/%m/%d %H':
-                    return f"to_char({col}, 'YYYY/MM/DD HH24')"
+                    return f"to_char({cal}, 'YYYY/MM/DD HH24')"
                 elif date_format == '%Y/%m/%d %H:%M':
-                    return f"to_char({col}, 'YYYY/MM/DD HH24:MI')"
+                    return f"to_char({cal}, 'YYYY/MM/DD HH24:MI')"
                 else:
-                    return col
+                    return cal
             else:
                 if date_format is not None and date_format != '':
                     return f"strftime('{date_format}', {col})"
@@ -349,22 +349,22 @@ class AuditSearch(audit_base.AuditBase):
                 cursor = conn.cursor()
                 try:
                     select = {k:v for k,v in select.items() if k != ''} if select else None
-                    select = select if select and len(select)>0 else {k:'-' for k in self.TBL_COLS}
+                    select = select if select and len(select)>0 else {k:k for k in self.TBL_COLS}
                     if pg_enabled:
                         toz = common.get_tzoffset_str()
                         sel = {}
                         for k,v in select.items():
                             if k in ['clmsg_date', 'svmsg_date']:
-                                sel[f"{k} AT TIME ZONE INTERVAL '{toz}' as {k}"] = v
+                                sel[f"{k} AT TIME ZONE INTERVAL '{toz}'"] = (k if v is '-' else v)
                             else:
-                                sel[k] = v
+                                sel[k] = (k if v is '-' else v)
                         select = sel
                     sql = []
                     for k,v in select.items():
                         if v in ['count', 'sum', 'avg', 'min', 'max']:
-                            sql.append(f'{v}({_date_format(pg_enabled, k, select_date_format)}) AS {k}')
+                            sql.append(f'{v}({_date_format(pg_enabled, k, k, select_date_format)}) AS {k}')
                         else:
-                            sql.append(f'{_date_format(pg_enabled, k, select_date_format)} AS {k}')
+                            sql.append(f'{_date_format(pg_enabled, k, v, select_date_format)} AS {v}')
                     sql = f"SELECT {','.join(sql)} FROM audit"
                     params = []
                     where = []
@@ -397,8 +397,13 @@ class AuditSearch(audit_base.AuditBase):
                             params.append(value)
                     if filter_clmsg_tags:
                         for tag in filter_clmsg_tags:
-                            where.append(f"clmsg_tag like {'%s' if pg_enabled else '?'}")
-                            params.append(f'%{tag}%')
+                            if not tag: continue
+                            if pg_enabled:
+                                where.append(f"clmsg_tag ?| %s")
+                                params.append(f'{tag}')
+                            else:
+                                where.append(f"clmsg_tag like '?'")
+                                params.append(f'%{tag}%')
                     if filter_svmsg_id and filter_svmsg_id != 'None':
                         where.append(f'svmsg_id={"%s" if pg_enabled else "?"}')
                         params.append(filter_svmsg_id)
@@ -410,7 +415,18 @@ class AuditSearch(audit_base.AuditBase):
                         params.append(filter_svmsg_edate)
                     sql += ' WHERE ' + ' AND '.join(where) if len(where)>0 else ''
                     if groupby and len(groupby) > 0:
-                        sql += ' GROUP BY ' + ', '.join([f"{_date_format(pg_enabled, g, groupby_date_format)}" for g in groupby])
+                        _gb = {}
+                        if pg_enabled:
+                            toz = common.get_tzoffset_str()
+                            for g in groupby:
+                                if g in ['clmsg_date', 'svmsg_date']:
+                                    _gb[f"{g} AT TIME ZONE INTERVAL '{toz}'"] = g
+                                else:
+                                    _gb[g] = g
+                            groupby = _gb
+                        else:
+                            groupby = {g:g for g in groupby}
+                        sql += ' GROUP BY ' + ', '.join([f"{_date_format(pg_enabled, k, v, groupby_date_format)}" for k,v in groupby.items()])
                     if sort and len(sort) > 0:
                         sql += ' ORDER BY ' + ', '.join([f"{k} {v}" for k, v in sort.items()])
                     else:

cmdbox/version.py

@@ -1,9 +1,9 @@
 import datetime
 
-dt_now = datetime.datetime(2025, 6, 1)
+dt_now = datetime.datetime(2025, 6, 3)
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.6.0.2'
+__version__ = '0.6.0.3'
 __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
 __pypiurl__ = 'https://pypi.org/project/cmdbox/'
 __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'

{cmdbox-0.6.0.2.dist-info → cmdbox-0.6.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.6.0.2
+Version: 0.6.0.3
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Download-URL: https://github.com/hamacom2004jp/cmdbox

{cmdbox-0.6.0.2.dist-info → cmdbox-0.6.0.3.dist-info}/RECORD

@@ -8,7 +8,7 @@ cmdbox/logconf_edge.yml,sha256=vRY-LxfWztk2QZOUN9kj_Eq6Y4qj8WzmiO9H0IRvjtQ,1081
 cmdbox/logconf_gui.yml,sha256=-95vyd0q-aB1gsabdk8rg9dJ2zRKAZc8hRxyhNOQboU,1076
 cmdbox/logconf_server.yml,sha256=n3c5-KVzjUzcUX5BQ6uE-PN9rp81yXaJql3whyCcSDQ,1091
 cmdbox/logconf_web.yml,sha256=pPbdAwckbK0cgduxcVkx2mbk-Ymz5hVzR4guIsfApMQ,1076
-cmdbox/version.py,sha256=C-XjKuewu-MRxDGuFXkuoMFEBvG18KXj4UwzvdfjIs0,2031
+cmdbox/version.py,sha256=tuPmH7_OyBfaCaafFAEcDHIpAxisDnOwZKvv3Q6Xe6k,2031
 cmdbox/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/app.py,sha256=YkzNBd1S1oNVwnNj1eYQUFOcrcjwdsQzv0z4mMOb_mw,9149
 cmdbox/app/client.py,sha256=n986lXeV7hhaki4iyyvsfhNptmCXDFphxlNoNe2XhKg,19542
@@ -35,7 +35,7 @@ cmdbox/app/features/cli/agent_base.py,sha256=kY6lymXy9lA9-qcutRcJIBbjIHkNKKdTbvT
 cmdbox/app/features/cli/audit_base.py,sha256=wWWK31EUczvP4a1MNuz2KlqwaSn9yyt908ueRvjkuow,9405
 cmdbox/app/features/cli/cmdbox_audit_createdb.py,sha256=Hmq3NVrAUBbj-UB9fum2TuWU7MIH71754S_s0X9oj40,12133
 cmdbox/app/features/cli/cmdbox_audit_delete.py,sha256=2X6A8XtViOnUH7iDj02ZrqQhYBq7WOAwi-nL10der64,18922
-cmdbox/app/features/cli/cmdbox_audit_search.py,sha256=Ib09SNAJ8lwkM6hiqn6knvN469PGaR9GQBJBIxRoeJM,28172
+cmdbox/app/features/cli/cmdbox_audit_search.py,sha256=QgO3cbLnl8Bc3ymJAsjbB0KV5NKpBzOQ-V7pTB9-uMA,29022
 cmdbox/app/features/cli/cmdbox_audit_write.py,sha256=eKFQPsKQGSIKSER6KxdKEEXTGGyKnAmcgPkXU1ydJR0,14505
 cmdbox/app/features/cli/cmdbox_client_file_copy.py,sha256=4UsPN1ZUhC39Vc-OrwfnCmSgOWb6LS71x4HU8c6vWeI,13093
 cmdbox/app/features/cli/cmdbox_client_file_download.py,sha256=wgMiM10Z2pzkXCwIOxw-H19W6CFznHxFpFOitPp-MeQ,13239
@@ -360,9 +360,9 @@ cmdbox/web/assets/tree-menu/image/file.png,sha256=Uw4zYkHyuoZ_kSVkesHAeSeA_g9_LP
 cmdbox/web/assets/tree-menu/image/folder-close.png,sha256=TcgsKTBBF2ejgzekOEDBFBxsJf-Z5u0x9IZVi4GBR-I,284
 cmdbox/web/assets/tree-menu/image/folder-open.png,sha256=DT7y1GRK4oXJkFvqTN_oSGM5ZYARzPvjoCGL6wqkoo0,301
 cmdbox/web/assets/tree-menu/js/tree-menu.js,sha256=-GkZxI7xzHuXXHYQBHAVTcuKX4TtoiMuyIms6Xc3pxk,1029
-cmdbox-0.6.0.2.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
-cmdbox-0.6.0.2.dist-info/METADATA,sha256=dA13ULZvQUvcYO0qMrgWC5iRDU42WzCIz5XCjY2mIsY,30881
-cmdbox-0.6.0.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cmdbox-0.6.0.2.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
-cmdbox-0.6.0.2.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
-cmdbox-0.6.0.2.dist-info/RECORD,,
+cmdbox-0.6.0.3.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
+cmdbox-0.6.0.3.dist-info/METADATA,sha256=Pc-3quoVmGwmv-tK_tNhfeUitN3G5EUkYMEpQ7h6bno,30881
+cmdbox-0.6.0.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cmdbox-0.6.0.3.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
+cmdbox-0.6.0.3.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
+cmdbox-0.6.0.3.dist-info/RECORD,,