Re: [PATCH 1/4] Update system_profiler completion

[Shohei Yoshida <syohex@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1543 bytes --]

attached fixed version.

On Fri, Aug 25, 2023 at 2:24 PM Shohei Yoshida <syohex@gmail.com> wrote:

>
>
> On Fri, Aug 25, 2023 at 1:56 PM Jun T <takimoto-j@kba.biglobe.ne.jp>
> wrote:
>
>>
>> # TODO: Should this be static?  Calling `system_profiler -listDataTypes`
>> takes
>> # about 0.07-0.08 secs on my machine.  Does this list ever change (between
>> # different versions of OS X)?
>> _data_types=( SP{AirPort,Applications,Audio,...(snip)...,WWAN}DataType )
>> # the dynamic alternative is:
>> #_data_types=( ${${(f)"$(_call_program path system_profiler
>> -listDataTypes 2>/dev/null)"}[2,-1]} )
>>
>> At least on macOS Ventura (the latest), "system_profiler -listDataTypes"
>> gives somewhat different list of data types. And I think the time
>> required by this command is negligible (I can't notice any delay).
>> So isn't it better to use the 'dynamic alternative' in the above comment?
>>
>
> I think the dynamic alternative is better if possible.
>
> --
> Shohei YOSHIDA(syohex@gmail.com)
> <http://b.hatena.ne.jp/entry/https://mail.google.com/_/scs/mail-static/_/js/k=gmail.main.ja.tLQrNXCHmdo.O/m=m_i,t,it/am=nBHH5b_7g8gZ7tIn1f7977tLmp39J3_3JgBC2Amo_5v9P4jWA_ug_FA/rt=h/d=1/t=zcms/rs=AItRSTNJwrjV1i8LKqdsHFfbx47Tnlb-Bw>
>


-- 
Shohei YOSHIDA(syohex@gmail.com)
<http://b.hatena.ne.jp/entry/https://mail.google.com/_/scs/mail-static/_/js/k=gmail.main.ja.tLQrNXCHmdo.O/m=m_i,t,it/am=nBHH5b_7g8gZ7tIn1f7977tLmp39J3_3JgBC2Amo_5v9P4jWA_ug_FA/rt=h/d=1/t=zcms/rs=AItRSTNJwrjV1i8LKqdsHFfbx47Tnlb-Bw>

[-- Attachment #1.2: Type: text/html, Size: 3267 bytes --]

[-- Attachment #2: 0001-Update-system_profiler-completion.patch --]
[-- Type: application/octet-stream, Size: 2327 bytes --]

From eb3683b889ff2420bb5a3ad5fe2509ddc236a2b7 Mon Sep 17 00:00:00 2001
From: Shohei YOSHIDA <syohex@gmail.com>
Date: Sun, 27 Aug 2023 15:58:26 +0900
Subject: [PATCH] Update system_profiler completion

- add new option completions
- fix timout completion that takes seconds
- generate data types dynamically
---
 Completion/Darwin/Command/_system_profiler | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/Completion/Darwin/Command/_system_profiler b/Completion/Darwin/Command/_system_profiler
index fe197579d..0fd8b473b 100644
--- a/Completion/Darwin/Command/_system_profiler
+++ b/Completion/Darwin/Command/_system_profiler
@@ -4,17 +4,13 @@ typeset -A opt_args
 local context state state_descr line
 local -a _data_types
 
-# TODO: Should this be static?  Calling `system_profiler -listDataTypes` takes
-# about 0.07-0.08 secs on my machine.  Does this list ever change (between
-# different versions of OS X)?
-_data_types=( SP{AirPort,Applications,Audio,Bluetooth,Camera,CardReader,Component,ConfigurationProfile,DeveloperTools,Diagnostics,DisabledSoftware,DiscBurning,Displays,Ethernet,Extensions,FibreChannel,FireWire,Firewall,Fonts,Frameworks,Hardware,HardwareRAID,InstallHistory,Logs,ManagedClient,Memory,Network,NetworkLocation,NetworkVolume,PCI,ParallelATA,ParallelSCSI,Power,PrefPane,Printers,PrintersSoftware,SAS,SPI,SerialATA,Software,StartupItem,Storage,SyncServices,Thunderbolt,USB,UniversalAccess,WWAN}DataType )
-# the dynamic alternative is:
-#_data_types=( ${${(f)"$(_call_program path system_profiler -listDataTypes 2>/dev/null)"}[2,-1]} )
+_data_types=( ${${(f)"$(_call_program data-types system_profiler -listDataTypes 2>/dev/null)"}[2,-1]} )
 
 _arguments \
   '(- *)-usage' \
   '(- *)-listDataTypes[lists the available datatypes]' \
-  '(-listDataTypes -usage)-xml[generate xml output]' \
+  '(-listDataTypes -usage -json)-xml[generate xml output]' \
+  '(-listDataTypes -usage -xml)-json[generate json output]' \
   '(-listDataTypes -usage)-detailLevel[level of detail for the report]:detail level:(mini basic full)' \
-  '(-listDataTypes -usage)-timeout+[maximum time to wait in seconds]' \
+  '(-listDataTypes -usage)-timeout+[maximum time to wait in seconds(0 means no timeout)]:timeout seconds' \
   '(-listDataTypes -usage)*:data type:'"($_data_types)"
-- 
2.42.0