Merge pull request #499 from kellyjonbrazil/dev

v1.24.0

.github/workflows/pythonapp.yml

@@ -14,12 +14,12 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-20.04, windows-latest]
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v3
     - name: "Set up timezone to America/Los_Angeles"
-      uses: szenius/set-timezone@v1.0
+      uses: szenius/set-timezone@v1.2
       with:
         timezoneLinux: "America/Los_Angeles"
         timezoneMacos: "America/Los_Angeles"

.gitignore

@@ -6,3 +6,4 @@ build/
 .github/
 .vscode/
 _config.yml
+.venv

CHANGELOG

@@ -1,5 +1,41 @@
 jc changelog
 
+20231216 v1.24.0
+- Add `debconf-show` command parser
+- Add `iftop` command parser
+- Add `pkg-index-apk` parser for Alpine Linux Package Index files
+- Add `pkg-index-deb` parser for Debian/Ubuntu Package Index files
+- Add `proc-cmdline` parser for `/proc/cmdline` file
+- Add `swapon` command parser
+- Add `tune2fs` command parser
+- Remove `iso-datetime` parser deprecated since v1.22.1. (use `datetime-iso` instead)
+- Update timezone change in Github Actions for node v16 requirement
+- Add Python 3.12 tests to Github Actions
+- Refactor `acpi` command parser for code cleanup
+- Refactor vendored libraries to remove Python 2 support
+- Fix `iptables` parser for cases where the `target` field is blank in a rule
+- Fix `vmstat` parsers for some cases where wide output is used
+- Fix `mount` parser for cases with spaces in the mount point name
+- Fix `xrandr` parser for infinite loop issues
+
+20231023 v1.23.6
+- Fix XML parser for xmltodict library versions < 0.13.0
+- Fix `who` command parser for cases when the from field contains spaces
+
+20231021 v1.23.5
+- Add `host` command parser
+- Add `nsd-control` command parser
+- Add `lsb_release` command parser
+- Add `/etc/os-release` file parser
+- Enhance `env` command parser to support multi-line values
+- Enhance `ping` and `ping-s` parsers to add error and corrupted support
+- Enhance `xml` parser to include comments in the JSON output
+- Fix `pidstat` command parser when using `-T ALL`
+- Fix `x509-cert` parser to allow negative serial numbers
+- Fix `x509-cert` parser for cases when bitstrings are larger than standard
+- Fix `xrandr` command parser for associated device issues
+- Fix error when pygments library is not installed
+
 20230730 v1.23.4
 - Add `/etc/resolve.conf` file parser
 - Add `/proc/net/tcp` and `/proc/net/tcp6` file parser

README.md

@@ -120,6 +120,7 @@ pip3 install jc
 | NixOS linux                          | `nix-env -iA nixpkgs.jc` or `nix-env -iA nixos.jc`                            |
 | Guix System linux                    | `guix install jc`                                                             |
 | Gentoo Linux                         | `emerge dev-python/jc`                                                        |
+| Photon linux                         | `tdnf install jc`                                                             |
 | macOS                                | `brew install jc`                                                             |
 | FreeBSD                              | `portsnap fetch update && cd /usr/ports/textproc/py-jc && make install clean` |
 | Ansible filter plugin                | `ansible-galaxy collection install community.general`                         |
@@ -178,6 +179,7 @@ option.
 |         `--csv-s` | CSV file streaming parser                               | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/csv_s)          |
 |          `--date` | `date` command parser                                   | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/date)           |
 |  `--datetime-iso` | ISO 8601 Datetime string parser                         | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/datetime_iso)   |
+|  `--debconf-show` | `debconf-show` command parser                           | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/debconf_show)   |
 |            `--df` | `df` command parser                                     | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/df)             |
 |           `--dig` | `dig` command parser                                    | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/dig)            |
 |           `--dir` | `dir` command parser                                    | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/dir)            |
@@ -202,6 +204,7 @@ option.
 |       `--hashsum` | hashsum command parser (`md5sum`, `shasum`, etc.)       | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/hashsum)        |
 |     `--hciconfig` | `hciconfig` command parser                              | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/hciconfig)      |
 |       `--history` | `history` command parser                                | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/history)        |
+|          `--host` | `host` command parser                                   | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/host)           |
 |         `--hosts` | `/etc/hosts` file parser                                | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/hosts)          |
 |            `--id` | `id` command parser                                     | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/id)             |
 |      `--ifconfig` | `ifconfig` command parser                               | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/ifconfig)       |
@@ -222,6 +225,7 @@ option.
 |            `--ls` | `ls` command parser                                     | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/ls)             |
 |          `--ls-s` | `ls` command streaming parser                           | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/ls_s)           |
 |        `--lsattr` | `lsattr` command parser                                 | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/lsattr)         |
+|   `--lsb-release` | `lsb_release` command parser                            | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/lsb_release)    |
 |         `--lsblk` | `lsblk` command parser                                  | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/lsblk)          |
 |         `--lsmod` | `lsmod` command parser                                  | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/lsmod)          |
 |          `--lsof` | `lsof` command parser                                   | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/lsof)           |
@@ -234,9 +238,11 @@ option.
 |      `--mpstat-s` | `mpstat` command streaming parser                       | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/mpstat_s)       |
 |       `--netstat` | `netstat` command parser                                | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/netstat)        |
 |         `--nmcli` | `nmcli` command parser                                  | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/nmcli)          |
+|   `--nsd-control` | `nsd-control` command parser                            | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/nsd_control)    |
 |          `--ntpq` | `ntpq -p` command parser                                | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/ntpq)           |
 |       `--openvpn` | openvpn-status.log file parser                          | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/openvpn)        |
 |     `--os-prober` | `os-prober` command parser                              | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/os_prober)      |
+|    `--os-release` | `/etc/os-release` file parser                           | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/os_release)     |
 |        `--passwd` | `/etc/passwd` file parser                               | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/passwd)         |
 |       `--pci-ids` | `pci.ids` file parser                                   | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/pci_ids)        |
 |        `--pgpass` | PostgreSQL password file parser                         | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/pgpass)         |
@@ -246,6 +252,8 @@ option.
 |        `--ping-s` | `ping` and `ping6` command streaming parser             | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/ping_s)         |
 |      `--pip-list` | `pip list` command parser                               | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/pip_list)       |
 |      `--pip-show` | `pip show` command parser                               | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/pip_show)       |
+| `--pkg-index-apk` | Alpine Linux Package Index file parser                  | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/pkg_index_apk)  |
+| `--pkg-index-deb` | Debian Package Index file parser                        | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/pkg_index_deb)  |
 |         `--plist` | PLIST file parser                                       | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/plist)          |
 |      `--postconf` | `postconf -M` command parser                            | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/postconf)       |
 |          `--proc` | `/proc/` file parser                                    | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/proc)           |
@@ -264,6 +272,7 @@ option.
 |     `--sshd-conf` | `sshd` config file and `sshd -T` command parser         | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/sshd_conf)      |
 |          `--stat` | `stat` command parser                                   | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/stat)           |
 |        `--stat-s` | `stat` command streaming parser                         | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/stat_s)         |
+|        `--swapon` | `swapon` command parser                                 | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/swapon)         |
 |        `--sysctl` | `sysctl` command parser                                 | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/sysctl)         |
 |        `--syslog` | Syslog RFC 5424 string parser                           | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/syslog)         |
 |      `--syslog-s` | Syslog RFC 5424 string streaming parser                 | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/syslog_s)       |
@@ -282,6 +291,7 @@ option.
 |         `--top-s` | `top -b` command streaming parser                       | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/top_s)          |
 |     `--tracepath` | `tracepath` and `tracepath6` command parser             | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/tracepath)      |
 |    `--traceroute` | `traceroute` and `traceroute6` command parser           | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/traceroute)     |
+|       `--tune2fs` | `tune2fs -l` command parser                             | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/tune2fs)        |
 |       `--udevadm` | `udevadm info` command parser                           | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/udevadm)        |
 |           `--ufw` | `ufw status` command parser                             | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/ufw)            |
 |   `--ufw-appinfo` | `ufw app info [application]` command parser             | [details](https://kellyjonbrazil.github.io/jc/docs/parsers/ufw_appinfo)    |

completions/jc_bash_completion.sh

@@ -3,8 +3,8 @@ _jc()
     local cur prev words cword jc_commands jc_parsers jc_options \
           jc_about_options jc_about_mod_options jc_help_options jc_special_options
 
-    jc_commands=(acpi airport arp blkid bluetoothctl cbt certbot chage cksum crontab date df dig dmidecode dpkg du env file findmnt finger free git gpg hciconfig id ifconfig iostat ip iptables iw iwconfig jobs last lastb ls lsattr lsblk lsmod lsof lspci lsusb md5 md5sum mdadm mount mpstat netstat nmcli ntpq os-prober pidstat ping ping6 pip pip3 postconf printenv ps route rpm rsync sfdisk sha1sum sha224sum sha256sum sha384sum sha512sum shasum ss ssh sshd stat sum sysctl systemctl systeminfo timedatectl top tracepath tracepath6 traceroute traceroute6 udevadm ufw uname update-alternatives upower uptime vdir veracrypt vmstat w wc who xrandr zipinfo zpool)
-    jc_parsers=(--acpi --airport --airport-s --arp --asciitable --asciitable-m --blkid --bluetoothctl --cbt --cef --cef-s --certbot --chage --cksum --clf --clf-s --crontab --crontab-u --csv --csv-s --date --datetime-iso --df --dig --dir --dmidecode --dpkg-l --du --email-address --env --file --find --findmnt --finger --free --fstab --git-log --git-log-s --git-ls-remote --gpg --group --gshadow --hash --hashsum --hciconfig --history --hosts --id --ifconfig --ini --ini-dup --iostat --iostat-s --ip-address --iptables --ip-route --iw-scan --iwconfig --jar-manifest --jobs --jwt --kv --last --ls --ls-s --lsattr --lsblk --lsmod --lsof --lspci --lsusb --m3u --mdadm --mount --mpstat --mpstat-s --netstat --nmcli --ntpq --openvpn --os-prober --passwd --pci-ids --pgpass --pidstat --pidstat-s --ping --ping-s --pip-list --pip-show --plist --postconf --proc --proc-buddyinfo --proc-consoles --proc-cpuinfo --proc-crypto --proc-devices --proc-diskstats --proc-filesystems --proc-interrupts --proc-iomem --proc-ioports --proc-loadavg --proc-locks --proc-meminfo --proc-modules --proc-mtrr --proc-pagetypeinfo --proc-partitions --proc-slabinfo --proc-softirqs --proc-stat --proc-swaps --proc-uptime --proc-version --proc-vmallocinfo --proc-vmstat --proc-zoneinfo --proc-driver-rtc --proc-net-arp --proc-net-dev --proc-net-dev-mcast --proc-net-if-inet6 --proc-net-igmp --proc-net-igmp6 --proc-net-ipv6-route --proc-net-netlink --proc-net-netstat --proc-net-packet --proc-net-protocols --proc-net-route --proc-net-tcp --proc-net-unix --proc-pid-fdinfo --proc-pid-io --proc-pid-maps --proc-pid-mountinfo --proc-pid-numa-maps --proc-pid-smaps --proc-pid-stat --proc-pid-statm --proc-pid-status --ps --resolve-conf --route --rpm-qi --rsync --rsync-s --semver --sfdisk --shadow --srt --ss --ssh-conf --sshd-conf --stat --stat-s --sysctl --syslog --syslog-s --syslog-bsd --syslog-bsd-s --systemctl --systemctl-lj --systemctl-ls --systemctl-luf --systeminfo --time --timedatectl --timestamp --toml --top --top-s --tracepath --traceroute --udevadm --ufw --ufw-appinfo --uname --update-alt-gs --update-alt-q --upower --uptime --url --ver --veracrypt --vmstat --vmstat-s --w --wc --who --x509-cert --x509-csr --xml --xrandr --yaml --zipinfo --zpool-iostat --zpool-status)
+    jc_commands=(acpi airport arp blkid bluetoothctl cbt certbot chage cksum crontab date debconf-show df dig dmidecode dpkg du env file findmnt finger free git gpg hciconfig host id ifconfig iostat ip iptables iw iwconfig jobs last lastb ls lsattr lsb_release lsblk lsmod lsof lspci lsusb md5 md5sum mdadm mount mpstat netstat nmcli nsd-control ntpq os-prober pidstat ping ping6 pip pip3 postconf printenv ps route rpm rsync sfdisk sha1sum sha224sum sha256sum sha384sum sha512sum shasum ss ssh sshd stat sum swapon sysctl systemctl systeminfo timedatectl top tracepath tracepath6 traceroute traceroute6 tune2fs udevadm ufw uname update-alternatives upower uptime vdir veracrypt vmstat w wc who xrandr zipinfo zpool)
+    jc_parsers=(--acpi --airport --airport-s --arp --asciitable --asciitable-m --blkid --bluetoothctl --cbt --cef --cef-s --certbot --chage --cksum --clf --clf-s --crontab --crontab-u --csv --csv-s --date --datetime-iso --debconf-show --df --dig --dir --dmidecode --dpkg-l --du --email-address --env --file --find --findmnt --finger --free --fstab --git-log --git-log-s --git-ls-remote --gpg --group --gshadow --hash --hashsum --hciconfig --history --host --hosts --id --ifconfig --ini --ini-dup --iostat --iostat-s --ip-address --iptables --ip-route --iw-scan --iwconfig --jar-manifest --jobs --jwt --kv --last --ls --ls-s --lsattr --lsb-release --lsblk --lsmod --lsof --lspci --lsusb --m3u --mdadm --mount --mpstat --mpstat-s --netstat --nmcli --nsd-control --ntpq --openvpn --os-prober --os-release --passwd --pci-ids --pgpass --pidstat --pidstat-s --ping --ping-s --pip-list --pip-show --pkg-index-apk --pkg-index-deb --plist --postconf --proc --proc-buddyinfo --proc-cmdline --proc-consoles --proc-cpuinfo --proc-crypto --proc-devices --proc-diskstats --proc-filesystems --proc-interrupts --proc-iomem --proc-ioports --proc-loadavg --proc-locks --proc-meminfo --proc-modules --proc-mtrr --proc-pagetypeinfo --proc-partitions --proc-slabinfo --proc-softirqs --proc-stat --proc-swaps --proc-uptime --proc-version --proc-vmallocinfo --proc-vmstat --proc-zoneinfo --proc-driver-rtc --proc-net-arp --proc-net-dev --proc-net-dev-mcast --proc-net-if-inet6 --proc-net-igmp --proc-net-igmp6 --proc-net-ipv6-route --proc-net-netlink --proc-net-netstat --proc-net-packet --proc-net-protocols --proc-net-route --proc-net-tcp --proc-net-unix --proc-pid-fdinfo --proc-pid-io --proc-pid-maps --proc-pid-mountinfo --proc-pid-numa-maps --proc-pid-smaps --proc-pid-stat --proc-pid-statm --proc-pid-status --ps --resolve-conf --route --rpm-qi --rsync --rsync-s --semver --sfdisk --shadow --srt --ss --ssh-conf --sshd-conf --stat --stat-s --swapon --sysctl --syslog --syslog-s --syslog-bsd --syslog-bsd-s --systemctl --systemctl-lj --systemctl-ls --systemctl-luf --systeminfo --time --timedatectl --timestamp --toml --top --top-s --tracepath --traceroute --tune2fs --udevadm --ufw --ufw-appinfo --uname --update-alt-gs --update-alt-q --upower --uptime --url --ver --veracrypt --vmstat --vmstat-s --w --wc --who --x509-cert --x509-csr --xml --xrandr --yaml --zipinfo --zpool-iostat --zpool-status)
     jc_options=(--force-color -C --debug -d --monochrome -m --meta-out -M --pretty -p --quiet -q --raw -r --unbuffer -u --yaml-out -y)
     jc_about_options=(--about -a)
     jc_about_mod_options=(--pretty -p --yaml-out -y --monochrome -m --force-color -C)

completions/jc_zsh_completion.sh

@@ -9,7 +9,7 @@ _jc() {
              jc_help_options jc_help_options_describe \
              jc_special_options jc_special_options_describe
 
-    jc_commands=(acpi airport arp blkid bluetoothctl cbt certbot chage cksum crontab date df dig dmidecode dpkg du env file findmnt finger free git gpg hciconfig id ifconfig iostat ip iptables iw iwconfig jobs last lastb ls lsattr lsblk lsmod lsof lspci lsusb md5 md5sum mdadm mount mpstat netstat nmcli ntpq os-prober pidstat ping ping6 pip pip3 postconf printenv ps route rpm rsync sfdisk sha1sum sha224sum sha256sum sha384sum sha512sum shasum ss ssh sshd stat sum sysctl systemctl systeminfo timedatectl top tracepath tracepath6 traceroute traceroute6 udevadm ufw uname update-alternatives upower uptime vdir veracrypt vmstat w wc who xrandr zipinfo zpool)
+    jc_commands=(acpi airport arp blkid bluetoothctl cbt certbot chage cksum crontab date debconf-show df dig dmidecode dpkg du env file findmnt finger free git gpg hciconfig host id ifconfig iostat ip iptables iw iwconfig jobs last lastb ls lsattr lsb_release lsblk lsmod lsof lspci lsusb md5 md5sum mdadm mount mpstat netstat nmcli nsd-control ntpq os-prober pidstat ping ping6 pip pip3 postconf printenv ps route rpm rsync sfdisk sha1sum sha224sum sha256sum sha384sum sha512sum shasum ss ssh sshd stat sum swapon sysctl systemctl systeminfo timedatectl top tracepath tracepath6 traceroute traceroute6 tune2fs udevadm ufw uname update-alternatives upower uptime vdir veracrypt vmstat w wc who xrandr zipinfo zpool)
     jc_commands_describe=(
         'acpi:run "acpi" command with magic syntax.'
         'airport:run "airport" command with magic syntax.'
@@ -22,6 +22,7 @@ _jc() {
         'cksum:run "cksum" command with magic syntax.'
         'crontab:run "crontab" command with magic syntax.'
         'date:run "date" command with magic syntax.'
+        'debconf-show:run "debconf-show" command with magic syntax.'
         'df:run "df" command with magic syntax.'
         'dig:run "dig" command with magic syntax.'
         'dmidecode:run "dmidecode" command with magic syntax.'
@@ -35,6 +36,7 @@ _jc() {
         'git:run "git" command with magic syntax.'
         'gpg:run "gpg" command with magic syntax.'
         'hciconfig:run "hciconfig" command with magic syntax.'
+        'host:run "host" command with magic syntax.'
         'id:run "id" command with magic syntax.'
         'ifconfig:run "ifconfig" command with magic syntax.'
         'iostat:run "iostat" command with magic syntax.'
@@ -47,6 +49,7 @@ _jc() {
         'lastb:run "lastb" command with magic syntax.'
         'ls:run "ls" command with magic syntax.'
         'lsattr:run "lsattr" command with magic syntax.'
+        'lsb_release:run "lsb_release" command with magic syntax.'
         'lsblk:run "lsblk" command with magic syntax.'
         'lsmod:run "lsmod" command with magic syntax.'
         'lsof:run "lsof" command with magic syntax.'
@@ -59,6 +62,7 @@ _jc() {
         'mpstat:run "mpstat" command with magic syntax.'
         'netstat:run "netstat" command with magic syntax.'
         'nmcli:run "nmcli" command with magic syntax.'
+        'nsd-control:run "nsd-control" command with magic syntax.'
         'ntpq:run "ntpq" command with magic syntax.'
         'os-prober:run "os-prober" command with magic syntax.'
         'pidstat:run "pidstat" command with magic syntax.'
@@ -84,6 +88,7 @@ _jc() {
         'sshd:run "sshd" command with magic syntax.'
         'stat:run "stat" command with magic syntax.'
         'sum:run "sum" command with magic syntax.'
+        'swapon:run "swapon" command with magic syntax.'
         'sysctl:run "sysctl" command with magic syntax.'
         'systemctl:run "systemctl" command with magic syntax.'
         'systeminfo:run "systeminfo" command with magic syntax.'
@@ -93,6 +98,7 @@ _jc() {
         'tracepath6:run "tracepath6" command with magic syntax.'
         'traceroute:run "traceroute" command with magic syntax.'
         'traceroute6:run "traceroute6" command with magic syntax.'
+        'tune2fs:run "tune2fs" command with magic syntax.'
         'udevadm:run "udevadm" command with magic syntax.'
         'ufw:run "ufw" command with magic syntax.'
         'uname:run "uname" command with magic syntax.'
@@ -109,7 +115,7 @@ _jc() {
         'zipinfo:run "zipinfo" command with magic syntax.'
         'zpool:run "zpool" command with magic syntax.'
     )
-    jc_parsers=(--acpi --airport --airport-s --arp --asciitable --asciitable-m --blkid --bluetoothctl --cbt --cef --cef-s --certbot --chage --cksum --clf --clf-s --crontab --crontab-u --csv --csv-s --date --datetime-iso --df --dig --dir --dmidecode --dpkg-l --du --email-address --env --file --find --findmnt --finger --free --fstab --git-log --git-log-s --git-ls-remote --gpg --group --gshadow --hash --hashsum --hciconfig --history --hosts --id --ifconfig --ini --ini-dup --iostat --iostat-s --ip-address --iptables --ip-route --iw-scan --iwconfig --jar-manifest --jobs --jwt --kv --last --ls --ls-s --lsattr --lsblk --lsmod --lsof --lspci --lsusb --m3u --mdadm --mount --mpstat --mpstat-s --netstat --nmcli --ntpq --openvpn --os-prober --passwd --pci-ids --pgpass --pidstat --pidstat-s --ping --ping-s --pip-list --pip-show --plist --postconf --proc --proc-buddyinfo --proc-consoles --proc-cpuinfo --proc-crypto --proc-devices --proc-diskstats --proc-filesystems --proc-interrupts --proc-iomem --proc-ioports --proc-loadavg --proc-locks --proc-meminfo --proc-modules --proc-mtrr --proc-pagetypeinfo --proc-partitions --proc-slabinfo --proc-softirqs --proc-stat --proc-swaps --proc-uptime --proc-version --proc-vmallocinfo --proc-vmstat --proc-zoneinfo --proc-driver-rtc --proc-net-arp --proc-net-dev --proc-net-dev-mcast --proc-net-if-inet6 --proc-net-igmp --proc-net-igmp6 --proc-net-ipv6-route --proc-net-netlink --proc-net-netstat --proc-net-packet --proc-net-protocols --proc-net-route --proc-net-tcp --proc-net-unix --proc-pid-fdinfo --proc-pid-io --proc-pid-maps --proc-pid-mountinfo --proc-pid-numa-maps --proc-pid-smaps --proc-pid-stat --proc-pid-statm --proc-pid-status --ps --resolve-conf --route --rpm-qi --rsync --rsync-s --semver --sfdisk --shadow --srt --ss --ssh-conf --sshd-conf --stat --stat-s --sysctl --syslog --syslog-s --syslog-bsd --syslog-bsd-s --systemctl --systemctl-lj --systemctl-ls --systemctl-luf --systeminfo --time --timedatectl --timestamp --toml --top --top-s --tracepath --traceroute --udevadm --ufw --ufw-appinfo --uname --update-alt-gs --update-alt-q --upower --uptime --url --ver --veracrypt --vmstat --vmstat-s --w --wc --who --x509-cert --x509-csr --xml --xrandr --yaml --zipinfo --zpool-iostat --zpool-status)
+    jc_parsers=(--acpi --airport --airport-s --arp --asciitable --asciitable-m --blkid --bluetoothctl --cbt --cef --cef-s --certbot --chage --cksum --clf --clf-s --crontab --crontab-u --csv --csv-s --date --datetime-iso --debconf-show --df --dig --dir --dmidecode --dpkg-l --du --email-address --env --file --find --findmnt --finger --free --fstab --git-log --git-log-s --git-ls-remote --gpg --group --gshadow --hash --hashsum --hciconfig --history --host --hosts --id --ifconfig --ini --ini-dup --iostat --iostat-s --ip-address --iptables --ip-route --iw-scan --iwconfig --jar-manifest --jobs --jwt --kv --last --ls --ls-s --lsattr --lsb-release --lsblk --lsmod --lsof --lspci --lsusb --m3u --mdadm --mount --mpstat --mpstat-s --netstat --nmcli --nsd-control --ntpq --openvpn --os-prober --os-release --passwd --pci-ids --pgpass --pidstat --pidstat-s --ping --ping-s --pip-list --pip-show --pkg-index-apk --pkg-index-deb --plist --postconf --proc --proc-buddyinfo --proc-cmdline --proc-consoles --proc-cpuinfo --proc-crypto --proc-devices --proc-diskstats --proc-filesystems --proc-interrupts --proc-iomem --proc-ioports --proc-loadavg --proc-locks --proc-meminfo --proc-modules --proc-mtrr --proc-pagetypeinfo --proc-partitions --proc-slabinfo --proc-softirqs --proc-stat --proc-swaps --proc-uptime --proc-version --proc-vmallocinfo --proc-vmstat --proc-zoneinfo --proc-driver-rtc --proc-net-arp --proc-net-dev --proc-net-dev-mcast --proc-net-if-inet6 --proc-net-igmp --proc-net-igmp6 --proc-net-ipv6-route --proc-net-netlink --proc-net-netstat --proc-net-packet --proc-net-protocols --proc-net-route --proc-net-tcp --proc-net-unix --proc-pid-fdinfo --proc-pid-io --proc-pid-maps --proc-pid-mountinfo --proc-pid-numa-maps --proc-pid-smaps --proc-pid-stat --proc-pid-statm --proc-pid-status --ps --resolve-conf --route --rpm-qi --rsync --rsync-s --semver --sfdisk --shadow --srt --ss --ssh-conf --sshd-conf --stat --stat-s --swapon --sysctl --syslog --syslog-s --syslog-bsd --syslog-bsd-s --systemctl --systemctl-lj --systemctl-ls --systemctl-luf --systeminfo --time --timedatectl --timestamp --toml --top --top-s --tracepath --traceroute --tune2fs --udevadm --ufw --ufw-appinfo --uname --update-alt-gs --update-alt-q --upower --uptime --url --ver --veracrypt --vmstat --vmstat-s --w --wc --who --x509-cert --x509-csr --xml --xrandr --yaml --zipinfo --zpool-iostat --zpool-status)
     jc_parsers_describe=(
         '--acpi:`acpi` command parser'
         '--airport:`airport -I` command parser'
@@ -133,6 +139,7 @@ _jc() {
         '--csv-s:CSV file streaming parser'
         '--date:`date` command parser'
         '--datetime-iso:ISO 8601 Datetime string parser'
+        '--debconf-show:`debconf-show` command parser'
         '--df:`df` command parser'
         '--dig:`dig` command parser'
         '--dir:`dir` command parser'
@@ -157,6 +164,7 @@ _jc() {
         '--hashsum:hashsum command parser (`md5sum`, `shasum`, etc.)'
         '--hciconfig:`hciconfig` command parser'
         '--history:`history` command parser'
+        '--host:`host` command parser'
         '--hosts:`/etc/hosts` file parser'
         '--id:`id` command parser'
         '--ifconfig:`ifconfig` command parser'
@@ -177,6 +185,7 @@ _jc() {
         '--ls:`ls` command parser'
         '--ls-s:`ls` command streaming parser'
         '--lsattr:`lsattr` command parser'
+        '--lsb-release:`lsb_release` command parser'
         '--lsblk:`lsblk` command parser'
         '--lsmod:`lsmod` command parser'
         '--lsof:`lsof` command parser'
@@ -189,9 +198,11 @@ _jc() {
         '--mpstat-s:`mpstat` command streaming parser'
         '--netstat:`netstat` command parser'
         '--nmcli:`nmcli` command parser'
+        '--nsd-control:`nsd-control` command parser'
         '--ntpq:`ntpq -p` command parser'
         '--openvpn:openvpn-status.log file parser'
         '--os-prober:`os-prober` command parser'
+        '--os-release:`/etc/os-release` file parser'
         '--passwd:`/etc/passwd` file parser'
         '--pci-ids:`pci.ids` file parser'
         '--pgpass:PostgreSQL password file parser'
@@ -201,10 +212,13 @@ _jc() {
         '--ping-s:`ping` and `ping6` command streaming parser'
         '--pip-list:`pip list` command parser'
         '--pip-show:`pip show` command parser'
+        '--pkg-index-apk:Alpine Linux Package Index file parser'
+        '--pkg-index-deb:Debian Package Index file parser'
         '--plist:PLIST file parser'
         '--postconf:`postconf -M` command parser'
         '--proc:`/proc/` file parser'
         '--proc-buddyinfo:`/proc/buddyinfo` file parser'
+        '--proc-cmdline:`/proc/cmdline` file parser'
         '--proc-consoles:`/proc/consoles` file parser'
         '--proc-cpuinfo:`/proc/cpuinfo` file parser'
         '--proc-crypto:`/proc/crypto` file parser'
@@ -269,6 +283,7 @@ _jc() {
         '--sshd-conf:`sshd` config file and `sshd -T` command parser'
         '--stat:`stat` command parser'
         '--stat-s:`stat` command streaming parser'
+        '--swapon:`swapon` command parser'
         '--sysctl:`sysctl` command parser'
         '--syslog:Syslog RFC 5424 string parser'
         '--syslog-s:Syslog RFC 5424 string streaming parser'
@@ -287,6 +302,7 @@ _jc() {
         '--top-s:`top -b` command streaming parser'
         '--tracepath:`tracepath` and `tracepath6` command parser'
         '--traceroute:`traceroute` and `traceroute6` command parser'
+        '--tune2fs:`tune2fs -l` command parser'
         '--udevadm:`udevadm info` command parser'
         '--ufw:`ufw status` command parser'
         '--ufw-appinfo:`ufw app info [application]` command parser'

docs/parsers/acpi.md

@@ -250,4 +250,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux
 
-Version 1.6 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.7 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/debconf_show.md

@@ -0,0 +1,105 @@
+[Home](https://kellyjonbrazil.github.io/jc/)
+<a id="jc.parsers.debconf_show"></a>
+
+# jc.parsers.debconf\_show
+
+jc - JSON Convert `debconf-show` command output parser
+
+Usage (cli):
+
+    $ debconf-show onlyoffice-documentserver | jc --debconf-show
+
+or
+
+    $ jc debconf-show onlyoffice-documentserver
+
+Usage (module):
+
+    import jc
+    result = jc.parse('debconf_show', debconf_show_command_output)
+
+Schema:
+
+    [
+      {
+        "asked":              boolean,
+        "packagename":        string,
+        "name":               string,
+        "value":              string
+      }
+    ]
+
+Examples:
+
+    $ debconf-show onlyoffice-documentserver | jc --debconf-show -p
+    [
+      {
+        "asked": true,
+        "packagename": "onlyoffice",
+        "name": "jwt_secret",
+        "value": "aL8ei2iereuzee7cuJ6Cahjah1ixee2ah"
+      },
+      {
+        "asked": false,
+        "packagename": "onlyoffice",
+        "name": "db_pwd",
+        "value": "(password omitted)"
+      },
+      {
+        "asked": true,
+        "packagename": "onlyoffice",
+        "name": "rabbitmq_pwd",
+        "value": "(password omitted)"
+      },
+      {
+        "asked": true,
+        "packagename": "onlyoffice",
+        "name": "db_port",
+        "value": "5432"
+      },
+      {
+        "asked": true,
+        "packagename": "onlyoffice",
+        "name": "db_user",
+        "value": "onlyoffice"
+      },
+      {
+        "asked": true,
+        "packagename": "onlyoffice",
+        "name": "rabbitmq_proto",
+        "value": "amqp"
+      },
+      {
+        "asked": true,
+        "packagename": "onlyoffice",
+        "name": "cluster_mode",
+        "value": "false"
+      }
+    ]
+
+<a id="jc.parsers.debconf_show.parse"></a>
+
+### parse
+
+```python
+def parse(data: str,
+          raw: bool = False,
+          quiet: bool = False) -> List[JSONDictType]
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) unprocessed output if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    List of Dictionaries. Raw or processed structured data.
+
+### Parser Information
+Compatibility:  linux
+
+Version 1.0 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/env.md

@@ -90,10 +90,10 @@ Parameters:
 
 Returns:
 
-    Dictionary of raw structured data or
-    List of Dictionaries of processed structured data
+    Dictionary of raw structured data or (default)
+    List of Dictionaries of processed structured data (raw)
 
 ### Parser Information
 Compatibility:  linux, darwin, cygwin, win32, aix, freebsd
 
-Version 1.4 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.5 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/host.md

@@ -0,0 +1,113 @@
+[Home](https://kellyjonbrazil.github.io/jc/)
+<a id="jc.parsers.host"></a>
+
+# jc.parsers.host
+
+jc - JSON Convert `host` command output parser
+
+Supports parsing of the most commonly used RR types (A, AAAA, MX, TXT)
+
+Usage (cli):
+
+    $ host google.com | jc --host
+
+or
+
+    $ jc host google.com
+
+Usage (module):
+
+    import jc
+    result = jc.parse('host', host_command_output)
+
+Schema:
+
+    [
+      {
+        "hostname":     string,
+        "address": [
+                        string
+        ],
+        "v6-address": [
+                        string
+        ],
+        "mail": [
+                        string
+        ]
+      }
+    ]
+
+    [
+      {
+        "nameserver":   string,
+        "zone":         string,
+        "mname":        string,
+        "rname":        string,
+        "serial":       integer,
+        "refresh":      integer,
+        "retry":        integer,
+        "expire":       integer,
+        "minimum":      integer
+      }
+    ]
+
+Examples:
+
+    $ host google.com | jc --host
+    [
+      {
+        "hostname": "google.com",
+        "address": [
+          "142.251.39.110"
+        ],
+        "v6-address": [
+          "2a00:1450:400e:811::200e"
+        ],
+        "mail": [
+          "smtp.google.com."
+        ]
+      }
+    ]
+
+    $ jc host -C sunet.se
+    [
+      {
+        "nameserver": "2001:6b0:7::2",
+        "zone": "sunet.se",
+        "mname": "sunic.sunet.se.",
+        "rname": "hostmaster.sunet.se.",
+        "serial": "2023090401",
+        "refresh": "28800",
+        "retry": "7200",
+        "expire": "604800",
+        "minimum": "300"
+      },
+      {
+        ...
+      }
+    ]
+
+<a id="jc.parsers.host.parse"></a>
+
+### parse
+
+```python
+def parse(data: str, raw: bool = False, quiet: bool = False)
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) unprocessed output if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    List of Dictionaries. Raw or processed structured data.
+
+### Parser Information
+Compatibility:  linux, darwin, cygwin, win32, aix, freebsd
+
+Version 1.0 by Pettai (pettai@sunet.se)

docs/parsers/ini_dup.md

@@ -22,12 +22,12 @@ contained in lists/arrays.
 
 Usage (cli):
 
-    $ cat foo.ini | jc --ini
+    $ cat foo.ini | jc --ini-dup
 
 Usage (module):
 
     import jc
-    result = jc.parse('ini', ini_file_output)
+    result = jc.parse('ini_dup', ini_file_output)
 
 Schema:
 
@@ -67,7 +67,7 @@ Examples:
     fruit = peach
     color = green
 
-    $ cat example.ini | jc --ini -p
+    $ cat example.ini | jc --ini-dup -p
     {
       "foo": [
         "fiz"
@@ -118,4 +118,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux, darwin, cygwin, win32, aix, freebsd
 
-Version 1.0 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.1 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/iptables.md

@@ -30,7 +30,7 @@ Schema:
             "num"               integer,
             "pkts":             integer,
             "bytes":            integer,  # converted based on suffix
-            "target":           string,
+            "target":           string,   # Null if blank
             "prot":             string,
             "opt":              string,   # "--" = Null
             "in":               string,
@@ -186,4 +186,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux
 
-Version 1.8 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.9 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/iso_datetime.md

@@ -1,37 +0,0 @@
-[Home](https://kellyjonbrazil.github.io/jc/)
-<a id="jc.parsers.iso_datetime"></a>
-
-# jc.parsers.iso\_datetime
-
-jc - JSON Convert ISO 8601 Datetime string parser
-
-This parser has been renamed to datetime-iso (cli) or datetime_iso (module).
-
-This parser will be removed in a future version, so please start using
-the new parser name.
-
-<a id="jc.parsers.iso_datetime.parse"></a>
-
-### parse
-
-```python
-def parse(data, raw=False, quiet=False)
-```
-
-This parser is deprecated and calls datetime_iso. Please use datetime_iso
-directly. This parser will be removed in the future.
-
-Parameters:
-
-    data:        (string)  text data to parse
-    raw:         (boolean) unprocessed output if True
-    quiet:       (boolean) suppress warning messages if True
-
-Returns:
-
-    Dictionary. Raw or processed structured data.
-
-### Parser Information
-Compatibility:  linux, aix, freebsd, darwin, win32, cygwin
-
-Version 1.1 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/lsb_release.md

@@ -0,0 +1,61 @@
+[Home](https://kellyjonbrazil.github.io/jc/)
+<a id="jc.parsers.lsb_release"></a>
+
+# jc.parsers.lsb\_release
+
+jc - JSON Convert `lsb_release` command parser
+
+This parser is an alias to the Key/Value parser (`--kv`).
+
+Usage (cli):
+
+    $ lsb_release -a | jc --lsb-release
+
+or
+    $ jc lsb_release -a
+
+Usage (module):
+
+    import jc
+    result = jc.parse('lsb_release', lsb_release_command_output)
+
+Schema:
+
+    {
+        "<key>":     string
+    }
+
+Examples:
+
+    $ lsb_release -a | jc --lsb-release -p
+    {
+      "Distributor ID": "Ubuntu",
+      "Description": "Ubuntu 16.04.6 LTS",
+      "Release": "16.04",
+      "Codename": "xenial"
+    }
+
+<a id="jc.parsers.lsb_release.parse"></a>
+
+### parse
+
+```python
+def parse(data: str, raw: bool = False, quiet: bool = False) -> JSONDictType
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) unprocessed output if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    Dictionary. Raw or processed structured data.
+
+### Parser Information
+Compatibility:  linux, darwin, cygwin, win32, aix, freebsd
+
+Version 1.0 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/mount.md

@@ -98,4 +98,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux, darwin, freebsd, aix
 
-Version 1.8 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.9 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/netstat.md

@@ -378,4 +378,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux, darwin, freebsd, win32
 
-Version 1.14 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.15 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/nsd_control.md

@@ -0,0 +1,90 @@
+[Home](https://kellyjonbrazil.github.io/jc/)
+<a id="jc.parsers.nsd_control"></a>
+
+# jc.parsers.nsd\_control
+
+jc - JSON Convert `nsd-control` command output parser
+
+Usage (cli):
+
+    $ nsd-control | jc --nsd-control
+
+or
+
+    $ jc nsd-control
+
+Usage (module):
+
+    import jc
+    result = jc.parse('nsd_control', nsd_control_command_output)
+
+Schema:
+
+    [
+      {
+        "version":          string,
+        "verbosity":        integer,
+        "ratelimit":        integer
+      }
+    ]
+
+    [
+      {
+        "zone":             string
+        "status": {
+          "state":          string,
+          "served-serial":  string,
+          "commit-serial":  string,
+          "wait":           string
+        }
+      }
+    ]
+
+Examples:
+
+    $ nsd-control | jc --nsd-control status
+    [
+      {
+        "version": "4.6.2",
+        "verbosity": "2",
+        "ratelimit": "0"
+      }
+    ]
+
+    $ nsd-control | jc --nsd-control zonestatus sunet.se
+    [
+      {
+        "zone": "sunet.se",
+        "status": {
+          "state": "ok",
+          "served-serial": "2023090704 since 2023-09-07T16:34:27",
+          "commit-serial": "2023090704 since 2023-09-07T16:34:27",
+          "wait": "28684 sec between attempts"
+        }
+      }
+    ]
+
+<a id="jc.parsers.nsd_control.parse"></a>
+
+### parse
+
+```python
+def parse(data: str, raw: bool = False, quiet: bool = False)
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) unprocessed output if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    List of Dictionaries. Raw or processed structured data.
+
+### Parser Information
+Compatibility:  linux, darwin, cygwin, win32, aix, freebsd
+
+Version 1.0 by Pettai (pettai@sunet.se)

docs/parsers/os_release.md

@@ -0,0 +1,86 @@
+[Home](https://kellyjonbrazil.github.io/jc/)
+<a id="jc.parsers.os_release"></a>
+
+# jc.parsers.os\_release
+
+jc - JSON Convert `/etc/os-release` file parser
+
+This parser is an alias to the Key/Value parser (`--kv`).
+
+Usage (cli):
+
+    $ cat /etc/os-release | jc --os-release
+
+Usage (module):
+
+    import jc
+    result = jc.parse('os_release', os_release_output)
+
+Schema:
+
+    {
+        "<key>":     string
+    }
+
+Examples:
+
+    $ cat /etc/os-release | jc --os-release -p
+    {
+      "NAME": "CentOS Linux",
+      "VERSION": "7 (Core)",
+      "ID": "centos",
+      "ID_LIKE": "rhel fedora",
+      "VERSION_ID": "7",
+      "PRETTY_NAME": "CentOS Linux 7 (Core)",
+      "ANSI_COLOR": "0;31",
+      "CPE_NAME": "cpe:/o:centos:centos:7",
+      "HOME_URL": "https://www.centos.org/",
+      "BUG_REPORT_URL": "https://bugs.centos.org/",
+      "CENTOS_MANTISBT_PROJECT": "CentOS-7",
+      "CENTOS_MANTISBT_PROJECT_VERSION": "7",
+      "REDHAT_SUPPORT_PRODUCT": "centos",
+      "REDHAT_SUPPORT_PRODUCT_VERSION": "7"
+    }
+
+    $ cat /etc/os-release | jc --os-release -p -r
+    {
+      "NAME": "\\"CentOS Linux\\"",
+      "VERSION": "\\"7 (Core)\\"",
+      "ID": "\\"centos\\"",
+      "ID_LIKE": "\\"rhel fedora\\"",
+      "VERSION_ID": "\\"7\\"",
+      "PRETTY_NAME": "\\"CentOS Linux 7 (Core)\\"",
+      "ANSI_COLOR": "\\"0;31\\"",
+      "CPE_NAME": "\\"cpe:/o:centos:centos:7\\"",
+      "HOME_URL": "\\"https://www.centos.org/\\"",
+      "BUG_REPORT_URL": "\\"https://bugs.centos.org/\\"",
+      "CENTOS_MANTISBT_PROJECT": "\\"CentOS-7\\"",
+      "CENTOS_MANTISBT_PROJECT_VERSION": "\\"7\\"",
+      "REDHAT_SUPPORT_PRODUCT": "\\"centos\\"",
+      "REDHAT_SUPPORT_PRODUCT_VERSION": "\\"7\\""
+    }
+
+<a id="jc.parsers.os_release.parse"></a>
+
+### parse
+
+```python
+def parse(data: str, raw: bool = False, quiet: bool = False) -> JSONDictType
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) unprocessed output if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    Dictionary. Raw or processed structured data.
+
+### Parser Information
+Compatibility:  linux, darwin, cygwin, win32, aix, freebsd
+
+Version 1.0 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/pidstat.md

@@ -45,6 +45,9 @@ Schema:
         "kb_ccwr_s":        float,
         "cswch_s":          float,
         "nvcswch_s":        float,
+        "usr_ms":           integer,
+        "system_ms":        integer,
+        "guest_ms":         integer,
         "command":          string
       }
     ]
@@ -148,4 +151,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux
 
-Version 1.1 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.3 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/pidstat_s.md

@@ -39,6 +39,7 @@ Schema:
       "percent_usr":      float,
       "percent_system":   float,
       "percent_guest":    float,
+      "percent_wait":     float,
       "percent_cpu":      float,
       "cpu":              integer,
       "minflt_s":         float,
@@ -53,6 +54,9 @@ Schema:
       "kb_ccwr_s":        float,
       "cswch_s":          float,
       "nvcswch_s":        float,
+      "usr_ms":           integer,
+      "system_ms":        integer,
+      "guest_ms":         integer,
       "command":          string,
 
       # below object only exists if using -qq or ignore_exceptions=True
@@ -107,4 +111,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux
 
-Version 1.1 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.2 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/ping.md

@@ -35,6 +35,8 @@ Schema:
       "packets_received":            integer,
       "packet_loss_percent":         float,
       "duplicates":                  integer,
+      "errors":                      integer,
+      "corrupted":                   integer,
       "round_trip_ms_min":           float,
       "round_trip_ms_avg":           float,
       "round_trip_ms_max":           float,
@@ -185,4 +187,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux, darwin, freebsd
 
-Version 1.9 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.10 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/ping_s.md

@@ -36,7 +36,7 @@ Schema:
       "source_ip":                  string,
       "destination_ip":             string,
       "sent_bytes":                 integer,
-      "pattern":                    string,   # (null if not set)
+      "pattern":                    string,   # null if not set
       "destination":                string,
       "timestamp":                  float,
       "response_bytes":             integer,
@@ -49,10 +49,12 @@ Schema:
       "packets_received":           integer,
       "packet_loss_percent":        float,
       "duplicates":                 integer,
-      "round_trip_ms_min":          float,
-      "round_trip_ms_avg":          float,
-      "round_trip_ms_max":          float,
-      "round_trip_ms_stddev":       float,
+      "errors":                     integer,  # null if not set
+      "corrupted":                  integer,  # null if not set
+      "round_trip_ms_min":          float,    # null if not set
+      "round_trip_ms_avg":          float,    # null if not set
+      "round_trip_ms_max":          float,    # null if not set
+      "round_trip_ms_stddev":       float,    # null if not set
 
       # below object only exists if using -qq or ignore_exceptions=True
       "_jc_meta": {
@@ -106,4 +108,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux, darwin, freebsd
 
-Version 1.3 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.4 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/pkg_index_apk.md

@@ -0,0 +1,126 @@
+[Home](https://kellyjonbrazil.github.io/jc/)
+<a id="jc.parsers.pkg_index_apk"></a>
+
+# jc.parsers.pkg\_index\_apk
+
+jc - JSON Convert Alpine Linux Package Index files
+
+Usage (cli):
+
+    $ cat APKINDEX | jc --pkg-index-apk
+
+Usage (module):
+
+    import jc
+    result = jc.parse('pkg_index_apk', pkg_index_apk_output)
+
+Schema:
+
+    [
+      {
+        "checksum":             string,
+        "package":              string,
+        "version":              string,
+        "architecture":         string,
+        "package_size":         integer,
+        "installed_size":       integer,
+        "description":          string,
+        "url":                  string,
+        "license":              string,
+        "origin":               string,
+        "maintainer": {
+          "name":               string,
+          "email":              string,
+        },
+        "build_time":           integer,
+        "commit":               string,
+        "provider_priority":    string,
+        "dependencies": [
+                                string
+        ],
+        "provides": [
+                                string
+        ],
+        "install_if": [
+                                string
+        ],
+      }
+    ]
+
+Example:
+
+    $ cat APKINDEX | jc --pkg-index-apk
+    [
+      {
+        "checksum": "Q1znBl9k+RKgY6gl5Eg3iz73KZbLY=",
+        "package": "yasm",
+        "version": "1.3.0-r4",
+        "architecture": "x86_64",
+        "package_size": 772109,
+        "installed_size": 1753088,
+        "description": "A rewrite of NASM to allow for multiple synta...",
+        "url": "http://www.tortall.net/projects/yasm/",
+        "license": "BSD-2-Clause",
+        "origin": "yasm",
+        "maintainer": {
+          "name": "Natanael Copa",
+          "email": "ncopa@alpinelinux.org"
+        },
+        "build_time": 1681228881,
+        "commit": "84a227baf001b6e0208e3352b294e4d7a40e93de",
+        "dependencies": [
+          "so:libc.musl-x86_64.so.1"
+        ],
+        "provides": [
+          "cmd:vsyasm=1.3.0-r4",
+          "cmd:yasm=1.3.0-r4",
+          "cmd:ytasm=1.3.0-r4"
+        ]
+      }
+    ]
+
+    $ cat APKINDEX | jc --pkg-index-apk --raw
+    [
+      {
+        "C": "Q1znBl9k+RKgY6gl5Eg3iz73KZbLY=",
+        "P": "yasm",
+        "V": "1.3.0-r4",
+        "A": "x86_64",
+        "S": "772109",
+        "I": "1753088",
+        "T": "A rewrite of NASM to allow for multiple syntax supported...",
+        "U": "http://www.tortall.net/projects/yasm/",
+        "L": "BSD-2-Clause",
+        "o": "yasm",
+        "m": "Natanael Copa <ncopa@alpinelinux.org>",
+        "t": "1681228881",
+        "c": "84a227baf001b6e0208e3352b294e4d7a40e93de",
+        "D": "so:libc.musl-x86_64.so.1",
+        "p": "cmd:vsyasm=1.3.0-r4 cmd:yasm=1.3.0-r4 cmd:ytasm=1.3.0-r4"
+      },
+    ]
+
+<a id="jc.parsers.pkg_index_apk.parse"></a>
+
+### parse
+
+```python
+def parse(data: str, raw: bool = False, quiet: bool = False) -> List[Dict]
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) unprocessed output if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    List of Dictionaries. Raw or processed structured data.
+
+### Parser Information
+Compatibility:  linux, darwin, cygwin, win32, aix, freebsd
+
+Version 1.0 by Roey Darwish Dror (roey.ghost@gmail.com)

docs/parsers/pkg_index_deb.md

@@ -0,0 +1,138 @@
+[Home](https://kellyjonbrazil.github.io/jc/)
+<a id="jc.parsers.pkg_index_deb"></a>
+
+# jc.parsers.pkg\_index\_deb
+
+jc - JSON Convert Debian Package Index file parser
+
+Usage (cli):
+
+    $ cat Packages | jc --pkg-index-deb
+
+Usage (module):
+
+    import jc
+    result = jc.parse('pkg_index_deb', pkg_index_deb_output)
+
+Schema:
+
+    [
+      {
+        "package":                  string,
+        "version":                  string,
+        "architecture":             string,
+        "section":                  string,
+        "priority":                 string,
+        "installed_size":           integer,
+        "maintainer":               string,
+        "description":              string,
+        "homepage":                 string,
+        "depends":                  string,
+        "conflicts":                string,
+        "replaces":                 string,
+        "vcs_git":                  string,
+        "sha256":                   string,
+        "size":                     integer,
+        "vcs_git":                  string,
+        "filename":                 string
+      }
+    ]
+
+Examples:
+
+    $ cat Packages | jc --pkg-index-deb
+    [
+      {
+        "package": "aspnetcore-runtime-2.1",
+        "version": "2.1.22-1",
+        "architecture": "amd64",
+        "section": "devel",
+        "priority": "standard",
+        "installed_size": 71081,
+        "maintainer": "Microsoft <nugetaspnet@microsoft.com>",
+        "description": "Microsoft ASP.NET Core 2.1.22 Shared Framework",
+        "homepage": "https://www.asp.net/",
+        "depends": "libc6 (>= 2.14), dotnet-runtime-2.1 (>= 2.1.22)",
+        "sha256": "48d4e78a7ceff34105411172f4c3e91a0359b3929d84d26a493...",
+        "size": 21937036,
+        "filename": "pool/main/a/aspnetcore-runtime-2.1/aspnetcore-run..."
+      },
+      {
+        "package": "azure-functions-core-tools-4",
+        "version": "4.0.4590-1",
+        "architecture": "amd64",
+        "section": "devel",
+        "priority": "optional",
+        "maintainer": "Ahmed ElSayed <ahmels@microsoft.com>",
+        "description": "Azure Function Core Tools v4",
+        "homepage": "https://docs.microsoft.com/en-us/azure/azure-func...",
+        "conflicts": "azure-functions-core-tools-2, azure-functions-co...",
+        "replaces": "azure-functions-core-tools-2, azure-functions-cor...",
+        "vcs_git": "https://github.com/Azure/azure-functions-core-tool...",
+        "sha256": "a2a4f99d6d98ba0a46832570285552f2a93bab06cebbda2afc7...",
+        "size": 124417844,
+        "filename": "pool/main/a/azure-functions-core-tools-4/azure-fu..."
+      }
+    ]
+
+    $ cat Packages | jc --pkg-index-deb -r
+    [
+      {
+        "package": "aspnetcore-runtime-2.1",
+        "version": "2.1.22-1",
+        "architecture": "amd64",
+        "section": "devel",
+        "priority": "standard",
+        "installed_size": "71081",
+        "maintainer": "Microsoft <nugetaspnet@microsoft.com>",
+        "description": "Microsoft ASP.NET Core 2.1.22 Shared Framework",
+        "homepage": "https://www.asp.net/",
+        "depends": "libc6 (>= 2.14), dotnet-runtime-2.1 (>= 2.1.22)",
+        "sha256": "48d4e78a7ceff34105411172f4c3e91a0359b3929d84d26a493...",
+        "size": "21937036",
+        "filename": "pool/main/a/aspnetcore-runtime-2.1/aspnetcore-run..."
+      },
+      {
+        "package": "azure-functions-core-tools-4",
+        "version": "4.0.4590-1",
+        "architecture": "amd64",
+        "section": "devel",
+        "priority": "optional",
+        "maintainer": "Ahmed ElSayed <ahmels@microsoft.com>",
+        "description": "Azure Function Core Tools v4",
+        "homepage": "https://docs.microsoft.com/en-us/azure/azure-func...",
+        "conflicts": "azure-functions-core-tools-2, azure-functions-co...",
+        "replaces": "azure-functions-core-tools-2, azure-functions-cor...",
+        "vcs_git": "https://github.com/Azure/azure-functions-core-tool...",
+        "sha256": "a2a4f99d6d98ba0a46832570285552f2a93bab06cebbda2afc7...",
+        "size": "124417844",
+        "filename": "pool/main/a/azure-functions-core-tools-4/azure-fu..."
+      }
+    ]
+
+<a id="jc.parsers.pkg_index_deb.parse"></a>
+
+### parse
+
+```python
+def parse(data: str,
+          raw: bool = False,
+          quiet: bool = False) -> List[JSONDictType]
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) unprocessed output if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    List of Dictionaries. Raw or processed structured data.
+
+### Parser Information
+Compatibility:  linux, darwin, cygwin, win32, aix, freebsd
+
+Version 1.0 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/proc.md

@@ -139,4 +139,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux
 
-Version 1.1 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.2 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/proc_cmdline.md

@@ -0,0 +1,92 @@
+[Home](https://kellyjonbrazil.github.io/jc/)
+<a id="jc.parsers.proc_cmdline"></a>
+
+# jc.parsers.proc\_cmdline
+
+jc - JSON Convert `/proc/cmdline` file parser
+
+Usage (cli):
+
+    $ cat /proc/cmdline | jc --proc
+
+or
+
+    $ jc /proc/cmdline
+
+or
+
+    $ cat /proc/cmdline | jc --proc-cmdline
+
+Usage (module):
+
+    import jc
+    result = jc.parse('proc_cmdline', proc_cmdline_file)
+
+Schema:
+
+    {
+      "<key>":          string,
+      "_options": [
+                        string
+      ]
+    }
+
+Examples:
+
+    $ cat /proc/cmdline | jc --proc -p
+    {
+      "BOOT_IMAGE": "clonezilla/live/vmlinuz",
+      "consoleblank": "0",
+      "keyboard-options": "grp:ctrl_shift_toggle,lctrl_shift_toggle",
+      "ethdevice-timeout": "130",
+      "toram": "filesystem.squashfs",
+      "boot": "live",
+      "edd": "on",
+      "ocs_daemonon": "ssh lighttpd",
+      "ocs_live_run": "sudo screen /usr/sbin/ocs-sr -g auto -e1 auto -e2 -batch -r -j2 -k -scr -p true restoreparts win7-64 sda1",
+      "ocs_live_extra_param": "",
+      "keyboard-layouts": "us,ru",
+      "ocs_live_batch": "no",
+      "locales": "ru_RU.UTF-8",
+      "vga": "788",
+      "net.ifnames": "0",
+      "union": "overlay",
+      "fetch": "http://10.1.1.1/tftpboot/clonezilla/live/filesystem.squashfs",
+      "ocs_postrun99": "sudo reboot",
+      "initrd": "clonezilla/live/initrd.img",
+      "_options": [
+        "config",
+        "noswap",
+        "nolocales",
+        "nomodeset",
+        "noprompt",
+        "nosplash",
+        "nodmraid",
+        "components"
+      ]
+    }
+
+<a id="jc.parsers.proc_cmdline.parse"></a>
+
+### parse
+
+```python
+def parse(data: str, raw: bool = False, quiet: bool = False) -> JSONDictType
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) unprocessed output if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    Dictionary. Raw or processed structured data.
+
+### Parser Information
+Compatibility:  linux
+
+Version 1.0 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/rpm_qi.md

@@ -184,4 +184,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux
 
-Version 1.6 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.7 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/swapon.md

@@ -0,0 +1,69 @@
+[Home](https://kellyjonbrazil.github.io/jc/)
+<a id="jc.parsers.swapon"></a>
+
+# jc.parsers.swapon
+
+jc - JSON Convert `swapon` command output parser
+
+Usage (cli):
+
+    $ swapon | jc --swapon
+
+or
+
+    $ jc swapon
+
+Usage (module):
+
+    import jc
+    result = jc.parse('swapon', swapon_command_output)
+
+Schema:
+
+    [
+      {
+        "name":             string,
+        "type":             string,
+        "size":             integer,
+        "used":             integer,
+        "priority":         integer
+      }
+    ]
+
+Example:
+
+    $ swapon | jc --swapon
+    [
+      {
+        "name": "/swapfile",
+        "type": "file",
+        "size": 1073741824,
+        "used": 0,
+        "priority": -2
+      }
+    ]
+
+<a id="jc.parsers.swapon.parse"></a>
+
+### parse
+
+```python
+def parse(data: str, raw: bool = False, quiet: bool = False) -> List[_Entry]
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) unprocessed output if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    Dictionary. Raw or processed structured data.
+
+### Parser Information
+Compatibility:  linux, freebsd
+
+Version 1.0 by Roey Darwish Dror (roey.ghost@gmail.com)

docs/parsers/tune2fs.md

@@ -0,0 +1,235 @@
+[Home](https://kellyjonbrazil.github.io/jc/)
+<a id="jc.parsers.tune2fs"></a>
+
+# jc.parsers.tune2fs
+
+jc - JSON Convert `tune2fs -l` command output parser
+
+Usage (cli):
+
+    $ tune2fs -l /dev/xvda4 | jc --tune2fs
+
+or
+
+    $ jc tune2fs -l /dev/xvda4
+
+Usage (module):
+
+    import jc
+    result = jc.parse('tune2fs', tune2fs_command_output)
+
+Schema:
+
+    {
+      "version":                            string,
+      "filesystem_volume_name":             string,
+      "last_mounted_on":                    string,
+      "filesystem_uuid":                    string,
+      "filesystem_magic_number":            string,
+      "filesystem_revision_number":         string,
+      "filesystem_features": [
+                                            string
+      ],
+      "filesystem_flags":                   string,
+      "default_mount_options":              string,
+      "filesystem_state":                   string,
+      "errors_behavior":                    string,
+      "filesystem_os_type":                 string,
+      "inode_count":                        integer,
+      "block_count":                        integer,
+      "reserved_block_count":               integer,
+      "overhead_clusters":                  integer,
+      "free_blocks":                        integer,
+      "free_inodes":                        integer,
+      "first_block":                        integer,
+      "block_size":                         integer,
+      "fragment_size":                      integer,
+      "group_descriptor_size":              integer,
+      "reserved_gdt_blocks":                integer,
+      "blocks_per_group":                   integer,
+      "fragments_per_group":                integer,
+      "inodes_per_group":                   integer,
+      "inode_blocks_per_group":             integer,
+      "flex_block_group_size":              integer,
+      "filesystem_created":                 string,
+      "filesystem_created_epoch":           integer,
+      "filesystem_created_epoch_utc":       integer,
+      "last_mount_time":                    string,
+      "last_mount_time_epoch":              integer,
+      "last_mount_time_epoch_utc":          integer,
+      "last_write_time":                    string,
+      "last_write_time_epoch":              integer,
+      "last_write_time_epoch_utc":          integer,
+      "mount_count":                        integer,
+      "maximum_mount_count":                integer,
+      "last_checked":                       string,
+      "last_checked_epoch":                 integer,
+      "last_checked_epoch_utc":             integer,
+      "check_interval":                     string,
+      "lifetime_writes":                    string,
+      "reserved_blocks_uid":                string,
+      "reserved_blocks_gid":                string,
+      "first_inode":                        integer,
+      "inode_size":                         integer,
+      "required_extra_isize":               integer,
+      "desired_extra_isize":                integer,
+      "journal_inode":                      integer,
+      "default_directory_hash":             string,
+      "directory_hash_seed":                string,
+      "journal_backup":                     string,
+      "checksum_type":                      string,
+      "checksum":                           string
+    }
+
+Examples:
+
+    $ tune2fs | jc --tune2fs -p
+    {
+      "version": "1.46.2 (28-Feb-2021)",
+      "filesystem_volume_name": "<none>",
+      "last_mounted_on": "/home",
+      "filesystem_uuid": "5fb78e1a-b214-44e2-a309-8e35116d8dd6",
+      "filesystem_magic_number": "0xEF53",
+      "filesystem_revision_number": "1 (dynamic)",
+      "filesystem_features": [
+        "has_journal",
+        "ext_attr",
+        "resize_inode",
+        "dir_index",
+        "filetype",
+        "needs_recovery",
+        "extent",
+        "64bit",
+        "flex_bg",
+        "sparse_super",
+        "large_file",
+        "huge_file",
+        "dir_nlink",
+        "extra_isize",
+        "metadata_csum"
+      ],
+      "filesystem_flags": "signed_directory_hash",
+      "default_mount_options": "user_xattr acl",
+      "filesystem_state": "clean",
+      "errors_behavior": "Continue",
+      "filesystem_os_type": "Linux",
+      "inode_count": 3932160,
+      "block_count": 15728640,
+      "reserved_block_count": 786432,
+      "free_blocks": 15198453,
+      "free_inodes": 3864620,
+      "first_block": 0,
+      "block_size": 4096,
+      "fragment_size": 4096,
+      "group_descriptor_size": 64,
+      "reserved_gdt_blocks": 1024,
+      "blocks_per_group": 32768,
+      "fragments_per_group": 32768,
+      "inodes_per_group": 8192,
+      "inode_blocks_per_group": 512,
+      "flex_block_group_size": 16,
+      "filesystem_created": "Mon Apr  6 15:10:37 2020",
+      "last_mount_time": "Mon Sep 19 15:16:20 2022",
+      "last_write_time": "Mon Sep 19 15:16:20 2022",
+      "mount_count": 14,
+      "maximum_mount_count": -1,
+      "last_checked": "Fri Apr  8 15:24:22 2022",
+      "check_interval": "0 (<none>)",
+      "lifetime_writes": "203 GB",
+      "reserved_blocks_uid": "0 (user root)",
+      "reserved_blocks_gid": "0 (group root)",
+      "first_inode": 11,
+      "inode_size": 256,
+      "required_extra_isize": 32,
+      "desired_extra_isize": 32,
+      "journal_inode": 8,
+      "default_directory_hash": "half_md4",
+      "directory_hash_seed": "67d5358d-723d-4ce3-b3c0-30ddb433ad9e",
+      "journal_backup": "inode blocks",
+      "checksum_type": "crc32c",
+      "checksum": "0x7809afff",
+      "filesystem_created_epoch": 1586211037,
+      "filesystem_created_epoch_utc": null,
+      "last_mount_time_epoch": 1663625780,
+      "last_mount_time_epoch_utc": null,
+      "last_write_time_epoch": 1663625780,
+      "last_write_time_epoch_utc": null,
+      "last_checked_epoch": 1649456662,
+      "last_checked_epoch_utc": null
+    }
+
+    $ tune2fs | jc --tune2fs -p -r
+    {
+      "version": "1.46.2 (28-Feb-2021)",
+      "filesystem_volume_name": "<none>",
+      "last_mounted_on": "/home",
+      "filesystem_uuid": "5fb78e1a-b214-44e2-a309-8e35116d8dd6",
+      "filesystem_magic_number": "0xEF53",
+      "filesystem_revision_number": "1 (dynamic)",
+      "filesystem_features": "has_journal ext_attr resize_inode dir_index filetype needs_recovery extent 64bit flex_bg sparse_super large_file huge_file dir_nlink extra_isize metadata_csum",
+      "filesystem_flags": "signed_directory_hash",
+      "default_mount_options": "user_xattr acl",
+      "filesystem_state": "clean",
+      "errors_behavior": "Continue",
+      "filesystem_os_type": "Linux",
+      "inode_count": "3932160",
+      "block_count": "15728640",
+      "reserved_block_count": "786432",
+      "free_blocks": "15198453",
+      "free_inodes": "3864620",
+      "first_block": "0",
+      "block_size": "4096",
+      "fragment_size": "4096",
+      "group_descriptor_size": "64",
+      "reserved_gdt_blocks": "1024",
+      "blocks_per_group": "32768",
+      "fragments_per_group": "32768",
+      "inodes_per_group": "8192",
+      "inode_blocks_per_group": "512",
+      "flex_block_group_size": "16",
+      "filesystem_created": "Mon Apr  6 15:10:37 2020",
+      "last_mount_time": "Mon Sep 19 15:16:20 2022",
+      "last_write_time": "Mon Sep 19 15:16:20 2022",
+      "mount_count": "14",
+      "maximum_mount_count": "-1",
+      "last_checked": "Fri Apr  8 15:24:22 2022",
+      "check_interval": "0 (<none>)",
+      "lifetime_writes": "203 GB",
+      "reserved_blocks_uid": "0 (user root)",
+      "reserved_blocks_gid": "0 (group root)",
+      "first_inode": "11",
+      "inode_size": "256",
+      "required_extra_isize": "32",
+      "desired_extra_isize": "32",
+      "journal_inode": "8",
+      "default_directory_hash": "half_md4",
+      "directory_hash_seed": "67d5358d-723d-4ce3-b3c0-30ddb433ad9e",
+      "journal_backup": "inode blocks",
+      "checksum_type": "crc32c",
+      "checksum": "0x7809afff"
+    }
+
+<a id="jc.parsers.tune2fs.parse"></a>
+
+### parse
+
+```python
+def parse(data: str, raw: bool = False, quiet: bool = False) -> JSONDictType
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) unprocessed output if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    Dictionary. Raw or processed structured data.
+
+### Parser Information
+Compatibility:  linux
+
+Version 1.0 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/ver.md

@@ -7,7 +7,7 @@ jc - JSON Convert Version string output parser
 
 Best-effort attempt to parse various styles of version numbers. This parser
 is based off of the version parser included in the CPython distutils
-libary.
+library.
 
 If the version string conforms to some de facto-standard versioning rules
 followed by many developers a `strict` key will be present in the output

docs/parsers/vmstat.md

@@ -149,4 +149,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux
 
-Version 1.3 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.4 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/vmstat_s.md

@@ -123,4 +123,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux
 
-Version 1.2 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.3 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/who.md

@@ -158,4 +158,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux, darwin, cygwin, aix, freebsd
 
-Version 1.7 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.8 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/x509_cert.md

@@ -433,4 +433,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux, darwin, cygwin, win32, aix, freebsd
 
-Version 1.2 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.3 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/xml.md

@@ -98,4 +98,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux, darwin, cygwin, win32, aix, freebsd
 
-Version 1.7 by Kelly Brazil (kellyjonbrazil@gmail.com)
+Version 1.9 by Kelly Brazil (kellyjonbrazil@gmail.com)

docs/parsers/xrandr.md

@@ -31,22 +31,24 @@ Schema:
           "current_height":                    integer,
           "maximum_width":                     integer,
           "maximum_height":                    integer,
-          "associated_device": {
-            "associated_modes": [
-              {
-                "resolution_width":            integer,
-                "resolution_height":           integer,
-                "is_high_resolution":          boolean,
-                "frequencies": [
-                  {
-                    "frequency":               float,
-                    "is_current":              boolean,
-                    "is_preferred":            boolean
-                  }
-                ]
-              }
-            ]
-          },
+          "devices": [
+            {
+              "modes": [
+                {
+                  "resolution_width":          integer,
+                  "resolution_height":         integer,
+                  "is_high_resolution":        boolean,
+                  "frequencies": [
+                    {
+                      "frequency":             float,
+                      "is_current":            boolean,
+                      "is_preferred":          boolean
+                    }
+                  ]
+                }
+              ]
+            }
+          ],
           "is_connected":                      boolean,
           "is_primary":                        boolean,
           "device_name":                       string,
@@ -62,24 +64,6 @@ Schema:
           "rotation":                          string,
           "reflection":                        string
         }
-      ],
-      "unassociated_devices": [
-        {
-          "associated_modes": [
-            {
-              "resolution_width":              integer,
-              "resolution_height":             integer,
-              "is_high_resolution":            boolean,
-              "frequencies": [
-                {
-                  "frequency":                 float,
-                  "is_current":                boolean,
-                  "is_preferred":              boolean
-                }
-              ]
-            }
-          ]
-        }
       ]
     }
 
@@ -96,53 +80,54 @@ Examples:
           "current_height": 1080,
           "maximum_width": 32767,
           "maximum_height": 32767,
-          "associated_device": {
-            "associated_modes": [
-              {
-                "resolution_width": 1920,
-                "resolution_height": 1080,
-                "is_high_resolution": false,
-                "frequencies": [
-                  {
-                    "frequency": 60.03,
-                    "is_current": true,
-                    "is_preferred": true
-                  },
-                  {
-                    "frequency": 59.93,
-                    "is_current": false,
-                    "is_preferred": false
-                  }
-                ]
-              },
-              {
-                "resolution_width": 1680,
-                "resolution_height": 1050,
-                "is_high_resolution": false,
-                "frequencies": [
-                  {
-                    "frequency": 59.88,
-                    "is_current": false,
-                    "is_preferred": false
-                  }
-                ]
-              }
-            ],
-            "is_connected": true,
-            "is_primary": true,
-            "device_name": "eDP1",
-            "resolution_width": 1920,
-            "resolution_height": 1080,
-            "offset_width": 0,
-            "offset_height": 0,
-            "dimension_width": 310,
-            "dimension_height": 170,
-            "rotation": "normal",
-            "reflection": "normal"
-          }
+          "devices": [
+            {
+              "modes": [
+                {
+                  "resolution_width": 1920,
+                  "resolution_height": 1080,
+                  "is_high_resolution": false,
+                  "frequencies": [
+                    {
+                      "frequency": 60.03,
+                      "is_current": true,
+                      "is_preferred": true
+                    },
+                    {
+                      "frequency": 59.93,
+                      "is_current": false,
+                      "is_preferred": false
+                    }
+                  ]
+                },
+                {
+                  "resolution_width": 1680,
+                  "resolution_height": 1050,
+                  "is_high_resolution": false,
+                  "frequencies": [
+                    {
+                      "frequency": 59.88,
+                      "is_current": false,
+                      "is_preferred": false
+                    }
+                  ]
+                }
+              ],
+              "is_connected": true,
+              "is_primary": true,
+              "device_name": "eDP1",
+              "resolution_width": 1920,
+              "resolution_height": 1080,
+              "offset_width": 0,
+              "offset_height": 0,
+              "dimension_width": 310,
+              "dimension_height": 170,
+              "rotation": "normal",
+              "reflection": "normal"
+            }
+          ]
         }
-      ],
-      "unassociated_devices": []
+      ]
     }
 
     $ xrandr --properties | jc --xrandr -p
@@ -156,56 +141,57 @@ Examples:
           "current_height": 1080,
           "maximum_width": 32767,
           "maximum_height": 32767,
-          "associated_device": {
-            "associated_modes": [
-              {
-                "resolution_width": 1920,
-                "resolution_height": 1080,
-                "is_high_resolution": false,
-                "frequencies": [
-                  {
-                    "frequency": 60.03,
-                    "is_current": true,
-                    "is_preferred": true
-                  },
-                  {
-                    "frequency": 59.93,
-                    "is_current": false,
-                    "is_preferred": false
-                  }
-                ]
-              },
-              {
-                "resolution_width": 1680,
-                "resolution_height": 1050,
-                "is_high_resolution": false,
-                "frequencies": [
-                  {
-                    "frequency": 59.88,
-                    "is_current": false,
-                    "is_preferred": false
-                  }
-                ]
-              }
-            ],
-            "is_connected": true,
-            "is_primary": true,
-            "device_name": "eDP1",
-            "model_name": "ASUS VW193S",
-            "product_id": "54297",
-            "serial_number": "78L8021107",
-            "resolution_width": 1920,
-            "resolution_height": 1080,
-            "offset_width": 0,
-            "offset_height": 0,
-            "dimension_width": 310,
-            "dimension_height": 170,
-            "rotation": "normal",
-            "reflection": "normal"
-          }
+          "devices": [
+            {
+              "modes": [
+                {
+                  "resolution_width": 1920,
+                  "resolution_height": 1080,
+                  "is_high_resolution": false,
+                  "frequencies": [
+                    {
+                      "frequency": 60.03,
+                      "is_current": true,
+                      "is_preferred": true
+                    },
+                    {
+                      "frequency": 59.93,
+                      "is_current": false,
+                      "is_preferred": false
+                    }
+                  ]
+                },
+                {
+                  "resolution_width": 1680,
+                  "resolution_height": 1050,
+                  "is_high_resolution": false,
+                  "frequencies": [
+                    {
+                      "frequency": 59.88,
+                      "is_current": false,
+                      "is_preferred": false
+                    }
+                  ]
+                }
+              ],
+              "is_connected": true,
+              "is_primary": true,
+              "device_name": "eDP1",
+              "model_name": "ASUS VW193S",
+              "product_id": "54297",
+              "serial_number": "78L8021107",
+              "resolution_width": 1920,
+              "resolution_height": 1080,
+              "offset_width": 0,
+              "offset_height": 0,
+              "dimension_width": 310,
+              "dimension_height": 170,
+              "rotation": "normal",
+              "reflection": "normal"
+            }
+          ]
         }
-      ],
-      "unassociated_devices": []
+      ]
     }
 
 <a id="jc.parsers.xrandr.parse"></a>
@@ -231,4 +217,4 @@ Returns:
 ### Parser Information
 Compatibility:  linux, darwin, cygwin, aix, freebsd
 
-Version 1.2 by Kevin Lyter (lyter_git at sent.com)
+Version 1.4 by Kevin Lyter (code (at) lyterk.com)

docs/utils.md

@@ -9,6 +9,7 @@
   * [convert\_to\_int](#jc.utils.convert_to_int)
   * [convert\_to\_float](#jc.utils.convert_to_float)
   * [convert\_to\_bool](#jc.utils.convert_to_bool)
+  * [convert\_size\_to\_int](#jc.utils.convert_size_to_int)
   * [input\_type\_check](#jc.utils.input_type_check)
   * [timestamp](#jc.utils.timestamp)
     * [\_\_init\_\_](#jc.utils.timestamp.__init__)
@@ -178,6 +179,48 @@ Returns:
     True/False      False unless a 'truthy' number or string is found
                     ('y', 'yes', 'true', '1', 1, -1, etc.)
 
+<a id="jc.utils.convert_size_to_int"></a>
+
+### convert\_size\_to\_int
+
+```python
+def convert_size_to_int(size: str, binary: bool = False) -> Optional[int]
+```
+
+Parse a human readable data size and return the number of bytes.
+
+Parameters:
+
+    size:           (string) The human readable file size to parse.
+    binary:         (boolean) `True` to use binary multiples of bytes
+                    (base-2) for ambiguous unit symbols and names,
+                    `False` to use decimal multiples of bytes (base-10).
+Returns:
+
+    integer/None    Integer if successful conversion, otherwise None
+
+This function knows how to parse sizes in bytes, kilobytes, megabytes,
+gigabytes, terabytes and petabytes. Some examples:
+
+    >>> convert_size_to_int('42')
+    42
+    >>> convert_size_to_int('13b')
+    13
+    >>> convert_size_to_int('5 bytes')
+    5
+    >>> convert_size_to_int('1 KB')
+    1000
+    >>> convert_size_to_int('1 kilobyte')
+    1000
+    >>> convert_size_to_int('1 KiB')
+    1024
+    >>> convert_size_to_int('1 KB', binary=True)
+    1024
+    >>> convert_size_to_int('1.5 GB')
+    1500000000
+    >>> convert_size_to_int('1.5 GB', binary=True)
+    1610612736
+
 <a id="jc.utils.input_type_check"></a>
 
 ### input\_type\_check

jc/appdirs.py

@@ -45,10 +45,6 @@ __version_info__ = tuple(int(segment) for segment in __version__.split("."))
 import sys
 import os
 
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    unicode = str
 
 if sys.platform.startswith('java'):
     import platform
@@ -490,10 +486,7 @@ def _get_win_folder_from_registry(csidl_name):
     registry for this guarantees us the correct answer for all CSIDL_*
     names.
     """
-    if PY3:
-      import winreg as _winreg
-    else:
-      import _winreg
+    import winreg as _winreg
 
     shell_folder_name = {
         "CSIDL_APPDATA": "AppData",

jc/cli.py

@@ -145,33 +145,34 @@ class JcCli():
         JC_COLORS=blue,brightblack,magenta,green
         JC_COLORS=default,default,default,default
         """
-        input_error = False
-        env_colors = os.getenv('JC_COLORS')
+        if PYGMENTS_INSTALLED:
+            input_error = False
+            env_colors = os.getenv('JC_COLORS')
 
-        if env_colors:
-            color_list = env_colors.split(',')
-        else:
-            color_list = ['default', 'default', 'default', 'default']
+            if env_colors:
+                color_list = env_colors.split(',')
+            else:
+                color_list = ['default', 'default', 'default', 'default']
 
-        if len(color_list) != 4:
-            input_error = True
-
-        for color in color_list:
-            if color != 'default' and color not in PYGMENT_COLOR:
+            if len(color_list) != 4:
                 input_error = True
 
-        # if there is an issue with the env variable, just set all colors to default and move on
-        if input_error:
-            utils.warning_message(['Could not parse JC_COLORS environment variable'])
-            color_list = ['default', 'default', 'default', 'default']
+            for color in color_list:
+                if color != 'default' and color not in PYGMENT_COLOR:
+                    input_error = True
 
-        # Try the color set in the JC_COLORS env variable first. If it is set to default, then fall back to default colors
-        self.custom_colors = {
-            Name.Tag: f'bold {PYGMENT_COLOR[color_list[0]]}' if color_list[0] != 'default' else f"bold {PYGMENT_COLOR['blue']}",   # key names
-            Keyword: PYGMENT_COLOR[color_list[1]] if color_list[1] != 'default' else PYGMENT_COLOR['brightblack'],                 # true, false, null
-            Number: PYGMENT_COLOR[color_list[2]] if color_list[2] != 'default' else PYGMENT_COLOR['magenta'],                      # numbers
-            String: PYGMENT_COLOR[color_list[3]] if color_list[3] != 'default' else PYGMENT_COLOR['green']                         # strings
-        }
+            # if there is an issue with the env variable, just set all colors to default and move on
+            if input_error:
+                utils.warning_message(['Could not parse JC_COLORS environment variable'])
+                color_list = ['default', 'default', 'default', 'default']
+
+            # Try the color set in the JC_COLORS env variable first. If it is set to default, then fall back to default colors
+            self.custom_colors = {
+                Name.Tag: f'bold {PYGMENT_COLOR[color_list[0]]}' if color_list[0] != 'default' else f"bold {PYGMENT_COLOR['blue']}",   # key names
+                Keyword: PYGMENT_COLOR[color_list[1]] if color_list[1] != 'default' else PYGMENT_COLOR['brightblack'],                 # true, false, null
+                Number: PYGMENT_COLOR[color_list[2]] if color_list[2] != 'default' else PYGMENT_COLOR['magenta'],                      # numbers
+                String: PYGMENT_COLOR[color_list[3]] if color_list[3] != 'default' else PYGMENT_COLOR['green']                         # strings
+            }
 
     def set_mono(self) -> None:
         """

jc/lib.py

@@ -9,7 +9,7 @@ from .jc_types import ParserInfoType, JSONDictType
 from jc import appdirs
 
 
-__version__ = '1.23.4'
+__version__ = '1.24.0'
 
 parsers: List[str] = [
     'acpi',
@@ -34,6 +34,7 @@ parsers: List[str] = [
     'csv-s',
     'date',
     'datetime-iso',
+    'debconf-show',
     'df',
     'dig',
     'dir',
@@ -58,6 +59,7 @@ parsers: List[str] = [
     'hashsum',
     'hciconfig',
     'history',
+    'host',
     'hosts',
     'id',
     'ifconfig',
@@ -68,7 +70,6 @@ parsers: List[str] = [
     'ip-address',
     'iptables',
     'ip-route',
-    'iso-datetime',
     'iw-scan',
     'iwconfig',
     'jar-manifest',
@@ -79,6 +80,7 @@ parsers: List[str] = [
     'ls',
     'ls-s',
     'lsattr',
+    'lsb-release',
     'lsblk',
     'lsmod',
     'lsof',
@@ -91,9 +93,11 @@ parsers: List[str] = [
     'mpstat-s',
     'netstat',
     'nmcli',
+    'nsd-control',
     'ntpq',
     'openvpn',
     'os-prober',
+    'os-release',
     'passwd',
     'pci-ids',
     'pgpass',
@@ -103,10 +107,13 @@ parsers: List[str] = [
     'ping-s',
     'pip-list',
     'pip-show',
+    'pkg-index-apk',
+    'pkg-index-deb',
     'plist',
     'postconf',
     'proc',
     'proc-buddyinfo',
+    'proc-cmdline',
     'proc-consoles',
     'proc-cpuinfo',
     'proc-crypto',
@@ -171,6 +178,7 @@ parsers: List[str] = [
     'sshd-conf',
     'stat',
     'stat-s',
+    'swapon',
     'sysctl',
     'syslog',
     'syslog-s',
@@ -189,6 +197,7 @@ parsers: List[str] = [
     'top-s',
     'tracepath',
     'traceroute',
+    'tune2fs',
     'udevadm',
     'ufw',
     'ufw-appinfo',

jc/parsers/acpi.py

@@ -227,7 +227,7 @@ import jc.utils
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.6'
+    version = '1.7'
     description = '`acpi` command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -337,19 +337,15 @@ def parse(data, raw=False, quiet=False):
                     output_line['state'] = 'Not charging'
                     output_line['charge_percent'] = line.split()[-1].rstrip('%,')
 
-                if 'Charging' in line \
-                    or 'Discharging' in line \
-                    or 'Full' in line:
-
+                if any(word in line for word in ('Charging', 'Discharging', 'Full')):
                     output_line['state'] = line.split()[2][:-1]
                     output_line['charge_percent'] = line.split()[3].rstrip('%,')
-                    if 'will never fully discharge' in line:
+                    if 'will never fully discharge' in line or 'rate information unavailable' in line:
                         pass
-                    elif 'rate information unavailable' not in line:
-                        if 'Charging' in line:
-                            output_line['until_charged'] = line.split()[4]
-                        if 'Discharging' in line:
-                            output_line['charge_remaining'] = line.split()[4]
+                    elif 'Charging' in line:
+                        output_line['until_charged'] = line.split()[4]
+                    elif 'Discharging' in line:
+                        output_line['charge_remaining'] = line.split()[4]
 
                 if 'design capacity' in line:
                     output_line['design_capacity_mah'] = line.split()[4]
@@ -359,10 +355,7 @@ def parse(data, raw=False, quiet=False):
             if obj_type == 'Adapter':
                 output_line['type'] = obj_type
                 output_line['id'] = obj_id
-                if 'on-line' in line:
-                    output_line['on-line'] = True
-                else:
-                    output_line['on-line'] = False
+                output_line['on-line'] = 'on-line' in line
 
             if obj_type == 'Thermal':
                 output_line['type'] = obj_type

jc/parsers/asn1crypto/_inet.py

@@ -5,7 +5,7 @@ import socket
 import struct
 
 from ._errors import unwrap
-from ._types import byte_cls, bytes_to_list, str_cls, type_name
+from ._types import type_name
 
 
 def inet_ntop(address_family, packed_ip):
@@ -33,7 +33,7 @@ def inet_ntop(address_family, packed_ip):
             repr(address_family)
         ))
 
-    if not isinstance(packed_ip, byte_cls):
+    if not isinstance(packed_ip, bytes):
         raise TypeError(unwrap(
             '''
             packed_ip must be a byte string, not %s
@@ -52,7 +52,7 @@ def inet_ntop(address_family, packed_ip):
         ))
 
     if address_family == socket.AF_INET:
-        return '%d.%d.%d.%d' % tuple(bytes_to_list(packed_ip))
+        return '%d.%d.%d.%d' % tuple(list(packed_ip))
 
     octets = struct.unpack(b'!HHHHHHHH', packed_ip)
 
@@ -106,7 +106,7 @@ def inet_pton(address_family, ip_string):
             repr(address_family)
         ))
 
-    if not isinstance(ip_string, str_cls):
+    if not isinstance(ip_string, str):
         raise TypeError(unwrap(
             '''
             ip_string must be a unicode string, not %s

jc/parsers/asn1crypto/_iri.py

@@ -13,25 +13,16 @@ from __future__ import unicode_literals, division, absolute_import, print_functi
 from encodings import idna  # noqa
 import codecs
 import re
-import sys
 
 from ._errors import unwrap
-from ._types import byte_cls, str_cls, type_name, bytes_to_list, int_types
+from ._types import type_name
 
-if sys.version_info < (3,):
-    from urlparse import urlsplit, urlunsplit
-    from urllib import (
-        quote as urlquote,
-        unquote as unquote_to_bytes,
-    )
-
-else:
-    from urllib.parse import (
-        quote as urlquote,
-        unquote_to_bytes,
-        urlsplit,
-        urlunsplit,
-    )
+from urllib.parse import (
+    quote as urlquote,
+    unquote_to_bytes,
+    urlsplit,
+    urlunsplit,
+)
 
 
 def iri_to_uri(value, normalize=False):
@@ -48,7 +39,7 @@ def iri_to_uri(value, normalize=False):
         A byte string of the ASCII-encoded URI
     """
 
-    if not isinstance(value, str_cls):
+    if not isinstance(value, str):
         raise TypeError(unwrap(
             '''
             value must be a unicode string, not %s
@@ -57,19 +48,7 @@ def iri_to_uri(value, normalize=False):
         ))
 
     scheme = None
-    # Python 2.6 doesn't split properly is the URL doesn't start with http:// or https://
-    if sys.version_info < (2, 7) and not value.startswith('http://') and not value.startswith('https://'):
-        real_prefix = None
-        prefix_match = re.match('^[^:]*://', value)
-        if prefix_match:
-            real_prefix = prefix_match.group(0)
-            value = 'http://' + value[len(real_prefix):]
-        parsed = urlsplit(value)
-        if real_prefix:
-            value = real_prefix + value[7:]
-            scheme = _urlquote(real_prefix[:-3])
-    else:
-        parsed = urlsplit(value)
+    parsed = urlsplit(value)
 
     if scheme is None:
         scheme = _urlquote(parsed.scheme)
@@ -81,7 +60,7 @@ def iri_to_uri(value, normalize=False):
     password = _urlquote(parsed.password, safe='!$&\'()*+,;=')
     port = parsed.port
     if port is not None:
-        port = str_cls(port).encode('ascii')
+        port = str(port).encode('ascii')
 
     netloc = b''
     if username is not None:
@@ -112,7 +91,7 @@ def iri_to_uri(value, normalize=False):
         path = ''
 
     output = urlunsplit((scheme, netloc, path, query, fragment))
-    if isinstance(output, str_cls):
+    if isinstance(output, str):
         output = output.encode('latin1')
     return output
 
@@ -128,7 +107,7 @@ def uri_to_iri(value):
         A unicode string of the IRI
     """
 
-    if not isinstance(value, byte_cls):
+    if not isinstance(value, bytes):
         raise TypeError(unwrap(
             '''
             value must be a byte string, not %s
@@ -148,7 +127,7 @@ def uri_to_iri(value):
     if hostname:
         hostname = hostname.decode('idna')
     port = parsed.port
-    if port and not isinstance(port, int_types):
+    if port and not isinstance(port, int):
         port = port.decode('ascii')
 
     netloc = ''
@@ -160,7 +139,7 @@ def uri_to_iri(value):
     if hostname is not None:
         netloc += hostname
     if port is not None:
-        netloc += ':' + str_cls(port)
+        netloc += ':' + str(port)
 
     path = _urlunquote(parsed.path, remap=['/'], preserve=True)
     query = _urlunquote(parsed.query, remap=['&', '='], preserve=True)
@@ -182,7 +161,7 @@ def _iri_utf8_errors_handler(exc):
         resume at)
     """
 
-    bytes_as_ints = bytes_to_list(exc.object[exc.start:exc.end])
+    bytes_as_ints = list(exc.object[exc.start:exc.end])
     replacements = ['%%%02x' % num for num in bytes_as_ints]
     return (''.join(replacements), exc.end)
 
@@ -230,7 +209,7 @@ def _urlquote(string, safe=''):
         string = re.sub('%[0-9a-fA-F]{2}', _extract_escape, string)
 
     output = urlquote(string.encode('utf-8'), safe=safe.encode('utf-8'))
-    if not isinstance(output, byte_cls):
+    if not isinstance(output, bytes):
         output = output.encode('ascii')
 
     # Restore the existing quoted values that we extracted

jc/parsers/asn1crypto/_ordereddict.py

@@ -1,135 +0,0 @@
-# Copyright (c) 2009 Raymond Hettinger
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-#     The above copyright notice and this permission notice shall be
-#     included in all copies or substantial portions of the Software.
-#
-#     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-#     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-#     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-#     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-#     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-#     OTHER DEALINGS IN THE SOFTWARE.
-
-import sys
-
-if not sys.version_info < (2, 7):
-
-    from collections import OrderedDict
-
-else:
-
-    from UserDict import DictMixin
-
-    class OrderedDict(dict, DictMixin):
-
-        def __init__(self, *args, **kwds):
-            if len(args) > 1:
-                raise TypeError('expected at most 1 arguments, got %d' % len(args))
-            try:
-                self.__end
-            except AttributeError:
-                self.clear()
-            self.update(*args, **kwds)
-
-        def clear(self):
-            self.__end = end = []
-            end += [None, end, end]  # sentinel node for doubly linked list
-            self.__map = {}          # key --> [key, prev, next]
-            dict.clear(self)
-
-        def __setitem__(self, key, value):
-            if key not in self:
-                end = self.__end
-                curr = end[1]
-                curr[2] = end[1] = self.__map[key] = [key, curr, end]
-            dict.__setitem__(self, key, value)
-
-        def __delitem__(self, key):
-            dict.__delitem__(self, key)
-            key, prev, next_ = self.__map.pop(key)
-            prev[2] = next_
-            next_[1] = prev
-
-        def __iter__(self):
-            end = self.__end
-            curr = end[2]
-            while curr is not end:
-                yield curr[0]
-                curr = curr[2]
-
-        def __reversed__(self):
-            end = self.__end
-            curr = end[1]
-            while curr is not end:
-                yield curr[0]
-                curr = curr[1]
-
-        def popitem(self, last=True):
-            if not self:
-                raise KeyError('dictionary is empty')
-            if last:
-                key = reversed(self).next()
-            else:
-                key = iter(self).next()
-            value = self.pop(key)
-            return key, value
-
-        def __reduce__(self):
-            items = [[k, self[k]] for k in self]
-            tmp = self.__map, self.__end
-            del self.__map, self.__end
-            inst_dict = vars(self).copy()
-            self.__map, self.__end = tmp
-            if inst_dict:
-                return (self.__class__, (items,), inst_dict)
-            return self.__class__, (items,)
-
-        def keys(self):
-            return list(self)
-
-        setdefault = DictMixin.setdefault
-        update = DictMixin.update
-        pop = DictMixin.pop
-        values = DictMixin.values
-        items = DictMixin.items
-        iterkeys = DictMixin.iterkeys
-        itervalues = DictMixin.itervalues
-        iteritems = DictMixin.iteritems
-
-        def __repr__(self):
-            if not self:
-                return '%s()' % (self.__class__.__name__,)
-            return '%s(%r)' % (self.__class__.__name__, self.items())
-
-        def copy(self):
-            return self.__class__(self)
-
-        @classmethod
-        def fromkeys(cls, iterable, value=None):
-            d = cls()
-            for key in iterable:
-                d[key] = value
-            return d
-
-        def __eq__(self, other):
-            if isinstance(other, OrderedDict):
-                if len(self) != len(other):
-                    return False
-                for p, q in zip(self.items(), other.items()):
-                    if p != q:
-                        return False
-                return True
-            return dict.__eq__(self, other)
-
-        def __ne__(self, other):
-            return not self == other

jc/parsers/asn1crypto/_types.py

@@ -2,28 +2,10 @@
 from __future__ import unicode_literals, division, absolute_import, print_function
 
 import inspect
-import sys
 
 
-if sys.version_info < (3,):
-    str_cls = unicode  # noqa
-    byte_cls = str
-    int_types = (int, long)  # noqa
-
-    def bytes_to_list(byte_string):
-        return [ord(b) for b in byte_string]
-
-    chr_cls = chr
-
-else:
-    str_cls = str
-    byte_cls = bytes
-    int_types = int
-
-    bytes_to_list = list
-
-    def chr_cls(num):
-        return bytes([num])
+def chr_cls(num):
+    return bytes([num])
 
 
 def type_name(value):

jc/parsers/asn1crypto/core.py

@@ -48,8 +48,10 @@ Other type classes are defined that help compose the types listed above.
 
 from __future__ import unicode_literals, division, absolute_import, print_function
 
+from collections import OrderedDict
 from datetime import datetime, timedelta
 from fractions import Fraction
+from io import BytesIO
 import binascii
 import copy
 import math
@@ -58,22 +60,10 @@ import sys
 
 from . import _teletex_codec
 from ._errors import unwrap
-from ._ordereddict import OrderedDict
-from ._types import type_name, str_cls, byte_cls, int_types, chr_cls
+from ._types import type_name, chr_cls
 from .parser import _parse, _dump_header
 from .util import int_to_bytes, int_from_bytes, timezone, extended_datetime, create_timezone, utc_with_dst
 
-if sys.version_info <= (3,):
-    from cStringIO import StringIO as BytesIO
-
-    range = xrange  # noqa
-    _PY2 = True
-
-else:
-    from io import BytesIO
-
-    _PY2 = False
-
 
 _teletex_codec.register()
 
@@ -220,7 +210,7 @@ class Asn1Value(object):
             An instance of the current class
         """
 
-        if not isinstance(encoded_data, byte_cls):
+        if not isinstance(encoded_data, bytes):
             raise TypeError('encoded_data must be a byte string, not %s' % type_name(encoded_data))
 
         spec = None
@@ -291,7 +281,7 @@ class Asn1Value(object):
                 cls = self.__class__
                 # Allow explicit to be specified as a simple 2-element tuple
                 # instead of requiring the user make a nested tuple
-                if cls.explicit is not None and isinstance(cls.explicit[0], int_types):
+                if cls.explicit is not None and isinstance(cls.explicit[0], int):
                     cls.explicit = (cls.explicit, )
                 if hasattr(cls, '_setup'):
                     self._setup()
@@ -299,7 +289,7 @@ class Asn1Value(object):
 
             # Normalize tagging values
             if explicit is not None:
-                if isinstance(explicit, int_types):
+                if isinstance(explicit, int):
                     if class_ is None:
                         class_ = 'context'
                     explicit = (class_, explicit)
@@ -309,7 +299,7 @@ class Asn1Value(object):
                     tag = None
 
             if implicit is not None:
-                if isinstance(implicit, int_types):
+                if isinstance(implicit, int):
                     if class_ is None:
                         class_ = 'context'
                     implicit = (class_, implicit)
@@ -336,11 +326,11 @@ class Asn1Value(object):
 
             if explicit is not None:
                 # Ensure we have a tuple of 2-element tuples
-                if len(explicit) == 2 and isinstance(explicit[1], int_types):
+                if len(explicit) == 2 and isinstance(explicit[1], int):
                     explicit = (explicit, )
                 for class_, tag in explicit:
                     invalid_class = None
-                    if isinstance(class_, int_types):
+                    if isinstance(class_, int):
                         if class_ not in CLASS_NUM_TO_NAME_MAP:
                             invalid_class = class_
                     else:
@@ -356,7 +346,7 @@ class Asn1Value(object):
                             repr(invalid_class)
                         ))
                     if tag is not None:
-                        if not isinstance(tag, int_types):
+                        if not isinstance(tag, int):
                             raise TypeError(unwrap(
                                 '''
                                 explicit tag must be an integer, not %s
@@ -379,7 +369,7 @@ class Asn1Value(object):
                         repr(class_)
                     ))
                 if tag is not None:
-                    if not isinstance(tag, int_types):
+                    if not isinstance(tag, int):
                         raise TypeError(unwrap(
                             '''
                             implicit tag must be an integer, not %s
@@ -445,10 +435,7 @@ class Asn1Value(object):
             A unicode string
         """
 
-        if _PY2:
-            return self.__bytes__()
-        else:
-            return self.__unicode__()
+        return self.__unicode__()
 
     def __repr__(self):
         """
@@ -456,10 +443,7 @@ class Asn1Value(object):
             A unicode string
         """
 
-        if _PY2:
-            return '<%s %s b%s>' % (type_name(self), id(self), repr(self.dump()))
-        else:
-            return '<%s %s %s>' % (type_name(self), id(self), repr(self.dump()))
+        return '<%s %s %s>' % (type_name(self), id(self), repr(self.dump()))
 
     def __bytes__(self):
         """
@@ -609,10 +593,7 @@ class Asn1Value(object):
         elif hasattr(self, 'chosen'):
             self.chosen.debug(nest_level + 2)
         else:
-            if _PY2 and isinstance(self.native, byte_cls):
-                print('%s    Native: b%s' % (prefix, repr(self.native)))
-            else:
-                print('%s    Native: %s' % (prefix, self.native))
+            print('%s    Native: %s' % (prefix, self.native))
 
     def dump(self, force=False):
         """
@@ -1058,7 +1039,7 @@ class Choice(Asn1Value):
             A instance of the current class
         """
 
-        if not isinstance(encoded_data, byte_cls):
+        if not isinstance(encoded_data, bytes):
             raise TypeError('encoded_data must be a byte string, not %s' % type_name(encoded_data))
 
         value, _ = _parse_build(encoded_data, spec=cls, spec_params=kwargs, strict=strict)
@@ -1425,17 +1406,11 @@ class Concat(object):
 
     def __str__(self):
         """
-        Since str is different in Python 2 and 3, this calls the appropriate
-        method, __unicode__() or __bytes__()
-
         :return:
             A unicode string
         """
 
-        if _PY2:
-            return self.__bytes__()
-        else:
-            return self.__unicode__()
+        return self.__unicode__()
 
     def __bytes__(self):
         """
@@ -1684,7 +1659,7 @@ class Primitive(Asn1Value):
             A byte string
         """
 
-        if not isinstance(value, byte_cls):
+        if not isinstance(value, bytes):
             raise TypeError(unwrap(
                 '''
                 %s value must be a byte string, not %s
@@ -1784,7 +1759,7 @@ class AbstractString(Constructable, Primitive):
             A unicode string
         """
 
-        if not isinstance(value, str_cls):
+        if not isinstance(value, str):
             raise TypeError(unwrap(
                 '''
                 %s value must be a unicode string, not %s
@@ -1915,7 +1890,7 @@ class Integer(Primitive, ValueMap):
             ValueError - when an invalid value is passed
         """
 
-        if isinstance(value, str_cls):
+        if isinstance(value, str):
             if self._map is None:
                 raise ValueError(unwrap(
                     '''
@@ -1935,7 +1910,7 @@ class Integer(Primitive, ValueMap):
 
             value = self._reverse_map[value]
 
-        elif not isinstance(value, int_types):
+        elif not isinstance(value, int):
             raise TypeError(unwrap(
                 '''
                 %s value must be an integer or unicode string when a name_map
@@ -2004,7 +1979,7 @@ class _IntegerBitString(object):
             # return an empty chunk, for cases like \x23\x80\x00\x00
             return []
 
-        unused_bits_len = ord(self.contents[0]) if _PY2 else self.contents[0]
+        unused_bits_len = self.contents[0]
         value = int_from_bytes(self.contents[1:])
         bits = (len(self.contents) - 1) * 8
 
@@ -2135,7 +2110,7 @@ class BitString(_IntegerBitString, Constructable, Castable, Primitive, ValueMap)
                 if key in value:
                     bits[index] = 1
 
-            value = ''.join(map(str_cls, bits))
+            value = ''.join(map(str, bits))
 
         elif value.__class__ == tuple:
             if self._map is None:
@@ -2146,7 +2121,7 @@ class BitString(_IntegerBitString, Constructable, Castable, Primitive, ValueMap)
                     if bit:
                         name = self._map.get(index, index)
                         self._native.add(name)
-            value = ''.join(map(str_cls, value))
+            value = ''.join(map(str, value))
 
         else:
             raise TypeError(unwrap(
@@ -2220,7 +2195,7 @@ class BitString(_IntegerBitString, Constructable, Castable, Primitive, ValueMap)
             A boolean if the bit is set
         """
 
-        is_int = isinstance(key, int_types)
+        is_int = isinstance(key, int)
         if not is_int:
             if not isinstance(self._map, dict):
                 raise ValueError(unwrap(
@@ -2266,7 +2241,7 @@ class BitString(_IntegerBitString, Constructable, Castable, Primitive, ValueMap)
             ValueError - when _map is not set or the key name is invalid
         """
 
-        is_int = isinstance(key, int_types)
+        is_int = isinstance(key, int)
         if not is_int:
             if self._map is None:
                 raise ValueError(unwrap(
@@ -2333,8 +2308,8 @@ class BitString(_IntegerBitString, Constructable, Castable, Primitive, ValueMap)
             if self._map:
                 self._native = set()
                 for index, bit in enumerate(bits):
-                    if bit:
-                        name = self._map.get(index, index)
+                    if bit and index in self._map:
+                        name = self._map.get(index)
                         self._native.add(name)
             else:
                 self._native = bits
@@ -2365,7 +2340,7 @@ class OctetBitString(Constructable, Castable, Primitive):
             ValueError - when an invalid value is passed
         """
 
-        if not isinstance(value, byte_cls):
+        if not isinstance(value, bytes):
             raise TypeError(unwrap(
                 '''
                 %s value must be a byte string, not %s
@@ -2435,7 +2410,7 @@ class OctetBitString(Constructable, Castable, Primitive):
             List with one tuple, consisting of a byte string and an integer (unused bits)
         """
 
-        unused_bits_len = ord(self.contents[0]) if _PY2 else self.contents[0]
+        unused_bits_len = self.contents[0]
         if not unused_bits_len:
             return [(self.contents[1:], ())]
 
@@ -2448,11 +2423,11 @@ class OctetBitString(Constructable, Castable, Primitive):
             raise ValueError('Bit string has {0} unused bits'.format(unused_bits_len))
 
         mask = (1 << unused_bits_len) - 1
-        last_byte = ord(self.contents[-1]) if _PY2 else self.contents[-1]
+        last_byte = self.contents[-1]
 
         # zero out the unused bits in the last byte.
         zeroed_byte = last_byte & ~mask
-        value = self.contents[1:-1] + (chr(zeroed_byte) if _PY2 else bytes((zeroed_byte,)))
+        value = self.contents[1:-1] + bytes((zeroed_byte,))
 
         unused_bits = _int_to_bit_tuple(last_byte & mask, unused_bits_len)
 
@@ -2505,7 +2480,7 @@ class IntegerBitString(_IntegerBitString, Constructable, Castable, Primitive):
             ValueError - when an invalid value is passed
         """
 
-        if not isinstance(value, int_types):
+        if not isinstance(value, int):
             raise TypeError(unwrap(
                 '''
                 %s value must be a positive integer, not %s
@@ -2570,7 +2545,7 @@ class OctetString(Constructable, Castable, Primitive):
             A byte string
         """
 
-        if not isinstance(value, byte_cls):
+        if not isinstance(value, bytes):
             raise TypeError(unwrap(
                 '''
                 %s value must be a byte string, not %s
@@ -2654,7 +2629,7 @@ class IntegerOctetString(Constructable, Castable, Primitive):
             ValueError - when an invalid value is passed
         """
 
-        if not isinstance(value, int_types):
+        if not isinstance(value, int):
             raise TypeError(unwrap(
                 '''
                 %s value must be a positive integer, not %s
@@ -2752,7 +2727,7 @@ class ParsableOctetString(Constructable, Castable, Primitive):
             A byte string
         """
 
-        if not isinstance(value, byte_cls):
+        if not isinstance(value, bytes):
             raise TypeError(unwrap(
                 '''
                 %s value must be a byte string, not %s
@@ -2904,7 +2879,7 @@ class ParsableOctetBitString(ParsableOctetString):
             ValueError - when an invalid value is passed
         """
 
-        if not isinstance(value, byte_cls):
+        if not isinstance(value, bytes):
             raise TypeError(unwrap(
                 '''
                 %s value must be a byte string, not %s
@@ -2934,7 +2909,7 @@ class ParsableOctetBitString(ParsableOctetString):
             A byte string
         """
 
-        unused_bits_len = ord(self.contents[0]) if _PY2 else self.contents[0]
+        unused_bits_len = self.contents[0]
         if unused_bits_len:
             raise ValueError('ParsableOctetBitString should have no unused bits')
 
@@ -3007,7 +2982,7 @@ class ObjectIdentifier(Primitive, ValueMap):
                 type_name(cls)
             ))
 
-        if not isinstance(value, str_cls):
+        if not isinstance(value, str):
             raise TypeError(unwrap(
                 '''
                 value must be a unicode string, not %s
@@ -3045,7 +3020,7 @@ class ObjectIdentifier(Primitive, ValueMap):
                 type_name(cls)
             ))
 
-        if not isinstance(value, str_cls):
+        if not isinstance(value, str):
             raise TypeError(unwrap(
                 '''
                 value must be a unicode string, not %s
@@ -3079,7 +3054,7 @@ class ObjectIdentifier(Primitive, ValueMap):
             ValueError - when an invalid value is passed
         """
 
-        if not isinstance(value, str_cls):
+        if not isinstance(value, str):
             raise TypeError(unwrap(
                 '''
                 %s value must be a unicode string, not %s
@@ -3153,24 +3128,22 @@ class ObjectIdentifier(Primitive, ValueMap):
 
             part = 0
             for byte in self.contents:
-                if _PY2:
-                    byte = ord(byte)
                 part = part * 128
                 part += byte & 127
                 # Last byte in subidentifier has the eighth bit set to 0
                 if byte & 0x80 == 0:
                     if len(output) == 0:
                         if part >= 80:
-                            output.append(str_cls(2))
-                            output.append(str_cls(part - 80))
+                            output.append(str(2))
+                            output.append(str(part - 80))
                         elif part >= 40:
-                            output.append(str_cls(1))
-                            output.append(str_cls(part - 40))
+                            output.append(str(1))
+                            output.append(str(part - 40))
                         else:
-                            output.append(str_cls(0))
-                            output.append(str_cls(part))
+                            output.append(str(0))
+                            output.append(str(part))
                     else:
-                        output.append(str_cls(part))
+                        output.append(str(part))
                     part = 0
 
             self._dotted = '.'.join(output)
@@ -3240,7 +3213,7 @@ class Enumerated(Integer):
             ValueError - when an invalid value is passed
         """
 
-        if not isinstance(value, int_types) and not isinstance(value, str_cls):
+        if not isinstance(value, int) and not isinstance(value, str):
             raise TypeError(unwrap(
                 '''
                 %s value must be an integer or a unicode string, not %s
@@ -3249,7 +3222,7 @@ class Enumerated(Integer):
                 type_name(value)
             ))
 
-        if isinstance(value, str_cls):
+        if isinstance(value, str):
             if value not in self._reverse_map:
                 raise ValueError(unwrap(
                     '''
@@ -3507,7 +3480,7 @@ class Sequence(Asn1Value):
         if self.children is None:
             self._parse_children()
 
-        if not isinstance(key, int_types):
+        if not isinstance(key, int):
             if key not in self._field_map:
                 raise KeyError(unwrap(
                     '''
@@ -3554,7 +3527,7 @@ class Sequence(Asn1Value):
         if self.children is None:
             self._parse_children()
 
-        if not isinstance(key, int_types):
+        if not isinstance(key, int):
             if key not in self._field_map:
                 raise KeyError(unwrap(
                     '''
@@ -3605,7 +3578,7 @@ class Sequence(Asn1Value):
         if self.children is None:
             self._parse_children()
 
-        if not isinstance(key, int_types):
+        if not isinstance(key, int):
             if key not in self._field_map:
                 raise KeyError(unwrap(
                     '''
@@ -4003,7 +3976,7 @@ class Sequence(Asn1Value):
             encoded using
         """
 
-        if not isinstance(field_name, str_cls):
+        if not isinstance(field_name, str):
             raise TypeError(unwrap(
                 '''
                 field_name must be a unicode string, not %s
@@ -4051,7 +4024,7 @@ class Sequence(Asn1Value):
                     try:
                         name = self._fields[index][0]
                     except (IndexError):
-                        name = str_cls(index)
+                        name = str(index)
                     self._native[name] = child.native
             except (ValueError, TypeError) as e:
                 self._native = None
@@ -4879,7 +4852,7 @@ class AbstractTime(AbstractString):
             A dict with the parsed values
         """
 
-        string = str_cls(self)
+        string = str(self)
 
         m = self._TIMESTRING_RE.match(string)
         if not m:
@@ -5018,8 +4991,6 @@ class UTCTime(AbstractTime):
                 raise ValueError('Year of the UTCTime is not in range [1950, 2049], use GeneralizedTime instead')
 
             value = value.strftime('%y%m%d%H%M%SZ')
-            if _PY2:
-                value = value.decode('ascii')
 
         AbstractString.set(self, value)
         # Set it to None and let the class take care of converting the next
@@ -5117,8 +5088,6 @@ class GeneralizedTime(AbstractTime):
                 fraction = ''
 
             value = value.strftime('%Y%m%d%H%M%S') + fraction + 'Z'
-            if _PY2:
-                value = value.decode('ascii')
 
         AbstractString.set(self, value)
         # Set it to None and let the class take care of converting the next
@@ -5340,7 +5309,7 @@ def _build_id_tuple(params, spec):
         else:
             required_class = 2
             required_tag = params['implicit']
-    if required_class is not None and not isinstance(required_class, int_types):
+    if required_class is not None and not isinstance(required_class, int):
         required_class = CLASS_NAME_TO_NUM_MAP[required_class]
 
     required_class = params.get('class_', required_class)

jc/parsers/asn1crypto/keys.py

@@ -20,7 +20,7 @@ import hashlib
 import math
 
 from ._errors import unwrap, APIException
-from ._types import type_name, byte_cls
+from ._types import type_name
 from .algos import _ForceNullParameters, DigestAlgorithm, EncryptionAlgorithm, RSAESOAEPParams, RSASSAPSSParams
 from .core import (
     Any,
@@ -582,7 +582,7 @@ class ECPrivateKey(Sequence):
             if self._key_size is None:
                 # Infer the key_size from the existing private key if possible
                 pkey_contents = self['private_key'].contents
-                if isinstance(pkey_contents, byte_cls) and len(pkey_contents) > 1:
+                if isinstance(pkey_contents, bytes) and len(pkey_contents) > 1:
                     self.set_key_size(len(self['private_key'].contents))
 
             elif self._key_size is not None:
@@ -744,7 +744,7 @@ class PrivateKeyInfo(Sequence):
             A PrivateKeyInfo object
         """
 
-        if not isinstance(private_key, byte_cls) and not isinstance(private_key, Asn1Value):
+        if not isinstance(private_key, bytes) and not isinstance(private_key, Asn1Value):
             raise TypeError(unwrap(
                 '''
                 private_key must be a byte string or Asn1Value, not %s
@@ -1112,7 +1112,7 @@ class PublicKeyInfo(Sequence):
             A PublicKeyInfo object
         """
 
-        if not isinstance(public_key, byte_cls) and not isinstance(public_key, Asn1Value):
+        if not isinstance(public_key, bytes) and not isinstance(public_key, Asn1Value):
             raise TypeError(unwrap(
                 '''
                 public_key must be a byte string or Asn1Value, not %s
@@ -1268,7 +1268,7 @@ class PublicKeyInfo(Sequence):
         """
 
         if self._sha1 is None:
-            self._sha1 = hashlib.sha1(byte_cls(self['public_key'])).digest()
+            self._sha1 = hashlib.sha1(bytes(self['public_key'])).digest()
         return self._sha1
 
     @property
@@ -1279,7 +1279,7 @@ class PublicKeyInfo(Sequence):
         """
 
         if self._sha256 is None:
-            self._sha256 = hashlib.sha256(byte_cls(self['public_key'])).digest()
+            self._sha256 = hashlib.sha256(bytes(self['public_key'])).digest()
         return self._sha256
 
     @property

jc/parsers/asn1crypto/parser.py

@@ -15,10 +15,9 @@ from __future__ import unicode_literals, division, absolute_import, print_functi
 
 import sys
 
-from ._types import byte_cls, chr_cls, type_name
+from ._types import chr_cls, type_name
 from .util import int_from_bytes, int_to_bytes
 
-_PY2 = sys.version_info <= (3,)
 _INSUFFICIENT_DATA_MESSAGE = 'Insufficient data - %s bytes requested but only %s available'
 _MAX_DEPTH = 10
 
@@ -66,7 +65,7 @@ def emit(class_, method, tag, contents):
     if tag < 0:
         raise ValueError('tag must be greater than zero, not %s' % tag)
 
-    if not isinstance(contents, byte_cls):
+    if not isinstance(contents, bytes):
         raise TypeError('contents must be a byte string, not %s' % type_name(contents))
 
     return _dump_header(class_, method, tag, contents) + contents
@@ -101,7 +100,7 @@ def parse(contents, strict=False):
          - 5: byte string trailer
     """
 
-    if not isinstance(contents, byte_cls):
+    if not isinstance(contents, bytes):
         raise TypeError('contents must be a byte string, not %s' % type_name(contents))
 
     contents_len = len(contents)
@@ -130,7 +129,7 @@ def peek(contents):
         An integer with the number of bytes occupied by the ASN.1 value
     """
 
-    if not isinstance(contents, byte_cls):
+    if not isinstance(contents, bytes):
         raise TypeError('contents must be a byte string, not %s' % type_name(contents))
 
     info, consumed = _parse(contents, len(contents))
@@ -171,7 +170,7 @@ def _parse(encoded_data, data_len, pointer=0, lengths_only=False, depth=0):
 
     if data_len < pointer + 1:
         raise ValueError(_INSUFFICIENT_DATA_MESSAGE % (1, data_len - pointer))
-    first_octet = ord(encoded_data[pointer]) if _PY2 else encoded_data[pointer]
+    first_octet = encoded_data[pointer]
 
     pointer += 1
 
@@ -183,7 +182,7 @@ def _parse(encoded_data, data_len, pointer=0, lengths_only=False, depth=0):
         while True:
             if data_len < pointer + 1:
                 raise ValueError(_INSUFFICIENT_DATA_MESSAGE % (1, data_len - pointer))
-            num = ord(encoded_data[pointer]) if _PY2 else encoded_data[pointer]
+            num = encoded_data[pointer]
             pointer += 1
             if num == 0x80 and tag == 0:
                 raise ValueError('Non-minimal tag encoding')
@@ -196,7 +195,7 @@ def _parse(encoded_data, data_len, pointer=0, lengths_only=False, depth=0):
 
     if data_len < pointer + 1:
         raise ValueError(_INSUFFICIENT_DATA_MESSAGE % (1, data_len - pointer))
-    length_octet = ord(encoded_data[pointer]) if _PY2 else encoded_data[pointer]
+    length_octet = encoded_data[pointer]
     pointer += 1
     trailer = b''
 

jc/parsers/asn1crypto/pem.py

@@ -11,17 +11,13 @@ Encoding DER to PEM and decoding PEM to DER. Exports the following items:
 
 from __future__ import unicode_literals, division, absolute_import, print_function
 
+from io import BytesIO
 import base64
 import re
-import sys
 
 from ._errors import unwrap
-from ._types import type_name as _type_name, str_cls, byte_cls
+from ._types import type_name as _type_name
 
-if sys.version_info < (3,):
-    from cStringIO import StringIO as BytesIO
-else:
-    from io import BytesIO
 
 
 def detect(byte_string):
@@ -36,7 +32,7 @@ def detect(byte_string):
         string
     """
 
-    if not isinstance(byte_string, byte_cls):
+    if not isinstance(byte_string, bytes):
         raise TypeError(unwrap(
             '''
             byte_string must be a byte string, not %s
@@ -67,14 +63,14 @@ def armor(type_name, der_bytes, headers=None):
         A byte string of the PEM block
     """
 
-    if not isinstance(der_bytes, byte_cls):
+    if not isinstance(der_bytes, bytes):
         raise TypeError(unwrap(
             '''
             der_bytes must be a byte string, not %s
             ''' % _type_name(der_bytes)
         ))
 
-    if not isinstance(type_name, str_cls):
+    if not isinstance(type_name, str):
         raise TypeError(unwrap(
             '''
             type_name must be a unicode string, not %s
@@ -127,7 +123,7 @@ def _unarmor(pem_bytes):
         in the form "Name: Value" that are right after the begin line.
     """
 
-    if not isinstance(pem_bytes, byte_cls):
+    if not isinstance(pem_bytes, bytes):
         raise TypeError(unwrap(
             '''
             pem_bytes must be a byte string, not %s

jc/parsers/asn1crypto/util.py

@@ -20,11 +20,11 @@ from __future__ import unicode_literals, division, absolute_import, print_functi
 
 import math
 import sys
-from datetime import datetime, date, timedelta, tzinfo
+from collections import OrderedDict
+from datetime import datetime, date, timedelta, timezone, tzinfo
 
 from ._errors import unwrap
 from ._iri import iri_to_uri, uri_to_iri  # noqa
-from ._ordereddict import OrderedDict  # noqa
 from ._types import type_name
 
 if sys.platform == 'win32':
@@ -33,230 +33,53 @@ else:
     from socket import inet_ntop, inet_pton  # noqa
 
 
-# Python 2
-if sys.version_info <= (3,):
 
-    def int_to_bytes(value, signed=False, width=None):
-        """
-        Converts an integer to a byte string
+def int_to_bytes(value, signed=False, width=None):
+    """
+    Converts an integer to a byte string
 
-        :param value:
-            The integer to convert
+    :param value:
+        The integer to convert
 
-        :param signed:
-            If the byte string should be encoded using two's complement
+    :param signed:
+        If the byte string should be encoded using two's complement
 
-        :param width:
-            If None, the minimal possible size (but at least 1),
-            otherwise an integer of the byte width for the return value
+    :param width:
+        If None, the minimal possible size (but at least 1),
+        otherwise an integer of the byte width for the return value
 
-        :return:
-            A byte string
-        """
+    :return:
+        A byte string
+    """
 
-        if value == 0 and width == 0:
-            return b''
-
-        # Handle negatives in two's complement
-        is_neg = False
-        if signed and value < 0:
-            is_neg = True
-            bits = int(math.ceil(len('%x' % abs(value)) / 2.0) * 8)
-            value = (value + (1 << bits)) % (1 << bits)
-
-        hex_str = '%x' % value
-        if len(hex_str) & 1:
-            hex_str = '0' + hex_str
-
-        output = hex_str.decode('hex')
-
-        if signed and not is_neg and ord(output[0:1]) & 0x80:
-            output = b'\x00' + output
-
-        if width is not None:
-            if len(output) > width:
-                raise OverflowError('int too big to convert')
-            if is_neg:
-                pad_char = b'\xFF'
-            else:
-                pad_char = b'\x00'
-            output = (pad_char * (width - len(output))) + output
-        elif is_neg and ord(output[0:1]) & 0x80 == 0:
-            output = b'\xFF' + output
-
-        return output
-
-    def int_from_bytes(value, signed=False):
-        """
-        Converts a byte string to an integer
-
-        :param value:
-            The byte string to convert
-
-        :param signed:
-            If the byte string should be interpreted using two's complement
-
-        :return:
-            An integer
-        """
-
-        if value == b'':
-            return 0
-
-        num = long(value.encode("hex"), 16)  # noqa
-
-        if not signed:
-            return num
-
-        # Check for sign bit and handle two's complement
-        if ord(value[0:1]) & 0x80:
-            bit_len = len(value) * 8
-            return num - (1 << bit_len)
-
-        return num
-
-    class timezone(tzinfo):  # noqa
-        """
-        Implements datetime.timezone for py2.
-        Only full minute offsets are supported.
-        DST is not supported.
-        """
-
-        def __init__(self, offset, name=None):
-            """
-            :param offset:
-                A timedelta with this timezone's offset from UTC
-
-            :param name:
-                Name of the timezone; if None, generate one.
-            """
-
-            if not timedelta(hours=-24) < offset < timedelta(hours=24):
-                raise ValueError('Offset must be in [-23:59, 23:59]')
-
-            if offset.seconds % 60 or offset.microseconds:
-                raise ValueError('Offset must be full minutes')
-
-            self._offset = offset
-
-            if name is not None:
-                self._name = name
-            elif not offset:
-                self._name = 'UTC'
-            else:
-                self._name = 'UTC' + _format_offset(offset)
-
-        def __eq__(self, other):
-            """
-            Compare two timezones
-
-            :param other:
-                The other timezone to compare to
-
-            :return:
-                A boolean
-            """
-
-            if type(other) != timezone:
-                return False
-            return self._offset == other._offset
-
-        def __getinitargs__(self):
-            """
-            Called by tzinfo.__reduce__ to support pickle and copy.
-
-            :return:
-                offset and name, to be used for __init__
-            """
-
-            return self._offset, self._name
-
-        def tzname(self, dt):
-            """
-            :param dt:
-                A datetime object; ignored.
-
-            :return:
-                Name of this timezone
-            """
-
-            return self._name
-
-        def utcoffset(self, dt):
-            """
-            :param dt:
-                A datetime object; ignored.
-
-            :return:
-                A timedelta object with the offset from UTC
-            """
-
-            return self._offset
-
-        def dst(self, dt):
-            """
-            :param dt:
-                A datetime object; ignored.
-
-            :return:
-                Zero timedelta
-            """
-
-            return timedelta(0)
-
-    timezone.utc = timezone(timedelta(0))
-
-# Python 3
-else:
-
-    from datetime import timezone  # noqa
-
-    def int_to_bytes(value, signed=False, width=None):
-        """
-        Converts an integer to a byte string
-
-        :param value:
-            The integer to convert
-
-        :param signed:
-            If the byte string should be encoded using two's complement
-
-        :param width:
-            If None, the minimal possible size (but at least 1),
-            otherwise an integer of the byte width for the return value
-
-        :return:
-            A byte string
-        """
-
-        if width is None:
-            if signed:
-                if value < 0:
-                    bits_required = abs(value + 1).bit_length()
-                else:
-                    bits_required = value.bit_length()
-                if bits_required % 8 == 0:
-                    bits_required += 1
+    if width is None:
+        if signed:
+            if value < 0:
+                bits_required = abs(value + 1).bit_length()
             else:
                 bits_required = value.bit_length()
-            width = math.ceil(bits_required / 8) or 1
-        return value.to_bytes(width, byteorder='big', signed=signed)
+            if bits_required % 8 == 0:
+                bits_required += 1
+        else:
+            bits_required = value.bit_length()
+        width = math.ceil(bits_required / 8) or 1
+    return value.to_bytes(width, byteorder='big', signed=signed)
 
-    def int_from_bytes(value, signed=False):
-        """
-        Converts a byte string to an integer
+def int_from_bytes(value, signed=False):
+    """
+    Converts a byte string to an integer
 
-        :param value:
-            The byte string to convert
+    :param value:
+        The byte string to convert
 
-        :param signed:
-            If the byte string should be interpreted using two's complement
+    :param signed:
+        If the byte string should be interpreted using two's complement
 
-        :return:
-            An integer
-        """
+    :return:
+        An integer
+    """
 
-        return int.from_bytes(value, 'big', signed=signed)
+    return int.from_bytes(value, 'big', signed=signed)
 
 
 def _format_offset(off):

jc/parsers/asn1crypto/x509.py

@@ -15,6 +15,7 @@ Other type classes are defined that help compose the types listed above.
 
 from __future__ import unicode_literals, division, absolute_import, print_function
 
+from collections import OrderedDict
 from contextlib import contextmanager
 from encodings import idna  # noqa
 import hashlib
@@ -26,8 +27,7 @@ import unicodedata
 
 from ._errors import unwrap
 from ._iri import iri_to_uri, uri_to_iri
-from ._ordereddict import OrderedDict
-from ._types import type_name, str_cls, bytes_to_list
+from ._types import type_name
 from .algos import AlgorithmIdentifier, AnyAlgorithmIdentifier, DigestAlgorithm, SignedDigestAlgorithm
 from .core import (
     Any,
@@ -100,7 +100,7 @@ class DNSName(IA5String):
             A unicode string
         """
 
-        if not isinstance(value, str_cls):
+        if not isinstance(value, str):
             raise TypeError(unwrap(
                 '''
                 %s value must be a unicode string, not %s
@@ -131,7 +131,7 @@ class URI(IA5String):
             A unicode string
         """
 
-        if not isinstance(value, str_cls):
+        if not isinstance(value, str):
             raise TypeError(unwrap(
                 '''
                 %s value must be a unicode string, not %s
@@ -215,7 +215,7 @@ class EmailAddress(IA5String):
             A unicode string
         """
 
-        if not isinstance(value, str_cls):
+        if not isinstance(value, str):
             raise TypeError(unwrap(
                 '''
                 %s value must be a unicode string, not %s
@@ -323,7 +323,7 @@ class IPAddress(OctetString):
             an IPv6 address or IPv6 address with CIDR
         """
 
-        if not isinstance(value, str_cls):
+        if not isinstance(value, str):
             raise TypeError(unwrap(
                 '''
                 %s value must be a unicode string, not %s
@@ -413,7 +413,7 @@ class IPAddress(OctetString):
             if cidr_int is not None:
                 cidr_bits = '{0:b}'.format(cidr_int)
                 cidr = len(cidr_bits.rstrip('0'))
-                value = value + '/' + str_cls(cidr)
+                value = value + '/' + str(cidr)
             self._native = value
         return self._native
 
@@ -2598,7 +2598,7 @@ class Certificate(Sequence):
         """
 
         if self._issuer_serial is None:
-            self._issuer_serial = self.issuer.sha256 + b':' + str_cls(self.serial_number).encode('ascii')
+            self._issuer_serial = self.issuer.sha256 + b':' + str(self.serial_number).encode('ascii')
         return self._issuer_serial
 
     @property
@@ -2647,7 +2647,7 @@ class Certificate(Sequence):
                 # We untag the element since it is tagged via being a choice from GeneralName
                 issuer = issuer.untag()
                 authority_serial = self.authority_key_identifier_value['authority_cert_serial_number'].native
-                self._authority_issuer_serial = issuer.sha256 + b':' + str_cls(authority_serial).encode('ascii')
+                self._authority_issuer_serial = issuer.sha256 + b':' + str(authority_serial).encode('ascii')
             else:
                 self._authority_issuer_serial = None
         return self._authority_issuer_serial
@@ -2860,7 +2860,7 @@ class Certificate(Sequence):
             with a space between each pair of characters, all uppercase
         """
 
-        return ' '.join('%02X' % c for c in bytes_to_list(self.sha1))
+        return ' '.join('%02X' % c for c in list(self.sha1))
 
     @property
     def sha256(self):
@@ -2882,7 +2882,7 @@ class Certificate(Sequence):
             with a space between each pair of characters, all uppercase
         """
 
-        return ' '.join('%02X' % c for c in bytes_to_list(self.sha256))
+        return ' '.join('%02X' % c for c in list(self.sha256))
 
     def is_valid_domain_ip(self, domain_ip):
         """
@@ -2896,7 +2896,7 @@ class Certificate(Sequence):
             A boolean - if the domain or IP is valid for the certificate
         """
 
-        if not isinstance(domain_ip, str_cls):
+        if not isinstance(domain_ip, str):
             raise TypeError(unwrap(
                 '''
                 domain_ip must be a unicode string, not %s

jc/parsers/crontab.py

@@ -198,7 +198,7 @@ def _process(proc_data):
 
         Dictionary. Structured data to conform to the schema.
     """
-    # put itmes in lists
+    # put items in lists
     try:
         for entry in proc_data['schedule']:
             entry['minute'] = entry['minute'].split(',')

jc/parsers/crontab_u.py

@@ -194,7 +194,7 @@ def _process(proc_data):
 
         Dictionary. Structured data to conform to the schema.
     """
-    # put itmes in lists
+    # put items in lists
     try:
         for entry in proc_data['schedule']:
             entry['minute'] = entry['minute'].split(',')

jc/parsers/debconf_show.py

@@ -0,0 +1,149 @@
+"""jc - JSON Convert `debconf-show` command output parser
+
+Usage (cli):
+
+    $ debconf-show onlyoffice-documentserver | jc --debconf-show
+
+or
+
+    $ jc debconf-show onlyoffice-documentserver
+
+Usage (module):
+
+    import jc
+    result = jc.parse('debconf_show', debconf_show_command_output)
+
+Schema:
+
+    [
+      {
+        "asked":              boolean,
+        "packagename":        string,
+        "name":               string,
+        "value":              string
+      }
+    ]
+
+Examples:
+
+    $ debconf-show onlyoffice-documentserver | jc --debconf-show -p
+    [
+      {
+        "asked": true,
+        "packagename": "onlyoffice",
+        "name": "jwt_secret",
+        "value": "aL8ei2iereuzee7cuJ6Cahjah1ixee2ah"
+      },
+      {
+        "asked": false,
+        "packagename": "onlyoffice",
+        "name": "db_pwd",
+        "value": "(password omitted)"
+      },
+      {
+        "asked": true,
+        "packagename": "onlyoffice",
+        "name": "rabbitmq_pwd",
+        "value": "(password omitted)"
+      },
+      {
+        "asked": true,
+        "packagename": "onlyoffice",
+        "name": "db_port",
+        "value": "5432"
+      },
+      {
+        "asked": true,
+        "packagename": "onlyoffice",
+        "name": "db_user",
+        "value": "onlyoffice"
+      },
+      {
+        "asked": true,
+        "packagename": "onlyoffice",
+        "name": "rabbitmq_proto",
+        "value": "amqp"
+      },
+      {
+        "asked": true,
+        "packagename": "onlyoffice",
+        "name": "cluster_mode",
+        "value": "false"
+      }
+    ]
+"""
+from typing import List, Dict
+from jc.jc_types import JSONDictType
+import jc.utils
+
+
+class info():
+    """Provides parser metadata (version, author, etc.)"""
+    version = '1.0'
+    description = '`debconf-show` command parser'
+    author = 'Kelly Brazil'
+    author_email = 'kellyjonbrazil@gmail.com'
+    compatible = ['linux']
+    tags = ['command']
+    magic_commands = ['debconf-show']
+
+
+__version__ = info.version
+
+
+def _process(proc_data: JSONDictType) -> List[JSONDictType]:
+    """
+    Final processing to conform to the schema.
+
+    Parameters:
+
+        proc_data:   (Dictionary) raw structured data to process
+
+    Returns:
+
+        List of Dictionaries. Structured to conform to the schema.
+    """
+    return proc_data
+
+
+def parse(
+    data: str,
+    raw: bool = False,
+    quiet: bool = False
+) -> List[JSONDictType]:
+    """
+    Main text parsing function
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) unprocessed output if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        List of Dictionaries. Raw or processed structured data.
+    """
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
+
+    raw_output: List = []
+
+    if jc.utils.has_data(data):
+
+        for line in filter(None, data.splitlines()):
+            output_line: Dict = {}
+            splitline = line.split(':', maxsplit=1)
+
+            output_line['asked'] = splitline[0].startswith('*')
+            packagename, key = splitline[0].split('/', maxsplit=1)
+            packagename = packagename[2:]
+            key = key.replace('-', '_')
+            val = splitline[1].strip()
+            output_line['packagename'] = packagename
+            output_line['name'] = key
+            output_line['value'] = val
+
+            raw_output.append(output_line)
+
+    return raw_output if raw else _process(raw_output)

jc/parsers/env.py

@@ -67,12 +67,13 @@ Examples:
       "_": "/usr/bin/env"
     }
 """
+import re
 import jc.utils
 
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.4'
+    version = '1.5'
     description = '`env` command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -83,6 +84,7 @@ class info():
 
 __version__ = info.version
 
+VAR_DEF_PATTERN = re.compile(r'^[a-zA-Z_][a-zA-Z0-9_]*=\S*.*$')
 
 def _process(proc_data):
     """
@@ -96,8 +98,6 @@ def _process(proc_data):
 
         List of Dictionaries. Structured data to conform to the schema.
     """
-
-    # rebuild output for added semantic information
     processed = []
     for k, v in proc_data.items():
         proc_line = {}
@@ -120,24 +120,29 @@ def parse(data, raw=False, quiet=False):
 
     Returns:
 
-        Dictionary of raw structured data or
-        List of Dictionaries of processed structured data
+        Dictionary of raw structured data or (default)
+        List of Dictionaries of processed structured data (raw)
     """
     jc.utils.compatibility(__name__, info.compatible, quiet)
     jc.utils.input_type_check(data)
 
     raw_output = {}
-
-    # Clear any blank lines
-    cleandata = list(filter(None, data.splitlines()))
+    key = ''
+    value = None
 
     if jc.utils.has_data(data):
+        for line in data.splitlines():
+            if VAR_DEF_PATTERN.match(line):
+                if not value is None:
+                    raw_output[key] = value
+                key, value = line.split('=', maxsplit=1)
+                continue
 
-        for entry in cleandata:
-            parsed_line = entry.split('=', maxsplit=1)
-            raw_output[parsed_line[0]] = parsed_line[1]
+            if not value is None:
+                value = value + '\n' + line
+
+    if not value is None:
+        raw_output[key] = value
+
+    return raw_output if raw else _process(raw_output)
 
-    if raw:
-        return raw_output
-    else:
-        return _process(raw_output)

jc/parsers/host.py

@@ -0,0 +1,243 @@
+"""jc - JSON Convert `host` command output parser
+
+Supports parsing of the most commonly used RR types (A, AAAA, MX, TXT)
+
+Usage (cli):
+
+    $ host google.com | jc --host
+
+or
+
+    $ jc host google.com
+
+Usage (module):
+
+    import jc
+    result = jc.parse('host', host_command_output)
+
+Schema:
+
+    [
+      {
+        "hostname":     string,
+        "address": [
+                        string
+        ],
+        "v6-address": [
+                        string
+        ],
+        "mail": [
+                        string
+        ]
+      }
+    ]
+
+    [
+      {
+        "nameserver":   string,
+        "zone":         string,
+        "mname":        string,
+        "rname":        string,
+        "serial":       integer,
+        "refresh":      integer,
+        "retry":        integer,
+        "expire":       integer,
+        "minimum":      integer
+      }
+    ]
+
+Examples:
+
+    $ host google.com | jc --host
+    [
+      {
+        "hostname": "google.com",
+        "address": [
+          "142.251.39.110"
+        ],
+        "v6-address": [
+          "2a00:1450:400e:811::200e"
+        ],
+        "mail": [
+          "smtp.google.com."
+        ]
+      }
+    ]
+
+    $ jc host -C sunet.se
+    [
+      {
+        "nameserver": "2001:6b0:7::2",
+        "zone": "sunet.se",
+        "mname": "sunic.sunet.se.",
+        "rname": "hostmaster.sunet.se.",
+        "serial": "2023090401",
+        "refresh": "28800",
+        "retry": "7200",
+        "expire": "604800",
+        "minimum": "300"
+      },
+      {
+        ...
+      }
+    ]
+"""
+from typing import Dict, List
+import jc.utils
+
+
+class info():
+    """Provides parser metadata (version, author, etc.)"""
+    version = '1.0'
+    description = '`host` command parser'
+    author = 'Pettai'
+    author_email = 'pettai@sunet.se'
+    compatible = ['linux', 'darwin', 'cygwin', 'win32', 'aix', 'freebsd']
+    tags = ['command']
+    magic_commands = ['host']
+
+
+__version__ = info.version
+
+
+def _process(proc_data):
+    """
+    Final processing to conform to the schema.
+
+    Parameters:
+
+        proc_data:   (List of Dictionaries) raw structured data to process
+
+    Returns:
+
+        List of Dictionaries. Structured to conform to the schema.
+    """
+
+    int_list = {'serial', 'refresh', 'retry', 'expire', 'minimum'}
+
+    for entry in proc_data:
+        for key in entry:
+            if key in int_list:
+                entry[key] = jc.utils.convert_to_int(entry[key])
+
+    return proc_data
+
+
+def parse(data: str, raw: bool = False, quiet: bool = False):
+    """
+    Main text parsing function
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) unprocessed output if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        List of Dictionaries. Raw or processed structured data.
+    """
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
+
+    raw_output: List[Dict] = []
+
+    warned = False
+
+    if jc.utils.has_data(data):
+
+        addresses = []
+        v6addresses = []
+        mail = []
+        text = []
+        rrdata = {}
+        soaparse = False
+
+        for line in filter(None, data.splitlines()):
+            line = line.strip()
+
+            # default
+            if ' has address ' in line:
+                linedata = line.split(' ', maxsplit=3)
+                hostname = linedata[0]
+                address = linedata[3]
+                addresses.append(address)
+                rrdata.update({'hostname': hostname})
+                rrdata.update({'address': addresses})
+                continue
+
+            if ' has IPv6 address ' in line:
+                linedata = line.split(' ', maxsplit=4)
+                hostname = linedata[0]
+                v6address = linedata[4]
+                v6addresses.append(v6address)
+                rrdata.update({'hostname': hostname})
+                rrdata.update({'v6-address': v6addresses})
+                continue
+
+            if ' mail is handled by ' in line:
+                linedata = line.split(' ', maxsplit=6)
+                hostname = linedata[0]
+                mx = linedata[6]
+                mail.append(mx)
+                rrdata.update({'hostname': hostname})
+                rrdata.update({'mail': mail})
+                continue
+
+
+            # TXT parsing
+            if ' descriptive text ' in line:
+                linedata = line.split('descriptive text "', maxsplit=1)
+                hostname = linedata[0]
+                txt = linedata[1].strip('"')
+                text.append(txt)
+                rrdata.update({'hostname': hostname})
+                rrdata.update({'text': text})
+                continue
+
+
+            # -C / SOA parsing
+            if line.startswith('Nameserver '):
+                soaparse = True
+                rrdata = {}
+                linedata = line.split(' ', maxsplit=1)
+                nameserverip = linedata[1].rstrip(':')
+                rrdata.update({'nameserver': nameserverip})
+                continue
+
+            if ' has SOA record ' in line:
+                linedata = line.split(' ', maxsplit=10)
+
+                zone = linedata[0]
+                mname = linedata[4]
+                rname = linedata[5]
+                serial = linedata[6]
+                refresh = linedata[7]
+                retry = linedata[8]
+                expire = linedata[9]
+                minimum = linedata[10]
+
+                try:
+                    rrdata.update(
+                        {
+                            'zone': zone,
+                            'mname': mname,
+                            'rname': rname,
+                            'serial': serial,
+                            'refresh': refresh,
+                            'retry': retry,
+                            'expire': expire,
+                            'minimum': minimum 
+                        },
+                    )
+                    raw_output.append(rrdata)
+
+                except IndexError:
+                    if not warned:
+                        jc.utils.warning_message(['Unknown format detected.'])
+                        warned = True
+
+        if not soaparse:
+            raw_output.append(rrdata)
+
+    return raw_output if raw else _process(raw_output)

jc/parsers/iftop.py

@@ -0,0 +1,689 @@
+"""jc - JSON Convert `iftop` command output parser
+
+Usage (cli):
+
+    $ iftop -i <device> -t -B -s1 | jc --iftop
+
+Usage (module):
+
+    import jc
+    result = jc.parse('iftop', iftop_command_output)
+
+Schema:
+
+    [
+      {
+        "device":                   string,
+        "ip_address":               string,
+        "mac_address":              string,
+        "clients": [
+          {
+            "index":                integer,
+            "connections": [
+              {
+                "host_name":        string,
+                "host_port":        string,   # can be service or missing
+                "last_2s":          integer,
+                "last_10s":         integer,
+                "last_40s":         integer,
+                "cumulative":       integer,
+                "direction":        string
+              }
+            ]
+          }
+        ]
+        "total_send_rate": {
+          "last_2s":                integer,
+          "last_10s":               integer,
+          "last_40s":               integer
+        }
+        "total_receive_rate": {
+          "last_2s":                integer,
+          "last_10s":               integer,
+          "last_40s":               integer
+        }
+        "total_send_and_receive_rate": {
+          "last_2s":                integer,
+          "last_10s":               integer,
+          "last_40s":               integer
+        }
+        "peak_rate": {
+          "last_2s":                integer,
+          "last_10s":               integer,
+          "last_40s":               integer
+        }
+        "cumulative_rate": {
+          "last_2s":                integer,
+          "last_10s":               integer,
+          "last_40s":               integer
+        }
+      }
+    ]
+
+Examples:
+
+    $ iftop -i enp0s3 -t -P -s1 | jc --iftop -p
+    [
+      {
+        "device": "enp0s3",
+        "ip_address": "10.10.15.129",
+        "mac_address": "08:00:27:c0:4a:4f",
+        "clients": [
+          {
+            "index": 1,
+            "connections": [
+              {
+                "host_name": "ubuntu-2004-clean-01",
+                "host_port": "ssh",
+                "last_2s": 448,
+                "last_10s": 448,
+                "last_40s": 448,
+                "cumulative": 112,
+                "direction": "send"
+              },
+              {
+                "host_name": "10.10.15.72",
+                "host_port": "40876",
+                "last_2s": 208,
+                "last_10s": 208,
+                "last_40s": 208,
+                "cumulative": 52,
+                "direction": "receive"
+              }
+            ]
+          }
+        ],
+        "total_send_rate": {
+          "last_2s": 448,
+          "last_10s": 448,
+          "last_40s": 448
+        },
+        "total_receive_rate": {
+          "last_2s": 208,
+          "last_10s": 208,
+          "last_40s": 208
+        },
+        "total_send_and_receive_rate": {
+          "last_2s": 656,
+          "last_10s": 656,
+          "last_40s": 656
+        },
+        "peak_rate": {
+          "last_2s": 448,
+          "last_10s": 208,
+          "last_40s": 656
+        },
+        "cumulative_rate": {
+          "last_2s": 112,
+          "last_10s": 52,
+          "last_40s": 164
+        }
+      }
+    ]
+
+    $ iftop -i enp0s3 -t -P -s1 | jc --iftop -p -r
+    [
+      {
+        "device": "enp0s3",
+        "ip_address": "10.10.15.129",
+        "mac_address": "11:22:33:44:55:66",
+        "clients": [
+          {
+            "index": 1,
+            "connections": [
+              {
+                "host_name": "ubuntu-2004-clean-01",
+                "host_port": "ssh",
+                "last_2s": "448b",
+                "last_10s": "448b",
+                "last_40s": "448b",
+                "cumulative": "112B",
+                "direction": "send"
+              },
+              {
+                "host_name": "10.10.15.72",
+                "host_port": "40876",
+                "last_2s": "208b",
+                "last_10s": "208b",
+                "last_40s": "208b",
+                "cumulative": "52B",
+                "direction": "receive"
+              }
+            ]
+          }
+        ],
+        "total_send_rate": {
+          "last_2s": "448b",
+          "last_10s": "448b",
+          "last_40s": "448b"
+        },
+        "total_receive_rate": {
+          "last_2s": "208b",
+          "last_10s": "208b",
+          "last_40s": "208b"
+        },
+        "total_send_and_receive_rate": {
+          "last_2s": "656b",
+          "last_10s": "656b",
+          "last_40s": "656b"
+        },
+        "peak_rate": {
+          "last_2s": "448b",
+          "last_10s": "208b",
+          "last_40s": "656b"
+        },
+        "cumulative_rate": {
+          "last_2s": "112B",
+          "last_10s": "52B",
+          "last_40s": "164B"
+        }
+      }
+    ]
+"""
+import re
+from typing import List, Dict
+from jc.jc_types import JSONDictType
+import jc.utils
+from collections import namedtuple
+from numbers import Number
+
+
+class info:
+    """Provides parser metadata (version, author, etc.)"""
+    version = "1.0"
+    description = "`iftop` command parser"
+    author = "Ron Green"
+    author_email = "11993626+georgettica@users.noreply.github.com"
+    compatible = ["linux"]
+    tags = ["command"]
+
+
+__version__ = info.version
+
+
+def _process(proc_data: List[JSONDictType], quiet: bool = False) -> List[JSONDictType]:
+    """
+    Final processing to conform to the schema.
+
+    Parameters:
+
+        proc_data:   (List of Dictionaries) raw structured data to process
+
+    Returns:
+
+        List of Dictionaries. Structured to conform to the schema.
+    """
+    string_to_bytes_fields = ["last_2s", "last_10s", "last_40s", "cumulative"]
+    one_nesting = [
+        "total_send_rate",
+        "total_receive_rate",
+        "total_send_and_receive_rate",
+        "peak_rate",
+        "cumulative_rate",
+    ]
+
+    if not proc_data:
+        return proc_data
+    for entry in proc_data:
+        # print(f"{entry=}")
+        for entry_key in entry:
+            # print(f"{entry_key=}")
+            if entry_key in one_nesting:
+                # print(f"{entry[entry_key]=}")
+                for one_nesting_item_key in entry[entry_key]:
+                    # print(f"{one_nesting_item_key=}")
+                    if one_nesting_item_key in string_to_bytes_fields:
+                        entry[entry_key][one_nesting_item_key] = _parse_size(entry[entry_key][one_nesting_item_key])
+            elif entry_key == "clients":
+                for client in entry[entry_key]:
+                    # print(f"{client=}")
+                    if "connections" not in client:
+                        continue
+                    for connection in client["connections"]:
+                        # print(f"{connection=}")
+                        for connection_key in connection:
+                            # print(f"{connection_key=}")
+                            if connection_key in string_to_bytes_fields:
+                                connection[connection_key] = _parse_size(connection[connection_key])
+    return proc_data
+
+# _parse_size from https://github.com/xolox/python-humanfriendly
+
+# Copyright (c) 2021 Peter Odding
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# Note: this function can be replaced with jc.utils.convert_size_to_int
+#       in the future.
+def _parse_size(size, binary=False):
+    """
+    Parse a human readable data size and return the number of bytes.
+
+    :param size: The human readable file size to parse (a string).
+    :param binary: :data:`True` to use binary multiples of bytes (base-2) for
+                   ambiguous unit symbols and names, :data:`False` to use
+                   decimal multiples of bytes (base-10).
+    :returns: The corresponding size in bytes (an integer).
+    :raises: :exc:`InvalidSize` when the input can't be parsed.
+
+    This function knows how to parse sizes in bytes, kilobytes, megabytes,
+    gigabytes, terabytes and petabytes. Some examples:
+
+    >>> from humanfriendly import parse_size
+    >>> parse_size('42')
+    42
+    >>> parse_size('13b')
+    13
+    >>> parse_size('5 bytes')
+    5
+    >>> parse_size('1 KB')
+    1000
+    >>> parse_size('1 kilobyte')
+    1000
+    >>> parse_size('1 KiB')
+    1024
+    >>> parse_size('1 KB', binary=True)
+    1024
+    >>> parse_size('1.5 GB')
+    1500000000
+    >>> parse_size('1.5 GB', binary=True)
+    1610612736
+    """
+    def tokenize(text):
+        tokenized_input = []
+        for token in re.split(r'(\d+(?:\.\d+)?)', text):
+            token = token.strip()
+            if re.match(r'\d+\.\d+', token):
+                tokenized_input.append(float(token))
+            elif token.isdigit():
+                tokenized_input.append(int(token))
+            elif token:
+                tokenized_input.append(token)
+        return tokenized_input
+
+    SizeUnit = namedtuple('SizeUnit', 'divider, symbol, name')
+    CombinedUnit = namedtuple('CombinedUnit', 'decimal, binary')
+    disk_size_units = (
+        CombinedUnit(SizeUnit(1000**1, 'KB', 'kilobyte'), SizeUnit(1024**1, 'KiB', 'kibibyte')),
+        CombinedUnit(SizeUnit(1000**2, 'MB', 'megabyte'), SizeUnit(1024**2, 'MiB', 'mebibyte')),
+        CombinedUnit(SizeUnit(1000**3, 'GB', 'gigabyte'), SizeUnit(1024**3, 'GiB', 'gibibyte')),
+        CombinedUnit(SizeUnit(1000**4, 'TB', 'terabyte'), SizeUnit(1024**4, 'TiB', 'tebibyte')),
+        CombinedUnit(SizeUnit(1000**5, 'PB', 'petabyte'), SizeUnit(1024**5, 'PiB', 'pebibyte')),
+        CombinedUnit(SizeUnit(1000**6, 'EB', 'exabyte'), SizeUnit(1024**6, 'EiB', 'exbibyte')),
+        CombinedUnit(SizeUnit(1000**7, 'ZB', 'zettabyte'), SizeUnit(1024**7, 'ZiB', 'zebibyte')),
+        CombinedUnit(SizeUnit(1000**8, 'YB', 'yottabyte'), SizeUnit(1024**8, 'YiB', 'yobibyte')),
+    )
+    tokens = tokenize(size)
+    if tokens and isinstance(tokens[0], Number):
+        # Get the normalized unit (if any) from the tokenized input.
+        normalized_unit = tokens[1].lower() if len(tokens) == 2 and isinstance(tokens[1], str) else ''
+        # If the input contains only a number, it's assumed to be the number of
+        # bytes. The second token can also explicitly reference the unit bytes.
+        if len(tokens) == 1 or normalized_unit.startswith('b'):
+            return int(tokens[0])
+        # Otherwise we expect two tokens: A number and a unit.
+        if normalized_unit:
+            # Convert plural units to singular units, for details:
+            # https://github.com/xolox/python-humanfriendly/issues/26
+            normalized_unit = normalized_unit.rstrip('s')
+            for unit in disk_size_units:
+                # First we check for unambiguous symbols (KiB, MiB, GiB, etc)
+                # and names (kibibyte, mebibyte, gibibyte, etc) because their
+                # handling is always the same.
+                if normalized_unit in (unit.binary.symbol.lower(), unit.binary.name.lower()):
+                    return int(tokens[0] * unit.binary.divider)
+                # Now we will deal with ambiguous prefixes (K, M, G, etc),
+                # symbols (KB, MB, GB, etc) and names (kilobyte, megabyte,
+                # gigabyte, etc) according to the caller's preference.
+                if (normalized_unit in (unit.decimal.symbol.lower(), unit.decimal.name.lower()) or
+                        normalized_unit.startswith(unit.decimal.symbol[0].lower())):
+                    return int(tokens[0] * (unit.binary.divider if binary else unit.decimal.divider))
+    # We failed to parse the size specification.
+    return None
+
+
+def parse(data: str, raw: bool = False, quiet: bool = False) -> List[JSONDictType]:
+    """
+    Main text parsing function
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) unprocessed output if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        List of Dictionaries. Raw or processed structured data.
+    """
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
+
+    raw_output: List[Dict] = []
+    interface_item: Dict = {}
+    current_client: Dict = {}
+    clients: List = []
+    is_previous_line_interface = False
+    saw_already_host_line = False
+
+    before_arrow = r"\s+(?P<index>\d+)\s+(?P<host_name>[^\s]+):(?P<host_port>[^\s]+)\s+"
+    before_arrow_no_port = r"\s+(?P<index>\d+)\s+(?P<host_name>[^\s]+)\s+"
+    after_arrow_before_newline = r"\s+(?P<send_last_2s>[^\s]+)\s+(?P<send_last_10s>[^\s]+)\s+(?P<send_last_40s>[^\s]+)\s+(?P<send_cumulative>[^\s]+)"
+    newline_before_arrow = r"\s+(?P<receive_ip>.+):(?P<receive_port>\w+)\s+"
+    newline_before_arrow_no_port = r"\s+(?P<receive_ip>.+)\s+"
+    after_arrow_till_end = r"\s+(?P<receive_last_2s>[^\s]+)\s+(?P<receive_last_10s>[^\s]+)\s+(?P<receive_last_40s>[^\s]+)\s+(?P<receive_cumulative>[^\s]+)"
+    re_linux_clients_before_newline = re.compile(
+        rf"{before_arrow}=>{after_arrow_before_newline}"
+    )
+    re_linux_clients_before_newline_no_port = re.compile(
+        rf"{before_arrow_no_port}=>{after_arrow_before_newline}"
+    )
+    re_linux_clients_after_newline_no_port = re.compile(
+        rf"{newline_before_arrow_no_port}<={after_arrow_till_end}"
+    )
+
+    re_linux_clients_after_newline = re.compile(
+        rf"{newline_before_arrow}<={after_arrow_till_end}"
+    )
+
+    re_total_send_rate = re.compile(
+        r"Total send rate:\s+(?P<total_send_rate_last_2s>[^\s]+)\s+(?P<total_send_rate_last_10s>[^\s]+)\s+(?P<total_send_rate_last_40s>[^\s]+)"
+    )
+    re_total_receive_rate = re.compile(
+        r"Total receive rate:\s+(?P<total_receive_rate_last_2s>[^\s]+)\s+(?P<total_receive_rate_last_10s>[^\s]+)\s+(?P<total_receive_rate_last_40s>[^\s]+)"
+    )
+    re_total_send_and_receive_rate = re.compile(
+        r"Total send and receive rate:\s+(?P<total_send_and_receive_rate_last_2s>[^\s]+)\s+(?P<total_send_and_receive_rate_last_10s>[^\s]+)\s+(?P<total_send_and_receive_rate_last_40s>[^\s]+)"
+    )
+    re_peak_rate = re.compile(
+        r"Peak rate \(sent/received/total\):\s+(?P<peak_rate_sent>[^\s]+)\s+(?P<peak_rate_received>[^\s]+)\s+(?P<peak_rate_total>[^\s]+)"
+    )
+    re_cumulative_rate = re.compile(
+        r"Cumulative \(sent/received/total\):\s+(?P<cumulative_rate_sent>[^\s]+)\s+(?P<cumulative_rate_received>[^\s]+)\s+(?P<cumulative_rate_total>[^\s]+)"
+    )
+
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
+
+    if not jc.utils.has_data(data):
+        return raw_output if raw else _process(raw_output, quiet=quiet)
+
+    for line in filter(None, data.splitlines()):
+        if line.startswith("interface:"):
+            # Example:
+            # interface: enp0s3
+            interface_item["device"] = line.split(":")[1].strip()
+
+        elif line.startswith("IP address is:"):
+            # Example:
+            # IP address is: 10.10.15.129
+            interface_item["ip_address"] = line.split(":")[1].strip()
+
+        elif line.startswith("MAC address is:"):
+            # Example:
+            # MAC address is: 08:00:27:c0:4a:4f
+            # strip off the "MAC address is: " part
+            data_without_front_list = line.split(":")[1:]
+
+            # join the remaining parts back together
+            data_without_front = ":".join(data_without_front_list)
+            interface_item["mac_address"] = data_without_front.strip()
+
+        elif line.startswith("Listening on"):
+            # Example:
+            # Listening on enp0s3
+            pass
+
+        elif (
+            line.startswith("# Host name (port/service if enabled)")
+            and not saw_already_host_line
+        ):
+            saw_already_host_line = True
+            # Example:
+            #    # Host name (port/service if enabled)            last 2s   last 10s   last 40s cumulative
+            pass
+
+        elif (
+            line.startswith("# Host name (port/service if enabled)")
+            and saw_already_host_line
+        ):
+            old_interface_item, interface_item = interface_item, {}
+            interface_item.update(
+                {
+                    "device": old_interface_item["device"],
+                    "ip_address": old_interface_item["ip_address"],
+                    "mac_address": old_interface_item["mac_address"],
+                }
+            )
+
+        elif "=>" in line and is_previous_line_interface and ":" in line:
+            # should not happen
+            pass
+
+        elif "=>" in line and not is_previous_line_interface and ":" in line:
+            # Example:
+            #    1 ubuntu-2004-clean-01:ssh                 =>       448b       448b       448b       112B
+            is_previous_line_interface = True
+            match_raw = re_linux_clients_before_newline.match(line)
+
+            if not match_raw:
+                # this is a bug in iftop
+                continue
+
+            match_dict = match_raw.groupdict()
+            current_client = {}
+            current_client["index"] = int(match_dict["index"])
+            current_client["connections"] = []
+            current_client_send = {
+                "host_name": match_dict["host_name"],
+                "host_port": match_dict["host_port"],
+                "last_2s": match_dict["send_last_2s"],
+                "last_10s": match_dict["send_last_10s"],
+                "last_40s": match_dict["send_last_40s"],
+                "cumulative": match_dict["send_cumulative"],
+                "direction": "send",
+            }
+            current_client["connections"].append(current_client_send)
+            # not adding yet as the receive part is not yet parsed
+
+        elif "=>" in line and not is_previous_line_interface and ":" not in line:
+            # should not happen
+            pass
+
+        elif "=>" in line and is_previous_line_interface and ":" not in line:
+            is_previous_line_interface = True
+            match_raw = re_linux_clients_before_newline_no_port.match(line)
+
+            if not match_raw:
+                # this is a bug in iftop
+                continue
+
+            match_dict = match_raw.groupdict()
+            current_client = {}
+            current_client["index"] = int(match_dict["index"])
+            current_client["connections"] = []
+            current_client_send = {
+                "host_name": match_dict["host_name"],
+                "last_2s": match_dict["send_last_2s"],
+                "last_10s": match_dict["send_last_10s"],
+                "last_40s": match_dict["send_last_40s"],
+                "cumulative": match_dict["send_cumulative"],
+                "direction": "send",
+            }
+            current_client["connections"].append(current_client_send)
+            # not adding yet as the receive part is not yet parsed
+
+        elif "<=" in line and not is_previous_line_interface and ":" in line:
+            # should not happen
+            pass
+
+        elif "<=" in line and is_previous_line_interface and ":" in line:
+            # Example:
+            #      10.10.15.72:40876                        <=       208b       208b       208b        52B
+            is_previous_line_interface = False
+            match_raw = re_linux_clients_after_newline.match(line)
+
+            if not match_raw:
+                # this is a bug in iftop
+                continue
+
+            match_dict = match_raw.groupdict()
+            current_client_receive = {
+                "host_name": match_dict["receive_ip"],
+                "host_port": match_dict["receive_port"],
+                "last_2s": match_dict["receive_last_2s"],
+                "last_10s": match_dict["receive_last_10s"],
+                "last_40s": match_dict["receive_last_40s"],
+                "cumulative": match_dict["receive_cumulative"],
+                "direction": "receive",
+            }
+
+            current_client["connections"].append(current_client_receive)
+            clients.append(current_client)
+
+        elif "<=" in line and not is_previous_line_interface and ":" not in line:
+            # should not happen
+            pass
+
+        elif "<=" in line and is_previous_line_interface and ":" not in line:
+            # Example:
+            #      10.10.15.72:40876                        <=       208b       208b       208b        52B
+            is_previous_line_interface = False
+            match_raw = re_linux_clients_after_newline_no_port.match(line)
+
+            if not match_raw:
+                # this is a bug in iftop
+                continue
+
+            match_dict = match_raw.groupdict()
+            current_client_receive = {
+                "host_name": match_dict["receive_ip"],
+                "last_2s": match_dict["receive_last_2s"],
+                "last_10s": match_dict["receive_last_10s"],
+                "last_40s": match_dict["receive_last_40s"],
+                "cumulative": match_dict["receive_cumulative"],
+                "direction": "receive",
+            }
+
+            current_client["connections"].append(current_client_receive)
+            clients.append(current_client)
+
+        # check if all of the characters are dashes or equal signs
+        elif all(c == "-" for c in line):
+            pass
+
+        elif line.startswith("Total send rate"):
+            # Example:
+            # Total send rate:                                       448b       448b       448b
+            match_raw = re_total_send_rate.match(line)
+
+            if not match_raw:
+                # this is a bug in iftop
+                continue
+
+            match_dict = match_raw.groupdict()
+            interface_item["total_send_rate"] = {}
+            interface_item["total_send_rate"].update(
+                {
+                    "last_2s": match_dict["total_send_rate_last_2s"],
+                    "last_10s": match_dict["total_send_rate_last_10s"],
+                    "last_40s": match_dict["total_send_rate_last_40s"],
+                }
+            )
+
+        elif line.startswith("Total receive rate"):
+            # Example:
+            # Total receive rate:                                    208b       208b       208b
+            match_raw = re_total_receive_rate.match(line)
+
+            if not match_raw:
+                # this is a bug in iftop
+                continue
+
+            match_dict = match_raw.groupdict()
+            interface_item["total_receive_rate"] = {}
+            interface_item["total_receive_rate"].update(
+                {
+                    "last_2s": match_dict["total_receive_rate_last_2s"],
+                    "last_10s": match_dict["total_receive_rate_last_10s"],
+                    "last_40s": match_dict["total_receive_rate_last_40s"],
+                }
+            )
+
+        elif line.startswith("Total send and receive rate"):
+            # Example:
+            # Total send and receive rate:                           656b       656b       656b
+            match_raw = re_total_send_and_receive_rate.match(line)
+
+            if not match_raw:
+                # this is a bug in iftop
+                continue
+
+            match_dict = match_raw.groupdict()
+            interface_item["total_send_and_receive_rate"] = {}
+            interface_item["total_send_and_receive_rate"].update(
+                {
+                    "last_2s": match_dict["total_send_and_receive_rate_last_2s"],
+                    "last_10s": match_dict["total_send_and_receive_rate_last_10s"],
+                    "last_40s": match_dict["total_send_and_receive_rate_last_40s"],
+                }
+            )
+
+        elif line.startswith("Peak rate"):
+            match_raw = re_peak_rate.match(line)
+
+            if not match_raw:
+                # this is a bug in iftop
+                continue
+
+            match_dict = match_raw.groupdict()
+            interface_item["peak_rate"] = {}
+            interface_item["peak_rate"].update(
+                {
+                    "last_2s": match_dict["peak_rate_sent"],
+                    "last_10s": match_dict["peak_rate_received"],
+                    "last_40s": match_dict["peak_rate_total"],
+                }
+            )
+
+        elif line.startswith("Cumulative"):
+            match_raw = re_cumulative_rate.match(line)
+
+            if not match_raw:
+                # this is a bug in iftop
+                continue
+
+            match_dict = match_raw.groupdict()
+            interface_item["cumulative_rate"] = {}
+            interface_item["cumulative_rate"].update(
+                {
+                    "last_2s": match_dict["cumulative_rate_sent"],
+                    "last_10s": match_dict["cumulative_rate_received"],
+                    "last_40s": match_dict["cumulative_rate_total"],
+                }
+            )
+
+        elif all(c == "=" for c in line):
+            interface_item["clients"] = clients
+            clients = []
+            # keep the copy here as without it keeps the objects linked
+            raw_output.append(interface_item.copy())
+
+    return raw_output if raw else _process(raw_output, quiet=quiet)

jc/parsers/ini_dup.py

@@ -17,12 +17,12 @@ contained in lists/arrays.
 
 Usage (cli):
 
-    $ cat foo.ini | jc --ini
+    $ cat foo.ini | jc --ini-dup
 
 Usage (module):
 
     import jc
-    result = jc.parse('ini', ini_file_output)
+    result = jc.parse('ini_dup', ini_file_output)
 
 Schema:
 
@@ -62,7 +62,7 @@ Examples:
     fruit = peach
     color = green
 
-    $ cat example.ini | jc --ini -p
+    $ cat example.ini | jc --ini-dup -p
     {
       "foo": [
         "fiz"
@@ -97,7 +97,7 @@ import uuid
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.0'
+    version = '1.1'
     description = 'INI with duplicate key file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'

jc/parsers/iptables.py

@@ -25,7 +25,7 @@ Schema:
             "num"               integer,
             "pkts":             integer,
             "bytes":            integer,  # converted based on suffix
-            "target":           string,
+            "target":           string,   # Null if blank
             "prot":             string,
             "opt":              string,   # "--" = Null
             "in":               string,
@@ -163,7 +163,7 @@ import jc.utils
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.8'
+    version = '1.9'
     description = '`iptables` command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -222,6 +222,10 @@ def _process(proc_data):
                 if rule['opt'] == '--':
                     rule['opt'] = None
 
+            if 'target' in rule:
+                if rule['target'] == '':
+                    rule['target'] = None
+
     return proc_data
 
 
@@ -271,15 +275,18 @@ def parse(data, raw=False, quiet=False):
                 continue
 
             else:
+                # sometimes the "target" column is blank. Stuff in a dummy character
+                if headers[0] == 'target' and line.startswith(' '):
+                    line = '\u2063' + line
+
                 rule = line.split(maxsplit=len(headers) - 1)
                 temp_rule = dict(zip(headers, rule))
                 if temp_rule:
+                    if temp_rule.get('target') == '\u2063':
+                        temp_rule['target'] = ''
                     chain['rules'].append(temp_rule)
 
         if chain:
             raw_output.append(chain)
 
-    if raw:
-        return raw_output
-    else:
-        return _process(raw_output)
+    return raw_output if raw else _process(raw_output)

jc/parsers/iso_datetime.py

@@ -1,46 +0,0 @@
-"""jc - JSON Convert ISO 8601 Datetime string parser
-
-This parser has been renamed to datetime-iso (cli) or datetime_iso (module).
-
-This parser will be removed in a future version, so please start using
-the new parser name.
-"""
-from jc.parsers import datetime_iso
-import jc.utils
-
-
-class info():
-    """Provides parser metadata (version, author, etc.)"""
-    version = '1.1'
-    description = 'Deprecated - please use datetime-iso'
-    author = 'Kelly Brazil'
-    author_email = 'kellyjonbrazil@gmail.com'
-    details = 'Deprecated - please use datetime-iso'
-    compatible = ['linux', 'aix', 'freebsd', 'darwin', 'win32', 'cygwin']
-    tags = ['standard', 'string']
-    deprecated = True
-
-
-__version__ = info.version
-
-
-def parse(data, raw=False, quiet=False):
-    """
-    This parser is deprecated and calls datetime_iso. Please use datetime_iso
-    directly. This parser will be removed in the future.
-
-    Parameters:
-
-        data:        (string)  text data to parse
-        raw:         (boolean) unprocessed output if True
-        quiet:       (boolean) suppress warning messages if True
-
-    Returns:
-
-        Dictionary. Raw or processed structured data.
-    """
-    jc.utils.warning_message([
-        'iso-datetime parser is deprecated. Please use datetime-iso instead.'
-    ])
-
-    return datetime_iso.parse(data, raw=raw, quiet=quiet)

jc/parsers/lsb_release.py

@@ -0,0 +1,89 @@
+"""jc - JSON Convert `lsb_release` command parser
+
+This parser is an alias to the Key/Value parser (`--kv`).
+
+Usage (cli):
+
+    $ lsb_release -a | jc --lsb-release
+
+or
+    $ jc lsb_release -a
+
+Usage (module):
+
+    import jc
+    result = jc.parse('lsb_release', lsb_release_command_output)
+
+Schema:
+
+    {
+        "<key>":     string
+    }
+
+Examples:
+
+    $ lsb_release -a | jc --lsb-release -p
+    {
+      "Distributor ID": "Ubuntu",
+      "Description": "Ubuntu 16.04.6 LTS",
+      "Release": "16.04",
+      "Codename": "xenial"
+    }
+"""
+from jc.jc_types import JSONDictType
+import jc.parsers.kv
+import jc.utils
+
+
+class info():
+    """Provides parser metadata (version, author, etc.)"""
+    version = '1.0'
+    description = '`lsb_release` command parser'
+    author = 'Kelly Brazil'
+    author_email = 'kellyjonbrazil@gmail.com'
+    details = 'Using the Key/Value parser'
+    compatible = ['linux', 'darwin', 'cygwin', 'win32', 'aix', 'freebsd']
+    magic_commands = ['lsb_release']
+    tags = ['command']
+
+
+__version__ = info.version
+
+
+def _process(proc_data: JSONDictType) -> JSONDictType:
+    """
+    Final processing to conform to the schema.
+
+    Parameters:
+
+        proc_data:   (Dictionary) raw structured data to process
+
+    Returns:
+
+        Dictionary. Structured to conform to the schema.
+    """
+    return jc.parsers.kv._process(proc_data)
+
+
+def parse(
+    data: str,
+    raw: bool = False,
+    quiet: bool = False
+) -> JSONDictType:
+    """
+    Main text parsing function
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) unprocessed output if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        Dictionary. Raw or processed structured data.
+    """
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    raw_output = jc.parsers.kv.parse(data, raw, quiet)
+
+    return raw_output if raw else _process(raw_output)

jc/parsers/mount.py

@@ -70,12 +70,14 @@ Example:
       ...
     ]
 """
+import re
+
 import jc.utils
 
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.8'
+    version = '1.9'
     description = '`mount` command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -133,14 +135,26 @@ def _linux_parse(data):
 
     for entry in data:
         output_line = {}
-        parsed_line = entry.split()
 
-        output_line['filesystem'] = parsed_line[0]
-        output_line['mount_point'] = parsed_line[2]
-        output_line['type'] = parsed_line[4]
-        output_line['options'] = parsed_line[5].lstrip('(').rstrip(')').split(',')
+        pattern = re.compile(
+            r'''
+            (?P<filesystem>\S+)\s+
+            on\s+
+            (?P<mount_point>.*?)\s+
+            type\s+
+            (?P<type>\S+)\s+
+            \((?P<options>.*?)\)\s*''',
+            re.VERBOSE)
 
-        output.append(output_line)
+        match = pattern.match(entry)
+        groups = match.groupdict()
+
+        if groups:
+            output_line['filesystem'] = groups["filesystem"]
+            output_line['mount_point'] = groups["mount_point"]
+            output_line['type'] = groups["type"]
+            output_line['options'] = groups["options"].split(',')
+            output.append(output_line)
 
     return output
 
@@ -160,7 +174,7 @@ def _aix_parse(data):
 
         # AIX mount entries have the remote node as the zeroth element. If the
         # mount is local, the zeroth element is the filesystem instead. We can
-        # detect this by the lenth of the list. For local mounts, length is 7,
+        # detect this by the length of the list. For local mounts, length is 7,
         # and for remote mounts, the length is 8. In the remote case, pop off
         # the zeroth element. Then parsed_line has a consistent format.
         if len(parsed_line) == 8:

jc/parsers/netstat.py

@@ -355,7 +355,7 @@ import jc.utils
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.14'
+    version = '1.15'
     description = '`netstat` command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'

jc/parsers/netstat_linux.py

@@ -31,10 +31,19 @@ def normalize_interface_headers(header):
 
 
 def parse_network(headers, entry):
+    LIST_OF_STATES = [
+        "ESTABLISHED", "SYN_SENT", "SYN_RECV", "FIN_WAIT1", "FIN_WAIT2",
+        "TIME_WAIT", "CLOSED", "CLOSE_WAIT", "LAST_ACK", "LISTEN", "CLOSING",
+        "UNKNOWN", "7"
+    ]
+
+    # split entry based on presence of value in "State" column
+    contains_state = any(state in entry for state in LIST_OF_STATES)
+    split_modifier = 1 if contains_state else 2
+    entry = entry.split(maxsplit=len(headers) - split_modifier)
+
     # Count words in header
     # if len of line is one less than len of header, then insert None in field 5
-    entry = entry.split(maxsplit=len(headers) - 1)
-
     if len(entry) == len(headers) - 1:
         entry.insert(5, None)
 

jc/parsers/nsd_control.py

@@ -0,0 +1,236 @@
+"""jc - JSON Convert `nsd-control` command output parser
+
+Usage (cli):
+
+    $ nsd-control | jc --nsd-control
+
+or
+
+    $ jc nsd-control
+
+Usage (module):
+
+    import jc
+    result = jc.parse('nsd_control', nsd_control_command_output)
+
+Schema:
+
+    [
+      {
+        "version":          string,
+        "verbosity":        integer,
+        "ratelimit":        integer
+      }
+    ]
+
+    [
+      {
+        "zone":             string
+        "status": {
+          "state":          string,
+          "served-serial":  string,
+          "commit-serial":  string,
+          "wait":           string
+        }
+      }
+    ]
+
+Examples:
+
+    $ nsd-control | jc --nsd-control status
+    [
+      {
+        "version": "4.6.2",
+        "verbosity": "2",
+        "ratelimit": "0"
+      }
+    ]
+
+    $ nsd-control | jc --nsd-control zonestatus sunet.se
+    [
+      {
+        "zone": "sunet.se",
+        "status": {
+          "state": "ok",
+          "served-serial": "2023090704 since 2023-09-07T16:34:27",
+          "commit-serial": "2023090704 since 2023-09-07T16:34:27",
+          "wait": "28684 sec between attempts"
+        }
+      }
+    ]
+
+"""
+from typing import List, Dict
+import jc.utils
+
+
+class info():
+    """Provides parser metadata (version, author, etc.)"""
+    version = '1.0'
+    description = '`nsd-control` command parser'
+    author = 'Pettai'
+    author_email = 'pettai@sunet.se'
+    compatible = ['linux', 'darwin', 'cygwin', 'win32', 'aix', 'freebsd']
+    tags = ['command']
+    magic_commands = ['nsd-control']
+
+
+__version__ = info.version
+
+
+def _process(proc_data):
+    """
+    Final processing to conform to the schema.
+
+    Parameters:
+
+        proc_data:   (List of Dictionaries) raw structured data to process
+
+    Returns:
+
+        List of Dictionaries. Structured to conform to the schema.
+    """
+    int_list = {'verbosity', 'ratelimit', 'wait'}
+
+    for entry in proc_data:
+        for key in entry:
+            if key in int_list:
+                entry[key] = jc.utils.convert_to_int(entry[key])
+
+    return proc_data
+
+
+def parse(data: str, raw: bool = False, quiet: bool = False):
+    """
+    Main text parsing function
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) unprocessed output if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        List of Dictionaries. Raw or processed structured data.
+    """
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
+
+    raw_output: List[Dict] = []
+
+    if jc.utils.has_data(data):
+
+        itrparse = False
+        itr: Dict = {}
+
+        for line in filter(None, data.splitlines()):
+            line = line.strip()
+
+            # default 'ok'
+            if line.startswith('ok'):
+                raw_output.append({'command': 'ok'})
+                continue
+
+            # status
+            if line.startswith('version:'):
+                status = {}
+                linedata = line.split(':', maxsplit=1)
+                version = linedata[1].strip()
+                status.update({'version': version})
+                continue
+
+            if line.startswith('verbosity:'):
+                linedata = line.split(':', maxsplit=1)
+                verbosity = linedata[1]
+                status.update({'verbosity': verbosity})
+                continue
+
+            if line.startswith('ratelimit:'):
+                linedata = line.split(':', maxsplit=1)
+                ratelimit = linedata[1]
+                status.update({'ratelimit': ratelimit})
+                raw_output.append(status)
+                continue
+
+            # print_cookie_secrets
+            if line.startswith('active'):
+                itrparse = True
+                itr = {}
+                linedata = line.split(':', maxsplit=1)
+                active = linedata[1].strip()
+                itr.update({'active': active})
+                continue
+
+            if line.startswith('staging'):
+                linedata = line.split(':', maxsplit=1)
+                staging = linedata[1].strip()
+                itr.update({'staging': staging})
+                continue
+
+            # print_tsig
+            if line.startswith('key:'):
+                tsigs = {}
+                tsigdata = dict()
+                linedata = line.split(' ', maxsplit=6)
+                name = linedata[2].strip('"').rstrip('"')
+                tsigdata.update({'name': name})
+                secret = linedata[4].strip('"').rstrip('"')
+                tsigdata.update({'secret': secret})
+                algorithm = linedata[6].strip('"').rstrip('"')
+                tsigdata.update({'algorithm': algorithm})
+                tsigs.update({'key': tsigdata})
+                raw_output.append(tsigs)
+                continue
+
+            # zonestatus
+            if line.startswith('zone:'):
+                zonename: Dict = dict()
+                zstatus: Dict = dict()
+                linedata = line.split(':\t', maxsplit=1)
+                zone = linedata[1]
+                zonename.update({'zone': zone})
+                continue
+
+            if line.startswith('state:'):
+                linedata = line.split(': ', maxsplit=1)
+                state = linedata[1]
+                zstatus.update({'state': state})
+                continue
+
+            if line.startswith('served-serial:'):
+                linedata = line.split(': ', maxsplit=1)
+                served = linedata[1].strip('"').rstrip('"')
+                zstatus.update({'served-serial': served})
+                continue
+
+            if line.startswith('commit-serial:'):
+                linedata = line.split(': ', maxsplit=1)
+                commit = linedata[1].strip('"').rstrip('"')
+                zstatus.update({'commit-serial': commit})
+                continue
+
+            if line.startswith('wait:'):
+                linedata = line.split(': ', maxsplit=1)
+                wait = linedata[1].strip('"').rstrip('"')
+                zstatus.update({'wait': wait})
+                zonename.update({'status': zstatus})
+                raw_output.append(zonename)
+                continue
+
+            # stats
+            if line.startswith('server') or line.startswith('num.') or line.startswith('size.') or line.startswith('time.') or line.startswith('zone.'):
+                itrparse = True
+                linedata = line.split('=', maxsplit=1)
+                key = linedata[0]
+                if key.startswith('time.'):
+                    value = float(linedata[1])
+                else:
+                    value = int(linedata[1])
+                itr.update({key: value})
+                continue
+
+        if itrparse:
+            raw_output.append(itr)
+
+    return raw_output if raw else _process(raw_output)

jc/parsers/os_release.py

@@ -0,0 +1,113 @@
+"""jc - JSON Convert `/etc/os-release` file parser
+
+This parser is an alias to the Key/Value parser (`--kv`).
+
+Usage (cli):
+
+    $ cat /etc/os-release | jc --os-release
+
+Usage (module):
+
+    import jc
+    result = jc.parse('os_release', os_release_output)
+
+Schema:
+
+    {
+        "<key>":     string
+    }
+
+Examples:
+
+    $ cat /etc/os-release | jc --os-release -p
+    {
+      "NAME": "CentOS Linux",
+      "VERSION": "7 (Core)",
+      "ID": "centos",
+      "ID_LIKE": "rhel fedora",
+      "VERSION_ID": "7",
+      "PRETTY_NAME": "CentOS Linux 7 (Core)",
+      "ANSI_COLOR": "0;31",
+      "CPE_NAME": "cpe:/o:centos:centos:7",
+      "HOME_URL": "https://www.centos.org/",
+      "BUG_REPORT_URL": "https://bugs.centos.org/",
+      "CENTOS_MANTISBT_PROJECT": "CentOS-7",
+      "CENTOS_MANTISBT_PROJECT_VERSION": "7",
+      "REDHAT_SUPPORT_PRODUCT": "centos",
+      "REDHAT_SUPPORT_PRODUCT_VERSION": "7"
+    }
+
+    $ cat /etc/os-release | jc --os-release -p -r
+    {
+      "NAME": "\\"CentOS Linux\\"",
+      "VERSION": "\\"7 (Core)\\"",
+      "ID": "\\"centos\\"",
+      "ID_LIKE": "\\"rhel fedora\\"",
+      "VERSION_ID": "\\"7\\"",
+      "PRETTY_NAME": "\\"CentOS Linux 7 (Core)\\"",
+      "ANSI_COLOR": "\\"0;31\\"",
+      "CPE_NAME": "\\"cpe:/o:centos:centos:7\\"",
+      "HOME_URL": "\\"https://www.centos.org/\\"",
+      "BUG_REPORT_URL": "\\"https://bugs.centos.org/\\"",
+      "CENTOS_MANTISBT_PROJECT": "\\"CentOS-7\\"",
+      "CENTOS_MANTISBT_PROJECT_VERSION": "\\"7\\"",
+      "REDHAT_SUPPORT_PRODUCT": "\\"centos\\"",
+      "REDHAT_SUPPORT_PRODUCT_VERSION": "\\"7\\""
+    }
+"""
+from jc.jc_types import JSONDictType
+import jc.parsers.kv
+import jc.utils
+
+
+class info():
+    """Provides parser metadata (version, author, etc.)"""
+    version = '1.0'
+    description = '`/etc/os-release` file parser'
+    author = 'Kelly Brazil'
+    author_email = 'kellyjonbrazil@gmail.com'
+    details = 'Using the Key/Value parser'
+    compatible = ['linux', 'darwin', 'cygwin', 'win32', 'aix', 'freebsd']
+    tags = ['file', 'standard', 'string']
+
+
+__version__ = info.version
+
+
+def _process(proc_data: JSONDictType) -> JSONDictType:
+    """
+    Final processing to conform to the schema.
+
+    Parameters:
+
+        proc_data:   (Dictionary) raw structured data to process
+
+    Returns:
+
+        Dictionary. Structured to conform to the schema.
+    """
+    return jc.parsers.kv._process(proc_data)
+
+
+def parse(
+    data: str,
+    raw: bool = False,
+    quiet: bool = False
+) -> JSONDictType:
+    """
+    Main text parsing function
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) unprocessed output if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        Dictionary. Raw or processed structured data.
+    """
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    raw_output = jc.parsers.kv.parse(data, raw, quiet)
+
+    return raw_output if raw else _process(raw_output)

jc/parsers/pbPlist/StrParse.py

@@ -28,12 +28,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import sys
 import string
 
-if sys.version_info >= (3, 0):
-    def unichr(character): # pylint: disable=redefined-builtin
-        return chr(character)
+
+def unichr(character):  # pylint: disable=redefined-builtin
+    return chr(character)
+
 
 def ConvertNEXTSTEPToUnicode(hex_digits):
     # taken from http://ftp.unicode.org/Public/MAPPINGS/VENDORS/NEXT/NEXTSTEP.TXT

jc/parsers/pbPlist/pbParser.py

@@ -64,12 +64,10 @@ def GetFileEncoding(path):
 def OpenFileWithEncoding(file_path, encoding):
     return codecs.open(file_path, 'r', encoding=encoding, errors='ignore')
 
-if sys.version_info < (3, 0):
-    def OpenFile(file_path):
-        return open(file_path, 'rb')
-else:
-    def OpenFile(file_path):
-        return open(file_path, 'br')
+
+def OpenFile(file_path):
+    return open(file_path, 'rb')
+
 
 class PBParser(object):
 

jc/parsers/pbPlist/pbRoot.py

@@ -32,7 +32,7 @@ import sys
 from functools import cmp_to_key
 
 # for python 3.10+ compatibility
-if sys.version_info.major == 3 and sys.version_info.minor >= 10:
+if sys.version_info >= (3, 10):
     import collections
     setattr(collections, "MutableMapping", collections.abc.MutableMapping)
 

jc/parsers/pidstat.py

@@ -40,6 +40,9 @@ Schema:
         "kb_ccwr_s":        float,
         "cswch_s":          float,
         "nvcswch_s":        float,
+        "usr_ms":           integer,
+        "system_ms":        integer,
+        "guest_ms":         integer,
         "command":          string
       }
     ]
@@ -128,7 +131,7 @@ from jc.exceptions import ParseError
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.1'
+    version = '1.3'
     description = '`pidstat -H` command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -152,11 +155,16 @@ def _process(proc_data: List[Dict]) -> List[Dict]:
 
         List of Dictionaries. Structured to conform to the schema.
     """
-    int_list = {'time', 'uid', 'pid', 'cpu', 'vsz', 'rss', 'stksize', 'stkref'}
+    int_list = {
+        'time', 'uid', 'pid', 'cpu', 'vsz', 'rss', 'stksize', 'stkref',
+        'usr_ms', 'system_ms', 'guest_ms'
+    }
 
-    float_list = {'percent_usr', 'percent_system', 'percent_guest', 'percent_cpu',
-                  'minflt_s', 'majflt_s', 'percent_mem', 'kb_rd_s', 'kb_wr_s',
-                  'kb_ccwr_s', 'cswch_s', 'nvcswch_s'}
+    float_list = {
+        'percent_usr', 'percent_system', 'percent_guest', 'percent_cpu',
+        'minflt_s', 'majflt_s', 'percent_mem', 'kb_rd_s', 'kb_wr_s',
+        'kb_ccwr_s', 'cswch_s', 'nvcswch_s', 'percent_wait'
+    }
 
     for entry in proc_data:
         for key in entry:
@@ -169,6 +177,14 @@ def _process(proc_data: List[Dict]) -> List[Dict]:
     return proc_data
 
 
+def normalize_header(header: str) -> str:
+    return header.replace('#', ' ')\
+                 .replace('-', '_')\
+                 .replace('/', '_')\
+                 .replace('%', 'percent_')\
+                 .lower()
+
+
 def parse(
     data: str,
     raw: bool = False,
@@ -191,29 +207,28 @@ def parse(
     jc.utils.input_type_check(data)
 
     raw_output: List = []
+    table_list: List = []
+    header_found = False
 
     if jc.utils.has_data(data):
 
-        # check for line starting with # as the start of the table
         data_list = list(filter(None, data.splitlines()))
-        for line in data_list.copy():
-            if line.startswith('#'):
-                break
-            else:
-                data_list.pop(0)
 
-        if not data_list:
+        for line in data_list:
+            if line.startswith('#'):
+                header_found = True
+                if len(table_list) > 1:
+                    raw_output.extend(simple_table_parse(table_list))
+                table_list = [normalize_header(line)]
+                continue
+
+            if header_found:
+                table_list.append(line)
+
+        if len(table_list) > 1:
+            raw_output.extend(simple_table_parse(table_list))
+
+        if not header_found:
             raise ParseError('Could not parse pidstat output. Make sure to use "pidstat -h".')
 
-        # normalize header
-        data_list[0] = data_list[0].replace('#', ' ')\
-                                   .replace('/', '_')\
-                                   .replace('%', 'percent_')\
-                                   .lower()
-
-        # remove remaining header lines (e.g. pidstat -H 2 5)
-        data_list = [i for i in data_list if not i.startswith('#')]
-
-        raw_output = simple_table_parse(data_list)
-
     return raw_output if raw else _process(raw_output)

jc/parsers/pidstat_s.py

@@ -34,6 +34,7 @@ Schema:
       "percent_usr":      float,
       "percent_system":   float,
       "percent_guest":    float,
+      "percent_wait":     float,
       "percent_cpu":      float,
       "cpu":              integer,
       "minflt_s":         float,
@@ -48,6 +49,9 @@ Schema:
       "kb_ccwr_s":        float,
       "cswch_s":          float,
       "nvcswch_s":        float,
+      "usr_ms":           integer,
+      "system_ms":        integer,
+      "guest_ms":         integer,
       "command":          string,
 
       # below object only exists if using -qq or ignore_exceptions=True
@@ -72,7 +76,7 @@ Examples:
     {"time":"1646859134","uid":"0","pid":"9","percent_usr":"0.00","perc...}
     ...
 """
-from typing import Dict, Iterable, Union
+from typing import List, Dict, Iterable, Union
 import jc.utils
 from jc.streaming import (
     add_jc_meta, streaming_input_type_check, streaming_line_input_type_check, raise_or_yield
@@ -83,7 +87,7 @@ from jc.exceptions import ParseError
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.1'
+    version = '1.2'
     description = '`pidstat -H` command streaming parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -107,11 +111,16 @@ def _process(proc_data: Dict) -> Dict:
 
         Dictionary. Structured data to conform to the schema.
     """
-    int_list = {'time', 'uid', 'pid', 'cpu', 'vsz', 'rss', 'stksize', 'stkref'}
+    int_list = {
+        'time', 'uid', 'pid', 'cpu', 'vsz', 'rss', 'stksize', 'stkref',
+        'usr_ms', 'system_ms', 'guest_ms'
+    }
 
-    float_list = {'percent_usr', 'percent_system', 'percent_guest', 'percent_cpu',
-                  'minflt_s', 'majflt_s', 'percent_mem', 'kb_rd_s', 'kb_wr_s',
-                  'kb_ccwr_s', 'cswch_s', 'nvcswch_s'}
+    float_list = {
+        'percent_usr', 'percent_system', 'percent_guest', 'percent_wait',
+        'percent_cpu', 'minflt_s', 'majflt_s', 'percent_mem', 'kb_rd_s',
+        'kb_wr_s', 'kb_ccwr_s', 'cswch_s', 'nvcswch_s'
+    }
 
     for key in proc_data:
         if key in int_list:
@@ -123,6 +132,14 @@ def _process(proc_data: Dict) -> Dict:
     return proc_data
 
 
+def normalize_header(header: str) -> str:
+    return header.replace('#', ' ')\
+                 .replace('-', '_')\
+                 .replace('/', '_')\
+                 .replace('%', 'percent_')\
+                 .lower()
+
+
 @add_jc_meta
 def parse(
     data: Iterable[str],
@@ -149,8 +166,8 @@ def parse(
     jc.utils.compatibility(__name__, info.compatible, quiet)
     streaming_input_type_check(data)
 
-    found_first_hash = False
-    header = ''
+    table_list: List = []
+    header: str = ''
 
     for line in data:
         try:
@@ -161,29 +178,30 @@ def parse(
                 # skip blank lines
                 continue
 
-            if not line.startswith('#') and not found_first_hash:
-                # skip preamble lines before header row
+            if line.startswith('#'):
+                if len(table_list) > 1:
+                    output_line = simple_table_parse(table_list)[0]
+                    yield output_line if raw else _process(output_line)
+                    header = ''
+
+                header = normalize_header(line)
+                table_list = [header]
                 continue
 
-            if line.startswith('#') and not found_first_hash:
-                # normalize header
-                header = line.replace('#', ' ')\
-                             .replace('/', '_')\
-                             .replace('%', 'percent_')\
-                             .lower()
-                found_first_hash = True
-                continue
-
-            if line.startswith('#') and found_first_hash:
-                # skip header lines after first one is found
-                continue
-
-            output_line = simple_table_parse([header, line])[0]
-
-            if output_line:
+            if header:
+                table_list.append(line)
+                output_line = simple_table_parse(table_list)[0]
                 yield output_line if raw else _process(output_line)
-            else:
-                raise ParseError('Not pidstat data')
+                table_list = [header]
+                continue
 
         except Exception as e:
             yield raise_or_yield(ignore_exceptions, e, line)
+
+    try:
+        if len(table_list) > 1:
+            output_line = simple_table_parse(table_list)[0]
+            yield output_line if raw else _process(output_line)
+
+    except Exception as e:
+        yield raise_or_yield(ignore_exceptions, e, str(table_list))

jc/parsers/ping.py

@@ -30,6 +30,8 @@ Schema:
       "packets_received":            integer,
       "packet_loss_percent":         float,
       "duplicates":                  integer,
+      "errors":                      integer,
+      "corrupted":                   integer,
       "round_trip_ms_min":           float,
       "round_trip_ms_avg":           float,
       "round_trip_ms_max":           float,
@@ -157,6 +159,7 @@ Examples:
       ]
     }
 """
+import re
 import string
 import ipaddress
 import jc.utils
@@ -164,7 +167,7 @@ import jc.utils
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.9'
+    version = '1.10'
     description = '`ping` and `ping6` command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -190,7 +193,7 @@ def _process(proc_data):
     """
     int_list = {
         'data_bytes', 'packets_transmitted', 'packets_received', 'bytes', 'icmp_seq', 'ttl',
-        'duplicates', 'vr', 'hl', 'tos', 'len', 'id', 'flg', 'off', 'pro', 'cks'
+        'duplicates', 'corrupted', 'errors', 'vr', 'hl', 'tos', 'len', 'id', 'flg', 'off', 'pro', 'cks'
     }
 
     float_list = {
@@ -321,41 +324,47 @@ def _linux_parse(data):
             continue
 
         if footer:
-            if 'packets transmitted' in line:
-                if ' duplicates,' in line:
-                    raw_output.update(
-                        {
-                            'packets_transmitted': line.split()[0],
-                            'packets_received': line.split()[3],
-                            'packet_loss_percent': line.split()[7].rstrip('%'),
-                            'duplicates': line.split()[5].lstrip('+'),
-                            'time_ms': line.split()[11].replace('ms', '')
-                        }
-                    )
-                    continue
-                else:
-                    raw_output.update(
-                        {
-                            'packets_transmitted': line.split()[0],
-                            'packets_received': line.split()[3],
-                            'packet_loss_percent': line.split()[5].rstrip('%'),
-                            'duplicates': '0',
-                            'time_ms': line.split()[9].replace('ms', '')
-                        }
-                    )
-                    continue
+            # Init in zero, to keep compatibility with previous behaviour
+            if 'duplicates' not in raw_output:
+                raw_output['duplicates'] = '0'
 
-            else:
-                split_line = line.split(' = ')[1]
-                split_line = split_line.split('/')
-                raw_output.update(
-                    {
-                        'round_trip_ms_min': split_line[0],
-                        'round_trip_ms_avg': split_line[1],
-                        'round_trip_ms_max': split_line[2],
-                        'round_trip_ms_stddev': split_line[3].split()[0]
-                    }
-                )
+            #
+            # See: https://github.com/dgibson/iputils/blob/master/ping_common.c#L995
+            #
+            m = re.search(r'(\d+) packets transmitted', line)
+            if m:
+                raw_output['packets_transmitted'] = m.group(1)
+
+            m = re.search(r'(\d+) received,', line)
+            if m:
+                raw_output['packets_received'] = m.group(1)
+
+            m = re.search(r'[+](\d+) duplicates', line)
+            if m:
+                raw_output['duplicates'] = m.group(1)
+
+            m = re.search(r'[+](\d+) corrupted', line)
+            if m:
+                raw_output['corrupted'] = m.group(1)
+
+            m = re.search(r'[+](\d+) errors', line)
+            if m:
+                raw_output['errors'] = m.group(1)
+
+            m = re.search(r'([\d\.]+)% packet loss', line)
+            if m:
+                raw_output['packet_loss_percent'] = m.group(1)
+
+            m = re.search(r'time (\d+)ms', line)
+            if m:
+                raw_output['time_ms'] = m.group(1)
+
+            m = re.search(r'rtt min\/avg\/max\/mdev += +([\d\.]+)\/([\d\.]+)\/([\d\.]+)\/([\d\.]+) ms', line)
+            if m:
+                raw_output['round_trip_ms_min'] = m.group(1)
+                raw_output['round_trip_ms_avg'] = m.group(2)
+                raw_output['round_trip_ms_max'] = m.group(3)
+                raw_output['round_trip_ms_stddev'] = m.group(4)
 
         # ping response lines
         else:

jc/parsers/ping_s.py

@@ -31,7 +31,7 @@ Schema:
       "source_ip":                  string,
       "destination_ip":             string,
       "sent_bytes":                 integer,
-      "pattern":                    string,   # (null if not set)
+      "pattern":                    string,   # null if not set
       "destination":                string,
       "timestamp":                  float,
       "response_bytes":             integer,
@@ -44,10 +44,12 @@ Schema:
       "packets_received":           integer,
       "packet_loss_percent":        float,
       "duplicates":                 integer,
-      "round_trip_ms_min":          float,
-      "round_trip_ms_avg":          float,
-      "round_trip_ms_max":          float,
-      "round_trip_ms_stddev":       float,
+      "errors":                     integer,  # null if not set
+      "corrupted":                  integer,  # null if not set
+      "round_trip_ms_min":          float,    # null if not set
+      "round_trip_ms_avg":          float,    # null if not set
+      "round_trip_ms_max":          float,    # null if not set
+      "round_trip_ms_stddev":       float,    # null if not set
 
       # below object only exists if using -qq or ignore_exceptions=True
       "_jc_meta": {
@@ -74,6 +76,7 @@ Examples:
     {"type":"reply","destination_ip":"1.1.1.1","sent_bytes":"56","patte...}
     ...
 """
+import re
 import string
 import ipaddress
 import jc.utils
@@ -85,7 +88,7 @@ from jc.exceptions import ParseError
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.3'
+    version = '1.4'
     description = '`ping` and `ping6` command streaming parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -110,13 +113,14 @@ def _process(proc_data):
         Dictionary. Structured data to conform to the schema.
     """
     int_list = {
-        'sent_bytes', 'packets_transmitted', 'packets_received', 'response_bytes', 'icmp_seq',
-        'ttl', 'duplicates', 'vr', 'hl', 'tos', 'len', 'id', 'flg', 'off', 'pro', 'cks'
+        'sent_bytes', 'packets_transmitted', 'packets_received',
+        'response_bytes', 'icmp_seq', 'ttl', 'duplicates', 'vr', 'hl', 'tos',
+        'len', 'id', 'flg', 'off', 'pro', 'cks', 'errors', 'corrupted'
     }
 
     float_list = {
-        'packet_loss_percent', 'round_trip_ms_min', 'round_trip_ms_avg', 'round_trip_ms_max',
-        'round_trip_ms_stddev', 'timestamp', 'time_ms'
+        'packet_loss_percent', 'round_trip_ms_min', 'round_trip_ms_avg',
+        'round_trip_ms_max', 'round_trip_ms_stddev', 'timestamp', 'time_ms'
     }
 
     for key in proc_data:
@@ -144,6 +148,12 @@ class _state:
     packet_loss_percent = None
     time_ms = None
     duplicates = None
+    corrupted = None
+    errors = None
+    round_trip_ms_min = None
+    round_trip_ms_avg = None
+    round_trip_ms_max = None
+    round_trip_ms_stddev = None
 
 
 def _ipv6_in(line):
@@ -369,24 +379,44 @@ def _linux_parse(line, s):
         return None
 
     if s.footer:
-        if 'packets transmitted' in line:
-            if ' duplicates,' in line:
-                s.packets_transmitted = line.split()[0]
-                s.packets_received = line.split()[3]
-                s.packet_loss_percent = line.split()[7].rstrip('%')
-                s.duplicates = line.split()[5].lstrip('+')
-                s.time_ms = line.split()[11].replace('ms', '')
-                return None
+        #
+        # See: https://github.com/dgibson/iputils/blob/master/ping_common.c#L995
+        #
+        m = re.search(r'(\d+) packets transmitted', line)
+        if m:
+            s.packets_transmitted = m.group(1)
 
-            s.packets_transmitted = line.split()[0]
-            s.packets_received = line.split()[3]
-            s.packet_loss_percent = line.split()[5].rstrip('%')
-            s.duplicates = '0'
-            s.time_ms = line.split()[9].replace('ms', '')
-            return None
+        m = re.search(r'(\d+) received,', line)
+        if m:
+            s.packets_received = m.group(1)
+
+        m = re.search(r'[+](\d+) duplicates', line)
+        if m:
+            s.duplicates = m.group(1)
+
+        m = re.search(r'[+](\d+) corrupted', line)
+        if m:
+            s.corrupted = m.group(1)
+
+        m = re.search(r'[+](\d+) errors', line)
+        if m:
+            s.errors = m.group(1)
+
+        m = re.search(r'([\d\.]+)% packet loss', line)
+        if m:
+            s.packet_loss_percent = m.group(1)
+
+        m = re.search(r'time (\d+)ms', line)
+        if m:
+            s.time_ms = m.group(1)
+
+        m = re.search(r'rtt min\/avg\/max\/mdev += +([\d\.]+)\/([\d\.]+)\/([\d\.]+)\/([\d\.]+) ms', line)
+        if m:
+            s.round_trip_ms_min = m.group(1)
+            s.round_trip_ms_avg = m.group(2)
+            s.round_trip_ms_max = m.group(3)
+            s.round_trip_ms_stddev = m.group(4)
 
-        split_line = line.split(' = ')[1]
-        split_line = split_line.split('/')
         output_line = {
             'type': 'summary',
             'destination_ip': s.destination_ip or None,
@@ -394,15 +424,16 @@ def _linux_parse(line, s):
             'pattern': s.pattern or None,
             'packets_transmitted': s.packets_transmitted or None,
             'packets_received': s.packets_received or None,
-            'packet_loss_percent': s.packet_loss_percent or None,
-            'duplicates': s.duplicates or None,
-            'time_ms': s.time_ms or None,
-            'round_trip_ms_min': split_line[0],
-            'round_trip_ms_avg': split_line[1],
-            'round_trip_ms_max': split_line[2],
-            'round_trip_ms_stddev': split_line[3].split()[0]
+            'packet_loss_percent': s.packet_loss_percent,
+            'duplicates': s.duplicates or '0',
+            'errors': s.errors,
+            'corrupted': s.corrupted,
+            'time_ms': s.time_ms,
+            'round_trip_ms_min': s.round_trip_ms_min,
+            'round_trip_ms_avg': s.round_trip_ms_avg,
+            'round_trip_ms_max': s.round_trip_ms_max,
+            'round_trip_ms_stddev': s.round_trip_ms_stddev
         }
-
         return output_line
 
     # ping response lines
@@ -488,6 +519,7 @@ def parse(data, raw=False, quiet=False, ignore_exceptions=False):
     streaming_input_type_check(data)
 
     s = _state()
+    summary_obj = {}
 
     for line in data:
         try:
@@ -528,6 +560,12 @@ def parse(data, raw=False, quiet=False, ignore_exceptions=False):
             if s.os_detected and s.linux:
                 output_line = _linux_parse(line, s)
 
+                # summary can be multiple lines so don't output until the end
+                if output_line:
+                    if output_line.get('type', None) == 'summary':
+                        summary_obj = output_line
+                        continue
+
             elif s.os_detected and s.bsd:
                 output_line = _bsd_parse(line, s)
 
@@ -542,3 +580,10 @@ def parse(data, raw=False, quiet=False, ignore_exceptions=False):
 
         except Exception as e:
             yield raise_or_yield(ignore_exceptions, e, line)
+
+    # yield summary, if it exists
+    try:
+        if summary_obj:
+            yield summary_obj if raw else _process(summary_obj)
+    except Exception as e:
+        yield raise_or_yield(ignore_exceptions, e, str(summary_obj))

jc/parsers/pkg_index_apk.py

@@ -0,0 +1,220 @@
+"""jc - JSON Convert Alpine Linux Package Index files
+
+Usage (cli):
+
+    $ cat APKINDEX | jc --pkg-index-apk
+
+Usage (module):
+
+    import jc
+    result = jc.parse('pkg_index_apk', pkg_index_apk_output)
+
+Schema:
+
+    [
+      {
+        "checksum":             string,
+        "package":              string,
+        "version":              string,
+        "architecture":         string,
+        "package_size":         integer,
+        "installed_size":       integer,
+        "description":          string,
+        "url":                  string,
+        "license":              string,
+        "origin":               string,
+        "maintainer": {
+          "name":               string,
+          "email":              string,
+        },
+        "build_time":           integer,
+        "commit":               string,
+        "provider_priority":    string,
+        "dependencies": [
+                                string
+        ],
+        "provides": [
+                                string
+        ],
+        "install_if": [
+                                string
+        ],
+      }
+    ]
+
+Example:
+
+    $ cat APKINDEX | jc --pkg-index-apk
+    [
+      {
+        "checksum": "Q1znBl9k+RKgY6gl5Eg3iz73KZbLY=",
+        "package": "yasm",
+        "version": "1.3.0-r4",
+        "architecture": "x86_64",
+        "package_size": 772109,
+        "installed_size": 1753088,
+        "description": "A rewrite of NASM to allow for multiple synta...",
+        "url": "http://www.tortall.net/projects/yasm/",
+        "license": "BSD-2-Clause",
+        "origin": "yasm",
+        "maintainer": {
+          "name": "Natanael Copa",
+          "email": "ncopa@alpinelinux.org"
+        },
+        "build_time": 1681228881,
+        "commit": "84a227baf001b6e0208e3352b294e4d7a40e93de",
+        "dependencies": [
+          "so:libc.musl-x86_64.so.1"
+        ],
+        "provides": [
+          "cmd:vsyasm=1.3.0-r4",
+          "cmd:yasm=1.3.0-r4",
+          "cmd:ytasm=1.3.0-r4"
+        ]
+      }
+    ]
+
+    $ cat APKINDEX | jc --pkg-index-apk --raw
+    [
+      {
+        "C": "Q1znBl9k+RKgY6gl5Eg3iz73KZbLY=",
+        "P": "yasm",
+        "V": "1.3.0-r4",
+        "A": "x86_64",
+        "S": "772109",
+        "I": "1753088",
+        "T": "A rewrite of NASM to allow for multiple syntax supported...",
+        "U": "http://www.tortall.net/projects/yasm/",
+        "L": "BSD-2-Clause",
+        "o": "yasm",
+        "m": "Natanael Copa <ncopa@alpinelinux.org>",
+        "t": "1681228881",
+        "c": "84a227baf001b6e0208e3352b294e4d7a40e93de",
+        "D": "so:libc.musl-x86_64.so.1",
+        "p": "cmd:vsyasm=1.3.0-r4 cmd:yasm=1.3.0-r4 cmd:ytasm=1.3.0-r4"
+      },
+    ]
+"""
+import re
+from typing import List, Dict, Union
+import jc.utils
+
+
+class info:
+    """Provides parser metadata (version, author, etc.)"""
+    version = "1.0"
+    description = "Alpine Linux Package Index file parser"
+    author = "Roey Darwish Dror"
+    author_email = "roey.ghost@gmail.com"
+    compatible = ['linux', 'darwin', 'cygwin', 'win32', 'aix', 'freebsd']
+    tags = ['standard', 'file', 'string']
+
+
+__version__ = info.version
+
+
+_KEY = {
+    "C": "checksum",
+    "P": "package",
+    "V": "version",
+    "A": "architecture",
+    "S": "package_size",
+    "I": "installed_size",
+    "T": "description",
+    "U": "url",
+    "L": "license",
+    "o": "origin",
+    "m": "maintainer",
+    "t": "build_time",
+    "c": "commit",
+    "k": "provider_priority",
+    "D": "dependencies",
+    "p": "provides",
+    "i": "install_if"
+}
+
+def _value(key: str, value: str) -> Union[str, int, List[str], Dict[str, str]]:
+    """
+    Convert value to the appropriate type
+
+    Parameters:
+
+        key:         (string)  key name
+        value:       (string)  value to convert
+
+    Returns:
+
+        Converted value
+    """
+    if key in ['S', 'I', 't', 'k']:
+        return int(value)
+
+    if key in ['D', 'p', 'i']:
+        splitted = value.split(' ')
+        return splitted
+
+    if key == "m":
+        m = re.match(r'(.*) <(.*)>', value)
+        if m:
+            return {'name': m.group(1), 'email': m.group(2)}
+        else:
+            return {'name': value}
+
+    return value
+
+
+def _process(proc_data: List[Dict]) -> List[Dict]:
+    """
+    Final processing to conform to the schema.
+
+    Parameters:
+
+        proc_data:   (List of Dictionaries) raw structured data to process
+
+    Returns:
+
+        List of Dictionaries. Structured to conform to the schema.
+    """
+    return [{_KEY.get(k, k): _value(k, v) for k, v in d.items()} for d in proc_data]
+
+
+def parse(data: str, raw: bool = False, quiet: bool = False) -> List[Dict]:
+    """
+    Main text parsing function
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) unprocessed output if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        List of Dictionaries. Raw or processed structured data.
+    """
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
+
+    raw_output: List[dict] = []
+
+    package: Dict = {}
+    if jc.utils.has_data(data):
+        lines = iter(data.splitlines())
+        for line in lines:
+            line = line.strip()
+            if not line:
+                if package:
+                    raw_output.append(package)
+                    package = {}
+
+                continue
+
+            key = line[0]
+            value = line[2:].strip()
+            assert key not in package
+            package[key] = value
+
+    if package:
+        raw_output.append(package)
+
+    return raw_output if raw else _process(raw_output)

jc/parsers/pkg_index_deb.py

@@ -0,0 +1,148 @@
+"""jc - JSON Convert Debian Package Index file parser
+
+Usage (cli):
+
+    $ cat Packages | jc --pkg-index-deb
+
+Usage (module):
+
+    import jc
+    result = jc.parse('pkg_index_deb', pkg_index_deb_output)
+
+Schema:
+
+    [
+      {
+        "package":                  string,
+        "version":                  string,
+        "architecture":             string,
+        "section":                  string,
+        "priority":                 string,
+        "installed_size":           integer,
+        "maintainer":               string,
+        "description":              string,
+        "homepage":                 string,
+        "depends":                  string,
+        "conflicts":                string,
+        "replaces":                 string,
+        "vcs_git":                  string,
+        "sha256":                   string,
+        "size":                     integer,
+        "vcs_git":                  string,
+        "filename":                 string
+      }
+    ]
+
+Examples:
+
+    $ cat Packages | jc --pkg-index-deb
+    [
+      {
+        "package": "aspnetcore-runtime-2.1",
+        "version": "2.1.22-1",
+        "architecture": "amd64",
+        "section": "devel",
+        "priority": "standard",
+        "installed_size": 71081,
+        "maintainer": "Microsoft <nugetaspnet@microsoft.com>",
+        "description": "Microsoft ASP.NET Core 2.1.22 Shared Framework",
+        "homepage": "https://www.asp.net/",
+        "depends": "libc6 (>= 2.14), dotnet-runtime-2.1 (>= 2.1.22)",
+        "sha256": "48d4e78a7ceff34105411172f4c3e91a0359b3929d84d26a493...",
+        "size": 21937036,
+        "filename": "pool/main/a/aspnetcore-runtime-2.1/aspnetcore-run..."
+      },
+      {
+        "package": "azure-functions-core-tools-4",
+        "version": "4.0.4590-1",
+        "architecture": "amd64",
+        "section": "devel",
+        "priority": "optional",
+        "maintainer": "Ahmed ElSayed <ahmels@microsoft.com>",
+        "description": "Azure Function Core Tools v4",
+        "homepage": "https://docs.microsoft.com/en-us/azure/azure-func...",
+        "conflicts": "azure-functions-core-tools-2, azure-functions-co...",
+        "replaces": "azure-functions-core-tools-2, azure-functions-cor...",
+        "vcs_git": "https://github.com/Azure/azure-functions-core-tool...",
+        "sha256": "a2a4f99d6d98ba0a46832570285552f2a93bab06cebbda2afc7...",
+        "size": 124417844,
+        "filename": "pool/main/a/azure-functions-core-tools-4/azure-fu..."
+      }
+    ]
+
+    $ cat Packages | jc --pkg-index-deb -r
+    [
+      {
+        "package": "aspnetcore-runtime-2.1",
+        "version": "2.1.22-1",
+        "architecture": "amd64",
+        "section": "devel",
+        "priority": "standard",
+        "installed_size": "71081",
+        "maintainer": "Microsoft <nugetaspnet@microsoft.com>",
+        "description": "Microsoft ASP.NET Core 2.1.22 Shared Framework",
+        "homepage": "https://www.asp.net/",
+        "depends": "libc6 (>= 2.14), dotnet-runtime-2.1 (>= 2.1.22)",
+        "sha256": "48d4e78a7ceff34105411172f4c3e91a0359b3929d84d26a493...",
+        "size": "21937036",
+        "filename": "pool/main/a/aspnetcore-runtime-2.1/aspnetcore-run..."
+      },
+      {
+        "package": "azure-functions-core-tools-4",
+        "version": "4.0.4590-1",
+        "architecture": "amd64",
+        "section": "devel",
+        "priority": "optional",
+        "maintainer": "Ahmed ElSayed <ahmels@microsoft.com>",
+        "description": "Azure Function Core Tools v4",
+        "homepage": "https://docs.microsoft.com/en-us/azure/azure-func...",
+        "conflicts": "azure-functions-core-tools-2, azure-functions-co...",
+        "replaces": "azure-functions-core-tools-2, azure-functions-cor...",
+        "vcs_git": "https://github.com/Azure/azure-functions-core-tool...",
+        "sha256": "a2a4f99d6d98ba0a46832570285552f2a93bab06cebbda2afc7...",
+        "size": "124417844",
+        "filename": "pool/main/a/azure-functions-core-tools-4/azure-fu..."
+      }
+    ]
+"""
+from typing import List
+from jc.jc_types import JSONDictType
+import jc.parsers.rpm_qi as rpm_qi
+
+
+class info():
+    """Provides parser metadata (version, author, etc.)"""
+    version = '1.0'
+    description = 'Debian Package Index file parser'
+    author = 'Kelly Brazil'
+    author_email = 'kellyjonbrazil@gmail.com'
+    details = 'Using the rpm-qi parser'
+    compatible = ['linux', 'darwin', 'cygwin', 'win32', 'aix', 'freebsd']
+    tags = ['file']
+
+
+__version__ = info.version
+
+
+def parse(
+    data: str,
+    raw: bool = False,
+    quiet: bool = False
+) -> List[JSONDictType]:
+    """
+    Main text parsing function
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) unprocessed output if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        List of Dictionaries. Raw or processed structured data.
+    """
+    # This parser is an alias of rpm_qi.py
+    rpm_qi.info.compatible = ['linux', 'darwin', 'cygwin', 'win32', 'aix', 'freebsd']
+    rpm_qi.info.tags = ['file']
+    return rpm_qi.parse(data, raw, quiet)

jc/parsers/proc.py

@@ -120,7 +120,7 @@ from jc.exceptions import ParseError
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.1'
+    version = '1.2'
     description = '`/proc/` file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -154,6 +154,7 @@ def parse(
     if jc.utils.has_data(data):
         # signatures
         buddyinfo_p = re.compile(r'^Node \d+, zone\s+\w+\s+(?:\d+\s+){11}\n')
+        cmdline_p = re.compile(r'^BOOT_IMAGE=')
         consoles_p = re.compile(r'^\w+\s+[\-WUR]{3} \([ECBpba ]+\)\s+\d+:\d+\n')
         cpuinfo_p = re.compile(r'^processor\t+: \d+.*bogomips\t+: \d+.\d\d\n', re.DOTALL)
         crypto_p = re.compile(r'^name\s+:.*\ndriver\s+:.*\nmodule\s+:.*\n')
@@ -212,6 +213,7 @@ def parse(
 
         procmap = {
             buddyinfo_p: 'proc_buddyinfo',
+            cmdline_p: 'proc_cmdline',
             consoles_p: 'proc_consoles',
             cpuinfo_p: 'proc_cpuinfo',
             crypto_p: 'proc_crypto',

jc/parsers/proc_cmdline.py

@@ -0,0 +1,138 @@
+"""jc - JSON Convert `/proc/cmdline` file parser
+
+Usage (cli):
+
+    $ cat /proc/cmdline | jc --proc
+
+or
+
+    $ jc /proc/cmdline
+
+or
+
+    $ cat /proc/cmdline | jc --proc-cmdline
+
+Usage (module):
+
+    import jc
+    result = jc.parse('proc_cmdline', proc_cmdline_file)
+
+Schema:
+
+    {
+      "<key>":          string,
+      "_options": [
+                        string
+      ]
+    }
+
+Examples:
+
+    $ cat /proc/cmdline | jc --proc -p
+    {
+      "BOOT_IMAGE": "clonezilla/live/vmlinuz",
+      "consoleblank": "0",
+      "keyboard-options": "grp:ctrl_shift_toggle,lctrl_shift_toggle",
+      "ethdevice-timeout": "130",
+      "toram": "filesystem.squashfs",
+      "boot": "live",
+      "edd": "on",
+      "ocs_daemonon": "ssh lighttpd",
+      "ocs_live_run": "sudo screen /usr/sbin/ocs-sr -g auto -e1 auto -e2 -batch -r -j2 -k -scr -p true restoreparts win7-64 sda1",
+      "ocs_live_extra_param": "",
+      "keyboard-layouts": "us,ru",
+      "ocs_live_batch": "no",
+      "locales": "ru_RU.UTF-8",
+      "vga": "788",
+      "net.ifnames": "0",
+      "union": "overlay",
+      "fetch": "http://10.1.1.1/tftpboot/clonezilla/live/filesystem.squashfs",
+      "ocs_postrun99": "sudo reboot",
+      "initrd": "clonezilla/live/initrd.img",
+      "_options": [
+        "config",
+        "noswap",
+        "nolocales",
+        "nomodeset",
+        "noprompt",
+        "nosplash",
+        "nodmraid",
+        "components"
+      ]
+    }
+"""
+import shlex
+from typing import List, Dict
+from jc.jc_types import JSONDictType
+import jc.utils
+
+
+class info():
+    """Provides parser metadata (version, author, etc.)"""
+    version = '1.0'
+    description = '`/proc/cmdline` file parser'
+    author = 'Kelly Brazil'
+    author_email = 'kellyjonbrazil@gmail.com'
+    compatible = ['linux']
+    tags = ['file']
+    hidden = True
+
+
+__version__ = info.version
+
+
+def _process(proc_data: JSONDictType) -> JSONDictType:
+    """
+    Final processing to conform to the schema.
+
+    Parameters:
+
+        proc_data:   (List of Dictionaries) raw structured data to process
+
+    Returns:
+
+        Dictionary. Structured to conform to the schema.
+    """
+    return proc_data
+
+
+def parse(
+    data: str,
+    raw: bool = False,
+    quiet: bool = False
+) -> JSONDictType:
+    """
+    Main text parsing function
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) unprocessed output if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        Dictionary. Raw or processed structured data.
+    """
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
+
+    raw_output: Dict = {}
+    options: List = []
+
+    if jc.utils.has_data(data):
+
+        split_line = shlex.split(data)
+
+        for item in split_line:
+            if '=' in item:
+                key, val = item.split('=', maxsplit=1)
+                raw_output[key] = val
+
+            else:
+                options.append(item)
+
+    if options:
+        raw_output['_options'] = options
+
+    return raw_output if raw else _process(raw_output)

jc/parsers/route.py

@@ -214,7 +214,7 @@ def parse(data, raw=False, quiet=False):
 
     if jc.utils.has_data(data):
         import jc.parsers.route_windows
-        if cleandata[0] in jc.parsers.route_windows.SEPERATORS:
+        if cleandata[0] in jc.parsers.route_windows.SEPARATORS:
            raw_output = jc.parsers.route_windows.parse(cleandata)
         else:
           cleandata.pop(0)  # Removing "Kernel IP routing table".

jc/parsers/route_windows.py

@@ -6,7 +6,7 @@
 import re
 from typing import List
 
-SEPERATORS = (
+SEPARATORS = (
     "===========================================================================",
     "  None"
 )
@@ -24,7 +24,7 @@ ROUTE_TYPES = ("Active Routes:", "Persistent Routes:")
 def get_lines_until_seperator(iterator):
     lines = []
     for line in iterator:
-        if line in SEPERATORS:
+        if line in SEPARATORS:
             break
         lines.append(line)
     return lines
@@ -86,7 +86,7 @@ def parse(cleandata: List[str]):
             interfaces = []
             for interface_line in data_iterator:
                 interface_line = interface_line.strip()
-                if interface_line in SEPERATORS:
+                if interface_line in SEPARATORS:
                     break
 
                 interface_match = INTERFACE_REGEX.search(interface_line)

jc/parsers/rpm_qi.py

@@ -161,7 +161,7 @@ import jc.utils
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.6'
+    version = '1.7'
     description = '`rpm -qi` command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -185,7 +185,7 @@ def _process(proc_data):
 
         List of Dictionaries. Structured data to conform to the schema.
     """
-    int_list = {'epoch', 'size'}
+    int_list = {'epoch', 'size', 'installed_size'}
 
     for entry in proc_data:
         for key in entry:
@@ -234,7 +234,7 @@ def parse(data, raw=False, quiet=False):
         for line in filter(None, data.splitlines()):
             split_line = line.split(': ', maxsplit=1)
 
-            if split_line[0].startswith('Name') and len(split_line) == 2:
+            if (split_line[0].startswith('Name') or split_line[0] == 'Package') and len(split_line) == 2:
                 this_entry = split_line[1].strip()
 
                 if this_entry != last_entry:
@@ -247,7 +247,7 @@ def parse(data, raw=False, quiet=False):
                         desc_entry = False
 
             if len(split_line) == 2:
-                entry_obj[split_line[0].strip().lower().replace(' ', '_')] = split_line[1].strip()
+                entry_obj[split_line[0].strip().lower().replace(' ', '_').replace('-', '_')] = split_line[1].strip()
 
             if line.startswith('Description :'):
                 desc_entry = True

jc/parsers/swapon.py

@@ -0,0 +1,173 @@
+"""jc - JSON Convert `swapon` command output parser
+
+Usage (cli):
+
+    $ swapon | jc --swapon
+
+or
+
+    $ jc swapon
+
+Usage (module):
+
+    import jc
+    result = jc.parse('swapon', swapon_command_output)
+
+Schema:
+
+    [
+      {
+        "name":             string,
+        "type":             string,
+        "size":             integer,
+        "used":             integer,
+        "priority":         integer
+      }
+    ]
+
+Example:
+
+    $ swapon | jc --swapon
+    [
+      {
+        "name": "/swapfile",
+        "type": "file",
+        "size": 1073741824,
+        "used": 0,
+        "priority": -2
+      }
+    ]
+"""
+from enum import Enum
+from jc.exceptions import ParseError
+import jc.utils
+from typing import List, Dict, Union
+
+
+class info:
+    """Provides parser metadata (version, author, etc.)"""
+    version = "1.0"
+    description = "`swapon` command parser"
+    author = "Roey Darwish Dror"
+    author_email = "roey.ghost@gmail.com"
+    compatible = ["linux", "freebsd"]
+    magic_commands = ["swapon"]
+    tags = ["command"]
+
+
+__version__ = info.version
+
+_Value = Union[str, int]
+_Entry = Dict[str, _Value]
+
+
+class _Column(Enum):
+    NAME = "name"
+    TYPE = "type"
+    SIZE = "size"
+    USED = "used"
+    PRIO = "priority"
+    LABEL = "label"
+    UUID = "uuid"
+
+    @classmethod
+    def from_header(cls, header: str) -> "_Column":
+        if (header == "NAME") or (header == "Filename"):
+            return cls.NAME
+        elif (header == "TYPE") or (header == "Type"):
+            return cls.TYPE
+        elif (header == "SIZE") or (header == "Size"):
+            return cls.SIZE
+        elif (header == "USED") or (header == "Used"):
+            return cls.USED
+        elif (header == "PRIO") or (header == "Priority"):
+            return cls.PRIO
+        elif header == "LABEL":
+            return cls.LABEL
+        elif header == "UUID":
+            return cls.UUID
+        else:
+            raise ParseError(f"Unknown header: {header}")
+
+
+def _parse_size(size: str) -> int:
+    power = None
+    if size[-1] == "B":
+        power = 0
+    if size[-1] == "K":
+        power = 1
+    elif size[-1] == "M":
+        power = 2
+    elif size[-1] == "G":
+        power = 3
+    elif size[-1] == "T":
+        power = 4
+
+    multiplier = 1024**power if power is not None else 1024
+
+    return (int(size[:-1]) if power is not None else int(size)) * multiplier
+
+
+def _value(value: str, column: _Column) -> _Value:
+    if column == _Column.SIZE or column == _Column.USED:
+        return _parse_size(value)
+    elif column == _Column.PRIO:
+        return int(value)
+    else:
+        return value
+
+
+def _process(proc_data: List[Dict]) -> List[Dict]:
+    """
+    Final processing to conform to the schema.
+
+    Parameters:
+
+        proc_data:   (List of Dictionaries) raw structured data to process
+
+    Returns:
+
+        List of Dictionaries. Structured to conform to the schema.
+    """
+    return proc_data
+
+
+def parse(data: str, raw: bool = False, quiet: bool = False) -> List[_Entry]:
+    """
+    Main text parsing function
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) unprocessed output if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        Dictionary. Raw or processed structured data.
+    """
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
+
+    raw_output: List[dict] = []
+
+    if jc.utils.has_data(data):
+        lines = iter(data.splitlines())
+        headers = next(lines)
+        columns = headers.split()
+        for each_line in lines:
+            line = each_line.split()
+            diff = len(columns) - len(line)
+            if not 0 <= diff <= 2:
+                raise ParseError(
+                    f"Number of columns ({len(line)}) in line does not match number of headers ({len(columns)})"
+                )
+
+            document: _Entry = {}
+            for each_column, value in zip(columns, line):
+                column = _Column.from_header(each_column)
+                document[column.value] = _value(value, column)
+
+            raw_output.append(document)
+
+    return raw_output if raw else _process(raw_output)

jc/parsers/tune2fs.py

@@ -0,0 +1,300 @@
+"""jc - JSON Convert `tune2fs -l` command output parser
+
+Usage (cli):
+
+    $ tune2fs -l /dev/xvda4 | jc --tune2fs
+
+or
+
+    $ jc tune2fs -l /dev/xvda4
+
+Usage (module):
+
+    import jc
+    result = jc.parse('tune2fs', tune2fs_command_output)
+
+Schema:
+
+    {
+      "version":                            string,
+      "filesystem_volume_name":             string,
+      "last_mounted_on":                    string,
+      "filesystem_uuid":                    string,
+      "filesystem_magic_number":            string,
+      "filesystem_revision_number":         string,
+      "filesystem_features": [
+                                            string
+      ],
+      "filesystem_flags":                   string,
+      "default_mount_options":              string,
+      "filesystem_state":                   string,
+      "errors_behavior":                    string,
+      "filesystem_os_type":                 string,
+      "inode_count":                        integer,
+      "block_count":                        integer,
+      "reserved_block_count":               integer,
+      "overhead_clusters":                  integer,
+      "free_blocks":                        integer,
+      "free_inodes":                        integer,
+      "first_block":                        integer,
+      "block_size":                         integer,
+      "fragment_size":                      integer,
+      "group_descriptor_size":              integer,
+      "reserved_gdt_blocks":                integer,
+      "blocks_per_group":                   integer,
+      "fragments_per_group":                integer,
+      "inodes_per_group":                   integer,
+      "inode_blocks_per_group":             integer,
+      "flex_block_group_size":              integer,
+      "filesystem_created":                 string,
+      "filesystem_created_epoch":           integer,
+      "filesystem_created_epoch_utc":       integer,
+      "last_mount_time":                    string,
+      "last_mount_time_epoch":              integer,
+      "last_mount_time_epoch_utc":          integer,
+      "last_write_time":                    string,
+      "last_write_time_epoch":              integer,
+      "last_write_time_epoch_utc":          integer,
+      "mount_count":                        integer,
+      "maximum_mount_count":                integer,
+      "last_checked":                       string,
+      "last_checked_epoch":                 integer,
+      "last_checked_epoch_utc":             integer,
+      "check_interval":                     string,
+      "lifetime_writes":                    string,
+      "reserved_blocks_uid":                string,
+      "reserved_blocks_gid":                string,
+      "first_inode":                        integer,
+      "inode_size":                         integer,
+      "required_extra_isize":               integer,
+      "desired_extra_isize":                integer,
+      "journal_inode":                      integer,
+      "default_directory_hash":             string,
+      "directory_hash_seed":                string,
+      "journal_backup":                     string,
+      "checksum_type":                      string,
+      "checksum":                           string
+    }
+
+Examples:
+
+    $ tune2fs | jc --tune2fs -p
+    {
+      "version": "1.46.2 (28-Feb-2021)",
+      "filesystem_volume_name": "<none>",
+      "last_mounted_on": "/home",
+      "filesystem_uuid": "5fb78e1a-b214-44e2-a309-8e35116d8dd6",
+      "filesystem_magic_number": "0xEF53",
+      "filesystem_revision_number": "1 (dynamic)",
+      "filesystem_features": [
+        "has_journal",
+        "ext_attr",
+        "resize_inode",
+        "dir_index",
+        "filetype",
+        "needs_recovery",
+        "extent",
+        "64bit",
+        "flex_bg",
+        "sparse_super",
+        "large_file",
+        "huge_file",
+        "dir_nlink",
+        "extra_isize",
+        "metadata_csum"
+      ],
+      "filesystem_flags": "signed_directory_hash",
+      "default_mount_options": "user_xattr acl",
+      "filesystem_state": "clean",
+      "errors_behavior": "Continue",
+      "filesystem_os_type": "Linux",
+      "inode_count": 3932160,
+      "block_count": 15728640,
+      "reserved_block_count": 786432,
+      "free_blocks": 15198453,
+      "free_inodes": 3864620,
+      "first_block": 0,
+      "block_size": 4096,
+      "fragment_size": 4096,
+      "group_descriptor_size": 64,
+      "reserved_gdt_blocks": 1024,
+      "blocks_per_group": 32768,
+      "fragments_per_group": 32768,
+      "inodes_per_group": 8192,
+      "inode_blocks_per_group": 512,
+      "flex_block_group_size": 16,
+      "filesystem_created": "Mon Apr  6 15:10:37 2020",
+      "last_mount_time": "Mon Sep 19 15:16:20 2022",
+      "last_write_time": "Mon Sep 19 15:16:20 2022",
+      "mount_count": 14,
+      "maximum_mount_count": -1,
+      "last_checked": "Fri Apr  8 15:24:22 2022",
+      "check_interval": "0 (<none>)",
+      "lifetime_writes": "203 GB",
+      "reserved_blocks_uid": "0 (user root)",
+      "reserved_blocks_gid": "0 (group root)",
+      "first_inode": 11,
+      "inode_size": 256,
+      "required_extra_isize": 32,
+      "desired_extra_isize": 32,
+      "journal_inode": 8,
+      "default_directory_hash": "half_md4",
+      "directory_hash_seed": "67d5358d-723d-4ce3-b3c0-30ddb433ad9e",
+      "journal_backup": "inode blocks",
+      "checksum_type": "crc32c",
+      "checksum": "0x7809afff",
+      "filesystem_created_epoch": 1586211037,
+      "filesystem_created_epoch_utc": null,
+      "last_mount_time_epoch": 1663625780,
+      "last_mount_time_epoch_utc": null,
+      "last_write_time_epoch": 1663625780,
+      "last_write_time_epoch_utc": null,
+      "last_checked_epoch": 1649456662,
+      "last_checked_epoch_utc": null
+    }
+
+    $ tune2fs | jc --tune2fs -p -r
+    {
+      "version": "1.46.2 (28-Feb-2021)",
+      "filesystem_volume_name": "<none>",
+      "last_mounted_on": "/home",
+      "filesystem_uuid": "5fb78e1a-b214-44e2-a309-8e35116d8dd6",
+      "filesystem_magic_number": "0xEF53",
+      "filesystem_revision_number": "1 (dynamic)",
+      "filesystem_features": "has_journal ext_attr resize_inode dir_index filetype needs_recovery extent 64bit flex_bg sparse_super large_file huge_file dir_nlink extra_isize metadata_csum",
+      "filesystem_flags": "signed_directory_hash",
+      "default_mount_options": "user_xattr acl",
+      "filesystem_state": "clean",
+      "errors_behavior": "Continue",
+      "filesystem_os_type": "Linux",
+      "inode_count": "3932160",
+      "block_count": "15728640",
+      "reserved_block_count": "786432",
+      "free_blocks": "15198453",
+      "free_inodes": "3864620",
+      "first_block": "0",
+      "block_size": "4096",
+      "fragment_size": "4096",
+      "group_descriptor_size": "64",
+      "reserved_gdt_blocks": "1024",
+      "blocks_per_group": "32768",
+      "fragments_per_group": "32768",
+      "inodes_per_group": "8192",
+      "inode_blocks_per_group": "512",
+      "flex_block_group_size": "16",
+      "filesystem_created": "Mon Apr  6 15:10:37 2020",
+      "last_mount_time": "Mon Sep 19 15:16:20 2022",
+      "last_write_time": "Mon Sep 19 15:16:20 2022",
+      "mount_count": "14",
+      "maximum_mount_count": "-1",
+      "last_checked": "Fri Apr  8 15:24:22 2022",
+      "check_interval": "0 (<none>)",
+      "lifetime_writes": "203 GB",
+      "reserved_blocks_uid": "0 (user root)",
+      "reserved_blocks_gid": "0 (group root)",
+      "first_inode": "11",
+      "inode_size": "256",
+      "required_extra_isize": "32",
+      "desired_extra_isize": "32",
+      "journal_inode": "8",
+      "default_directory_hash": "half_md4",
+      "directory_hash_seed": "67d5358d-723d-4ce3-b3c0-30ddb433ad9e",
+      "journal_backup": "inode blocks",
+      "checksum_type": "crc32c",
+      "checksum": "0x7809afff"
+    }
+"""
+from typing import Dict
+from jc.jc_types import JSONDictType
+import jc.utils
+
+
+class info():
+    """Provides parser metadata (version, author, etc.)"""
+    version = '1.0'
+    description = '`tune2fs -l` command parser'
+    author = 'Kelly Brazil'
+    author_email = 'kellyjonbrazil@gmail.com'
+    compatible = ['linux']
+    tags = ['command']
+    magic_commands = ['tune2fs -l']
+
+
+__version__ = info.version
+
+
+def _process(proc_data: JSONDictType) -> JSONDictType:
+    """
+    Final processing to conform to the schema.
+
+    Parameters:
+
+        proc_data:   (Dictionary) raw structured data to process
+
+    Returns:
+
+        Dictionary. Structured to conform to the schema.
+    """
+    int_list = {'inode_count', 'block_count', 'reserved_block_count', 'free_blocks',
+                'free_inodes', 'first_block', 'block_size', 'fragment_size',
+                'group_descriptor_size', 'reserved_gdt_blocks', 'blocks_per_group',
+                'fragments_per_group', 'inodes_per_group', 'inode_blocks_per_group',
+                'flex_block_group_size', 'mount_count', 'maximum_mount_count',
+                'first_inode', 'inode_size', 'required_extra_isize', 'desired_extra_isize',
+                'journal_inode', 'overhead_clusters'}
+
+    datetime_list = {'filesystem_created', 'last_mount_time', 'last_write_time', 'last_checked'}
+
+    for key in proc_data:
+        if key in int_list:
+            proc_data[key] = jc.utils.convert_to_int(proc_data[key])
+
+    for key in proc_data.copy():
+        if key in datetime_list:
+            dt = jc.utils.timestamp(proc_data[key], (1000,))
+            proc_data[key + '_epoch'] = dt.naive
+            proc_data[key + '_epoch_utc'] = dt.utc
+
+    if 'filesystem_features' in proc_data:
+        proc_data['filesystem_features'] = proc_data['filesystem_features'].split()
+
+    return proc_data
+
+
+def parse(
+    data: str,
+    raw: bool = False,
+    quiet: bool = False
+) -> JSONDictType:
+    """
+    Main text parsing function
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) unprocessed output if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        Dictionary. Raw or processed structured data.
+    """
+    jc.utils.compatibility(__name__, info.compatible, quiet)
+    jc.utils.input_type_check(data)
+
+    raw_output: Dict = {}
+
+    if jc.utils.has_data(data):
+
+        for line in filter(None, data.splitlines()):
+
+            if line.startswith('tune2fs '):
+                raw_output['version'] = line.split(maxsplit=1)[1]
+                continue
+
+            linesplit = line.split(':', maxsplit=1)
+            key = linesplit[0].lower().replace(' ', '_').replace('#', 'number')
+            val = linesplit[1].strip()
+            raw_output[key] = val
+
+    return raw_output if raw else _process(raw_output)

jc/parsers/ver.py

@@ -2,7 +2,7 @@
 
 Best-effort attempt to parse various styles of version numbers. This parser
 is based off of the version parser included in the CPython distutils
-libary.
+library.
 
 If the version string conforms to some de facto-standard versioning rules
 followed by many developers a `strict` key will be present in the output

jc/parsers/vmstat.py

@@ -121,12 +121,16 @@ Examples:
       }
     ]
 """
+import re
 import jc.utils
 
+PROCS_HEADER_RE = re.compile(r'^-*procs-* ')
+DISK_HEADER_RE = re.compile(r'^-*disk-* ')
+
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.3'
+    version = '1.4'
     description = '`vmstat` command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -203,18 +207,18 @@ def parse(data, raw=False, quiet=False):
         for line in filter(None, data.splitlines()):
 
             # detect output type
-            if not procs and not disk and line.startswith('procs'):
+            if not procs and not disk and PROCS_HEADER_RE.match(line):
                 procs = True
                 tstamp = '-timestamp-' in line
                 continue
 
-            if not procs and not disk and line.startswith('disk'):
+            if not procs and not disk and DISK_HEADER_RE.match(line):
                 disk = True
                 tstamp = '-timestamp-' in line
                 continue
 
             # skip header rows
-            if (procs or disk) and (line.startswith('procs') or line.startswith('disk')):
+            if (procs or disk) and (PROCS_HEADER_RE.match(line) or DISK_HEADER_RE.match(line)):
                 continue
 
             if 'swpd' in line and 'free' in line and 'buff' in line and 'cache' in line:

jc/parsers/vmstat_s.py

@@ -91,16 +91,20 @@ Examples:
     {"runnable_procs":"2","uninterruptible_sleeping_procs":"0","virtua...}
     ...
 """
+import re
 import jc.utils
 from jc.streaming import (
     add_jc_meta, streaming_input_type_check, streaming_line_input_type_check, raise_or_yield
 )
 from jc.exceptions import ParseError
 
+PROCS_HEADER_RE = re.compile(r'^-*procs-* ')
+DISK_HEADER_RE = re.compile(r'^-*disk-* ')
+
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.2'
+    version = '1.3'
     description = '`vmstat` command streaming parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -182,18 +186,18 @@ def parse(data, raw=False, quiet=False, ignore_exceptions=False):
                 continue
 
             # detect output type
-            if not procs and not disk and line.startswith('procs'):
+            if not procs and not disk and PROCS_HEADER_RE.match(line):
                 procs = True
                 tstamp = '-timestamp-' in line
                 continue
 
-            if not procs and not disk and line.startswith('disk'):
+            if not procs and not disk and DISK_HEADER_RE.match(line):
                 disk = True
                 tstamp = '-timestamp-' in line
                 continue
 
             # skip header rows
-            if (procs or disk) and (line.startswith('procs') or line.startswith('disk')):
+            if (procs or disk) and (PROCS_HEADER_RE.match(line) or DISK_HEADER_RE.match(line)):
                 continue
 
             if 'swpd' in line and 'free' in line and 'buff' in line and 'cache' in line:

jc/parsers/who.py

@@ -136,7 +136,7 @@ import jc.utils
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.7'
+    version = '1.8'
     description = '`who` command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -272,6 +272,13 @@ def parse(data, raw=False, quiet=False):
                 output_line['time'] = ' '.join([linedata.pop(0),
                                                 linedata.pop(0)])
 
+            # if the rest of the data is within parens, then it's the remote IP or console
+            if len(linedata) > 1 and ' '.join(linedata).startswith('(') and ' '.join(linedata).endswith(')'):
+                output_line['from'] = ' '.join(linedata)[1:-1]
+                raw_output.append(output_line)
+                linedata = []
+                continue
+
             # if just one more field, then it's the remote IP
             if len(linedata) == 1:
                 output_line['from'] = linedata[0].replace('(', '').replace(')', '')
@@ -296,7 +303,4 @@ def parse(data, raw=False, quiet=False):
 
             raw_output.append(output_line)
 
-    if raw:
-        return raw_output
-    else:
-        return _process(raw_output)
+    return raw_output if raw else _process(raw_output)

jc/parsers/x509_cert.py

@@ -413,7 +413,7 @@ from jc.parsers.asn1crypto import pem, x509, jc_global
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.2'
+    version = '1.3'
     description = 'X.509 PEM and DER certificate file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -477,7 +477,10 @@ def _fix_objects(obj):
                 # according to the spec this field can be string or integer
                 if isinstance(v, int):
                     v_str = str(v)
-                    v_hex = _b2a(_i2b(v))
+                    if v < 0:
+                        v_hex = "(Negative)" + _b2a(_i2b(abs(v)))
+                    else:
+                        v_hex = _b2a(_i2b(v))
                 else:
                     v_str = str(v)
                     v_hex = _b2a(v_str.encode())

jc/parsers/xml.py

@@ -81,7 +81,7 @@ except Exception:
 
 class info():
     """Provides parser metadata (version, author, etc.)"""
-    version = '1.7'
+    version = '1.9'
     description = 'XML file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -105,13 +105,18 @@ def _process(proc_data, has_data=False):
 
         Dictionary representing an XML document.
     """
-    raw_output = []
+    proc_output = []
 
     if has_data:
         # standard output with @ prefix for attributes
-        raw_output = xmltodict.parse(proc_data, dict_constructor=dict)
+        try:
+            proc_output = xmltodict.parse(proc_data,
+                                          dict_constructor=dict,
+                                          process_comments=True)
+        except (ValueError, TypeError):
+            proc_output = xmltodict.parse(proc_data, dict_constructor=dict)
 
-    return raw_output
+    return proc_output
 
 
 def parse(data, raw=False, quiet=False):
@@ -137,10 +142,17 @@ def parse(data, raw=False, quiet=False):
     if jc.utils.has_data(data):
         has_data = True
 
-    if raw:
-        if has_data:
-            # modified output with _ prefix for attributes
-            raw_output = xmltodict.parse(data, dict_constructor=dict, attr_prefix='_')
+    if raw and has_data:
+        # modified output with _ prefix for attributes
+        try:
+            raw_output = xmltodict.parse(data,
+                                         dict_constructor=dict,
+                                         process_comments=True,
+                                         attr_prefix='_')
+        except (ValueError, TypeError):
+            raw_output = xmltodict.parse(data,
+                                         dict_constructor=dict,
+                                         attr_prefix='_')
 
         return raw_output
 

jc/parsers/xrandr.py

@@ -26,22 +26,24 @@ Schema:
           "current_height":                    integer,
           "maximum_width":                     integer,
           "maximum_height":                    integer,
-          "associated_device": {
-            "associated_modes": [
-              {
-                "resolution_width":            integer,
-                "resolution_height":           integer,
-                "is_high_resolution":          boolean,
-                "frequencies": [
-                  {
-                    "frequency":               float,
-                    "is_current":              boolean,
-                    "is_preferred":            boolean
-                  }
-                ]
-              }
-            ]
-          },
+          "devices": [
+            {
+              "modes": [
+                {
+                  "resolution_width":          integer,
+                  "resolution_height":         integer,
+                  "is_high_resolution":        boolean,
+                  "frequencies": [
+                    {
+                      "frequency":             float,
+                      "is_current":            boolean,
+                      "is_preferred":          boolean
+                    }
+                  ]
+                }
+              ]
+            }
+          ],
           "is_connected":                      boolean,
           "is_primary":                        boolean,
           "device_name":                       string,
@@ -57,24 +59,6 @@ Schema:
           "rotation":                          string,
           "reflection":                        string
         }
-      ],
-      "unassociated_devices": [
-        {
-          "associated_modes": [
-            {
-              "resolution_width":              integer,
-              "resolution_height":             integer,
-              "is_high_resolution":            boolean,
-              "frequencies": [
-                {
-                  "frequency":                 float,
-                  "is_current":                boolean,
-                  "is_preferred":              boolean
-                }
-              ]
-            }
-          ]
-        }
       ]
     }
 
@@ -91,53 +75,54 @@ Examples:
           "current_height": 1080,
           "maximum_width": 32767,
           "maximum_height": 32767,
-          "associated_device": {
-            "associated_modes": [
-              {
-                "resolution_width": 1920,
-                "resolution_height": 1080,
-                "is_high_resolution": false,
-                "frequencies": [
-                  {
-                    "frequency": 60.03,
-                    "is_current": true,
-                    "is_preferred": true
-                  },
-                  {
-                    "frequency": 59.93,
-                    "is_current": false,
-                    "is_preferred": false
-                  }
-                ]
-              },
-              {
-                "resolution_width": 1680,
-                "resolution_height": 1050,
-                "is_high_resolution": false,
-                "frequencies": [
-                  {
-                    "frequency": 59.88,
-                    "is_current": false,
-                    "is_preferred": false
-                  }
-                ]
-              }
-            ],
-            "is_connected": true,
-            "is_primary": true,
-            "device_name": "eDP1",
-            "resolution_width": 1920,
-            "resolution_height": 1080,
-            "offset_width": 0,
-            "offset_height": 0,
-            "dimension_width": 310,
-            "dimension_height": 170,
-            "rotation": "normal",
-            "reflection": "normal"
-          }
+          "devices": [
+            {
+              "modes": [
+                {
+                  "resolution_width": 1920,
+                  "resolution_height": 1080,
+                  "is_high_resolution": false,
+                  "frequencies": [
+                    {
+                      "frequency": 60.03,
+                      "is_current": true,
+                      "is_preferred": true
+                    },
+                    {
+                      "frequency": 59.93,
+                      "is_current": false,
+                      "is_preferred": false
+                    }
+                  ]
+                },
+                {
+                  "resolution_width": 1680,
+                  "resolution_height": 1050,
+                  "is_high_resolution": false,
+                  "frequencies": [
+                    {
+                      "frequency": 59.88,
+                      "is_current": false,
+                      "is_preferred": false
+                    }
+                  ]
+                }
+              ],
+              "is_connected": true,
+              "is_primary": true,
+              "device_name": "eDP1",
+              "resolution_width": 1920,
+              "resolution_height": 1080,
+              "offset_width": 0,
+              "offset_height": 0,
+              "dimension_width": 310,
+              "dimension_height": 170,
+              "rotation": "normal",
+              "reflection": "normal"
+            }
+          ]
         }
-      ],
-      "unassociated_devices": []
+      ]
     }
 
     $ xrandr --properties | jc --xrandr -p
@@ -151,56 +136,57 @@ Examples:
           "current_height": 1080,
           "maximum_width": 32767,
           "maximum_height": 32767,
-          "associated_device": {
-            "associated_modes": [
-              {
-                "resolution_width": 1920,
-                "resolution_height": 1080,
-                "is_high_resolution": false,
-                "frequencies": [
-                  {
-                    "frequency": 60.03,
-                    "is_current": true,
-                    "is_preferred": true
-                  },
-                  {
-                    "frequency": 59.93,
-                    "is_current": false,
-                    "is_preferred": false
-                  }
-                ]
-              },
-              {
-                "resolution_width": 1680,
-                "resolution_height": 1050,
-                "is_high_resolution": false,
-                "frequencies": [
-                  {
-                    "frequency": 59.88,
-                    "is_current": false,
-                    "is_preferred": false
-                  }
-                ]
-              }
-            ],
-            "is_connected": true,
-            "is_primary": true,
-            "device_name": "eDP1",
-            "model_name": "ASUS VW193S",
-            "product_id": "54297",
-            "serial_number": "78L8021107",
-            "resolution_width": 1920,
-            "resolution_height": 1080,
-            "offset_width": 0,
-            "offset_height": 0,
-            "dimension_width": 310,
-            "dimension_height": 170,
-            "rotation": "normal",
-            "reflection": "normal"
-          }
+          "devices": [
+            {
+              "modes": [
+                {
+                  "resolution_width": 1920,
+                  "resolution_height": 1080,
+                  "is_high_resolution": false,
+                  "frequencies": [
+                    {
+                      "frequency": 60.03,
+                      "is_current": true,
+                      "is_preferred": true
+                    },
+                    {
+                      "frequency": 59.93,
+                      "is_current": false,
+                      "is_preferred": false
+                    }
+                  ]
+                },
+                {
+                  "resolution_width": 1680,
+                  "resolution_height": 1050,
+                  "is_high_resolution": false,
+                  "frequencies": [
+                    {
+                      "frequency": 59.88,
+                      "is_current": false,
+                      "is_preferred": false
+                    }
+                  ]
+                }
+              ],
+              "is_connected": true,
+              "is_primary": true,
+              "device_name": "eDP1",
+              "model_name": "ASUS VW193S",
+              "product_id": "54297",
+              "serial_number": "78L8021107",
+              "resolution_width": 1920,
+              "resolution_height": 1080,
+              "offset_width": 0,
+              "offset_height": 0,
+              "dimension_width": 310,
+              "dimension_height": 170,
+              "rotation": "normal",
+              "reflection": "normal"
+            }
+          ]
         }
-      ],
-      "unassociated_devices": []
+      ]
     }
 """
 import re
@@ -212,18 +198,47 @@ from jc.parsers.pyedid.helpers.edid_helper import EdidHelper
 
 class info:
     """Provides parser metadata (version, author, etc.)"""
-    version = "1.2"
+    version = "1.4"
     description = "`xrandr` command parser"
     author = "Kevin Lyter"
-    author_email = "lyter_git at sent.com"
-    details = 'Using parts of the pyedid library at https://github.com/jojonas/pyedid.'
+    author_email = "code (at) lyterk.com"
+    details = "Using parts of the pyedid library at https://github.com/jojonas/pyedid."
     compatible = ["linux", "darwin", "cygwin", "aix", "freebsd"]
     magic_commands = ["xrandr"]
-    tags = ['command']
+    tags = ["command"]
 
 
 __version__ = info.version
 
+# keep parsing state so we know which parsers have already tried the line
+# Structure is:
+# {
+#   <line_string>: [
+#     <parser_string>
+#   ]
+# }
+#
+# Where <line_string> is the xrandr output line to be checked and <parser_string>
+# can contain "screen", "device", or "model"
+parse_state: Dict[str, List] = {}
+
+
+def _was_parsed(line: str, parser: str) -> bool:
+    """
+    Check if entered parser has already parsed. If so return True.
+    If not, return false and add the parser to the list for the line entry.
+    """
+    if line in parse_state:
+        if parser in parse_state[line]:
+            return True
+
+        parse_state[line].append(parser)
+        return False
+
+    parse_state[line] = [parser]
+    return False
+
+
 try:
     from typing import TypedDict
 
@@ -267,7 +282,7 @@ try:
             "offset_height": int,
             "dimension_width": int,
             "dimension_height": int,
-            "associated_modes": List[Mode],
+            "modes": List[Mode],
             "rotation": str,
             "reflection": str,
         },
@@ -282,14 +297,13 @@ try:
             "current_height": int,
             "maximum_width": int,
             "maximum_height": int,
-            "associated_device": Device,
+            "devices": List[Device],
         },
     )
     Response = TypedDict(
         "Response",
         {
             "screens": List[Screen],
-            "unassociated_devices": List[Device],
         },
     )
 except ImportError:
@@ -311,20 +325,27 @@ _screen_pattern = (
 
 def _parse_screen(next_lines: List[str]) -> Optional[Screen]:
     next_line = next_lines.pop()
+
+    if _was_parsed(next_line, 'screen'):
+        return None
+
     result = re.match(_screen_pattern, next_line)
     if not result:
         next_lines.append(next_line)
         return None
 
     raw_matches = result.groupdict()
-    screen: Screen = {}
+
+    screen: Screen = {"devices": []}
     for k, v in raw_matches.items():
         screen[k] = int(v)
 
-    if next_lines:
+    while next_lines:
         device: Optional[Device] = _parse_device(next_lines)
-        if device:
-            screen["associated_device"] = device
+        if not device:
+            break
+        else:
+            screen["devices"].append(device)
 
     return screen
 
@@ -340,8 +361,8 @@ _device_pattern = (
     + r"\+(?P<offset_width>\d+)\+(?P<offset_height>\d+))? "
     + r"(?P<rotation>(normal|right|left|inverted)?) ?"
     + r"(?P<reflection>(X axis|Y axis|X and Y axis)?) ?"
-    + r"\(normal left inverted right x axis y axis\)"
-    + r"( ((?P<dimension_width>\d+)mm x (?P<dimension_height>\d+)mm)?)?"
+    + r"(\(normal left inverted right x axis y axis\))?"
+    + r"( ?((?P<dimension_width>\d+)mm x (?P<dimension_height>\d+)mm)?)?"
 )
 
 
@@ -350,6 +371,10 @@ def _parse_device(next_lines: List[str], quiet: bool = False) -> Optional[Device
         return None
 
     next_line = next_lines.pop()
+
+    if _was_parsed(next_line, 'device'):
+        return None
+
     result = re.match(_device_pattern, next_line)
     if not result:
         next_lines.append(next_line)
@@ -358,7 +383,7 @@ def _parse_device(next_lines: List[str], quiet: bool = False) -> Optional[Device
     matches = result.groupdict()
 
     device: Device = {
-        "associated_modes": [],
+        "modes": [],
         "is_connected": matches["is_connected"] == "connected",
         "is_primary": matches["is_primary"] is not None
         and len(matches["is_primary"]) > 0,
@@ -367,14 +392,21 @@ def _parse_device(next_lines: List[str], quiet: bool = False) -> Optional[Device
         "reflection": matches["reflection"] or "normal",
     }
     for k, v in matches.items():
-        if k not in {"is_connected", "is_primary", "device_name", "rotation", "reflection"}:
+        if k not in {
+            "is_connected",
+            "is_primary",
+            "device_name",
+            "rotation",
+            "reflection",
+        }:
             try:
                 if v:
                     device[k] = int(v)
-            except ValueError and not quiet:
-                jc.utils.warning_message(
-                    [f"{next_line} : {k} - {v} is not int-able"]
-                )
+            except ValueError:
+                if not quiet:
+                    jc.utils.warning_message(
+                        [f"{next_line} : {k} - {v} is not int-able"]
+                    )
 
     model: Optional[Model] = _parse_model(next_lines, quiet)
     if model:
@@ -386,7 +418,7 @@ def _parse_device(next_lines: List[str], quiet: bool = False) -> Optional[Device
         next_line = next_lines.pop()
         next_mode: Optional[Mode] = _parse_mode(next_line)
         if next_mode:
-            device["associated_modes"].append(next_mode)
+            device["modes"].append(next_mode)
         else:
             if re.match(_device_pattern, next_line):
                 next_lines.append(next_line)
@@ -412,6 +444,10 @@ def _parse_model(next_lines: List[str], quiet: bool = False) -> Optional[Model]:
         return None
 
     next_line = next_lines.pop()
+
+    if _was_parsed(next_line, 'model'):
+        return None
+
     if not re.match(_edid_head_pattern, next_line):
         next_lines.append(next_line)
         return None
@@ -448,6 +484,7 @@ _frequencies_pattern = r"(((?P<frequency>\d+\.\d+)(?P<star>\*| |)(?P<plus>\+?)?)
 def _parse_mode(line: str) -> Optional[Mode]:
     result = re.match(_mode_pattern, line)
     frequencies: List[Frequency] = []
+
     if not result:
         return None
 
@@ -481,7 +518,7 @@ def _parse_mode(line: str) -> Optional[Mode]:
     return mode
 
 
-def parse(data: str, raw: bool =False, quiet: bool =False) -> Dict:
+def parse(data: str, raw: bool = False, quiet: bool = False) -> Dict:
     """
     Main text parsing function
 
@@ -500,19 +537,13 @@ def parse(data: str, raw: bool =False, quiet: bool =False) -> Dict:
 
     linedata = data.splitlines()
     linedata.reverse()  # For popping
-    result: Response = {"screens": [], "unassociated_devices": []}
+    result: Dict = {}
 
     if jc.utils.has_data(data):
+        result = {"screens": []}
         while linedata:
             screen = _parse_screen(linedata)
             if screen:
                 result["screens"].append(screen)
-            else:
-                device = _parse_device(linedata, quiet)
-                if device:
-                    result["unassociated_devices"].append(device)
-
-    if not result["unassociated_devices"] and not result["screens"]:
-        return {}
 
     return result

jc/utils.py

@@ -3,6 +3,8 @@ import sys
 import re
 import locale
 import shutil
+from collections import namedtuple
+from numbers import Number
 from datetime import datetime, timezone
 from textwrap import TextWrapper
 from functools import lru_cache
@@ -274,6 +276,117 @@ def convert_to_bool(value: object) -> bool:
     return False
 
 
+# convert_size_to_int from https://github.com/xolox/python-humanfriendly
+
+# Copyright (c) 2021 Peter Odding
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+def convert_size_to_int(size: str, binary: bool = False) -> Optional[int]:
+    """
+    Parse a human readable data size and return the number of bytes.
+
+    Parameters:
+
+        size:           (string) The human readable file size to parse.
+        binary:         (boolean) `True` to use binary multiples of bytes
+                        (base-2) for ambiguous unit symbols and names,
+                        `False` to use decimal multiples of bytes (base-10).
+    Returns:
+
+        integer/None    Integer if successful conversion, otherwise None
+
+    This function knows how to parse sizes in bytes, kilobytes, megabytes,
+    gigabytes, terabytes and petabytes. Some examples:
+
+        >>> convert_size_to_int('42')
+        42
+        >>> convert_size_to_int('13b')
+        13
+        >>> convert_size_to_int('5 bytes')
+        5
+        >>> convert_size_to_int('1 KB')
+        1000
+        >>> convert_size_to_int('1 kilobyte')
+        1000
+        >>> convert_size_to_int('1 KiB')
+        1024
+        >>> convert_size_to_int('1 KB', binary=True)
+        1024
+        >>> convert_size_to_int('1.5 GB')
+        1500000000
+        >>> convert_size_to_int('1.5 GB', binary=True)
+        1610612736
+    """
+    def tokenize(text: str) -> List[str]:
+        tokenized_input: List = []
+        for token in re.split(r'(\d+(?:\.\d+)?)', text):
+            token = token.strip()
+            if re.match(r'\d+\.\d+', token):
+                tokenized_input.append(float(token))
+            elif token.isdigit():
+                tokenized_input.append(int(token))
+            elif token:
+                tokenized_input.append(token)
+        return tokenized_input
+
+    SizeUnit = namedtuple('SizeUnit', 'divider, symbol, name')
+    CombinedUnit = namedtuple('CombinedUnit', 'decimal, binary')
+    disk_size_units = (
+        CombinedUnit(SizeUnit(1000**1, 'KB', 'kilobyte'), SizeUnit(1024**1, 'KiB', 'kibibyte')),
+        CombinedUnit(SizeUnit(1000**2, 'MB', 'megabyte'), SizeUnit(1024**2, 'MiB', 'mebibyte')),
+        CombinedUnit(SizeUnit(1000**3, 'GB', 'gigabyte'), SizeUnit(1024**3, 'GiB', 'gibibyte')),
+        CombinedUnit(SizeUnit(1000**4, 'TB', 'terabyte'), SizeUnit(1024**4, 'TiB', 'tebibyte')),
+        CombinedUnit(SizeUnit(1000**5, 'PB', 'petabyte'), SizeUnit(1024**5, 'PiB', 'pebibyte')),
+        CombinedUnit(SizeUnit(1000**6, 'EB', 'exabyte'), SizeUnit(1024**6, 'EiB', 'exbibyte')),
+        CombinedUnit(SizeUnit(1000**7, 'ZB', 'zettabyte'), SizeUnit(1024**7, 'ZiB', 'zebibyte')),
+        CombinedUnit(SizeUnit(1000**8, 'YB', 'yottabyte'), SizeUnit(1024**8, 'YiB', 'yobibyte')),
+    )
+    tokens = tokenize(size)
+    if tokens and isinstance(tokens[0], Number):
+        # Get the normalized unit (if any) from the tokenized input.
+        normalized_unit = tokens[1].lower() if len(tokens) == 2 and isinstance(tokens[1], str) else ''
+        # If the input contains only a number, it's assumed to be the number of
+        # bytes. The second token can also explicitly reference the unit bytes.
+        if len(tokens) == 1 or normalized_unit.startswith('b'):
+            return int(tokens[0])
+        # Otherwise we expect two tokens: A number and a unit.
+        if normalized_unit:
+            # Convert plural units to singular units, for details:
+            # https://github.com/xolox/python-humanfriendly/issues/26
+            normalized_unit = normalized_unit.rstrip('s')
+            for unit in disk_size_units:
+                # First we check for unambiguous symbols (KiB, MiB, GiB, etc)
+                # and names (kibibyte, mebibyte, gibibyte, etc) because their
+                # handling is always the same.
+                if normalized_unit in (unit.binary.symbol.lower(), unit.binary.name.lower()):
+                    return int(tokens[0] * unit.binary.divider)
+                # Now we will deal with ambiguous prefixes (K, M, G, etc),
+                # symbols (KB, MB, GB, etc) and names (kilobyte, megabyte,
+                # gigabyte, etc) according to the caller's preference.
+                if (normalized_unit in (unit.decimal.symbol.lower(), unit.decimal.name.lower()) or
+                        normalized_unit.startswith(unit.decimal.symbol[0].lower())):
+                    return int(tokens[0] * (unit.binary.divider if binary else unit.decimal.divider))
+    # We failed to parse the size specification.
+    return None
+
+
 def input_type_check(data: object) -> None:
     """Ensure input data is a string. Raises `TypeError` if not."""
     if not isinstance(data, str):

man/jc.1

@@ -1,4 +1,4 @@
-.TH jc 1 2023-07-30 1.23.4 "JSON Convert"
+.TH jc 1 2023-12-17 1.24.0 "JSON Convert"
 .SH NAME
 \fBjc\fP \- JSON Convert JSONifies the output of many CLI tools, file-types,
 and strings
@@ -147,6 +147,11 @@ CSV file streaming parser
 \fB--datetime-iso\fP
 ISO 8601 Datetime string parser
 
+.TP
+.B
+\fB--debconf-show\fP
+`debconf-show` command parser
+
 .TP
 .B
 \fB--df\fP
@@ -267,6 +272,11 @@ hashsum command parser (`md5sum`, `shasum`, etc.)
 \fB--history\fP
 `history` command parser
 
+.TP
+.B
+\fB--host\fP
+`host` command parser
+
 .TP
 .B
 \fB--hosts\fP
@@ -317,11 +327,6 @@ IPv4 and IPv6 Address string parser
 \fB--ip-route\fP
 `ip route` command parser
 
-.TP
-.B
-\fB--iso-datetime\fP
-Deprecated - please use datetime-iso
-
 .TP
 .B
 \fB--iw-scan\fP
@@ -372,6 +377,11 @@ Key/Value file and string parser
 \fB--lsattr\fP
 `lsattr` command parser
 
+.TP
+.B
+\fB--lsb-release\fP
+`lsb_release` command parser
+
 .TP
 .B
 \fB--lsblk\fP
@@ -432,6 +442,11 @@ M3U and M3U8 file parser
 \fB--nmcli\fP
 `nmcli` command parser
 
+.TP
+.B
+\fB--nsd-control\fP
+`nsd-control` command parser
+
 .TP
 .B
 \fB--ntpq\fP
@@ -447,6 +462,11 @@ openvpn-status.log file parser
 \fB--os-prober\fP
 `os-prober` command parser
 
+.TP
+.B
+\fB--os-release\fP
+`/etc/os-release` file parser
+
 .TP
 .B
 \fB--passwd\fP
@@ -492,6 +512,16 @@ PostgreSQL password file parser
 \fB--pip-show\fP
 `pip show` command parser
 
+.TP
+.B
+\fB--pkg-index-apk\fP
+Alpine Linux Package Index file parser
+
+.TP
+.B
+\fB--pkg-index-deb\fP
+Debian Package Index file parser
+
 .TP
 .B
 \fB--plist\fP
@@ -512,6 +542,11 @@ PLIST file parser
 \fB--proc-buddyinfo\fP
 `/proc/buddyinfo` file parser
 
+.TP
+.B
+\fB--proc-cmdline\fP
+`/proc/cmdline` file parser
+
 .TP
 .B
 \fB--proc-consoles\fP
@@ -832,6 +867,11 @@ SRT file parser
 \fB--stat-s\fP
 `stat` command streaming parser
 
+.TP
+.B
+\fB--swapon\fP
+`swapon` command parser
+
 .TP
 .B
 \fB--sysctl\fP
@@ -922,6 +962,11 @@ TOML file parser
 \fB--traceroute\fP
 `traceroute` and `traceroute6` command parser
 
+.TP
+.B
+\fB--tune2fs\fP
+`tune2fs -l` command parser
+
 .TP
 .B
 \fB--udevadm\fP

readmegen.py

@@ -7,7 +7,6 @@ from jinja2 import Environment, FileSystemLoader
 file_loader = FileSystemLoader('templates')
 env = Environment(loader=file_loader)
 template = env.get_template('readme_template')
-# output = template.render(jc=jc.cli.about_jc())
 output = template.render(parsers=jc.lib.all_parser_info(),
                          info=jc.cli.JcCli.about_jc())
 

setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r') as f:
 
 setuptools.setup(
     name='jc',
-    version='1.23.4',
+    version='1.24.0',
     author='Kelly Brazil',
     author_email='kellyjonbrazil@gmail.com',
     description='Converts the output of popular command-line tools and file-types to JSON.',

templates/readme_template

@@ -120,6 +120,7 @@ pip3 install jc
 | NixOS linux                          | `nix-env -iA nixpkgs.jc` or `nix-env -iA nixos.jc`                            |
 | Guix System linux                    | `guix install jc`                                                             |
 | Gentoo Linux                         | `emerge dev-python/jc`                                                        |
+| Photon linux                         | `tdnf install jc`                                                             |
 | macOS                                | `brew install jc`                                                             |
 | FreeBSD                              | `portsnap fetch update && cd /usr/ports/textproc/py-jc && make install clean` |
 | Ansible filter plugin                | `ansible-galaxy collection install community.general`                         |

tests/_vendor/packaging/LICENSE.APACHE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

tests/_vendor/packaging/LICENSE.BSD

@@ -0,0 +1,23 @@
+Copyright (c) Donald Stufft and individual contributors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

tests/_vendor/packaging/_structures.py

@@ -0,0 +1,68 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+
+class Infinity(object):
+
+    def __repr__(self):
+        return "Infinity"
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __lt__(self, other):
+        return False
+
+    def __le__(self, other):
+        return False
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__)
+
+    def __ne__(self, other):
+        return not isinstance(other, self.__class__)
+
+    def __gt__(self, other):
+        return True
+
+    def __ge__(self, other):
+        return True
+
+    def __neg__(self):
+        return NegativeInfinity
+
+Infinity = Infinity()
+
+
+class NegativeInfinity(object):
+
+    def __repr__(self):
+        return "-Infinity"
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __lt__(self, other):
+        return True
+
+    def __le__(self, other):
+        return True
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__)
+
+    def __ne__(self, other):
+        return not isinstance(other, self.__class__)
+
+    def __gt__(self, other):
+        return False
+
+    def __ge__(self, other):
+        return False
+
+    def __neg__(self):
+        return Infinity
+
+NegativeInfinity = NegativeInfinity()

tests/_vendor/packaging/version.py

@@ -0,0 +1,393 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import collections
+import itertools
+import re
+
+from ._structures import Infinity
+
+
+__all__ = [
+    "parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"
+]
+
+
+_Version = collections.namedtuple(
+    "_Version",
+    ["epoch", "release", "dev", "pre", "post", "local"],
+)
+
+
+def parse(version):
+    """
+    Parse the given version string and return either a :class:`Version` object
+    or a :class:`LegacyVersion` object depending on if the given version is
+    a valid PEP 440 version or a legacy version.
+    """
+    try:
+        return Version(version)
+    except InvalidVersion:
+        return LegacyVersion(version)
+
+
+class InvalidVersion(ValueError):
+    """
+    An invalid version was found, users should refer to PEP 440.
+    """
+
+
+class _BaseVersion(object):
+
+    def __hash__(self):
+        return hash(self._key)
+
+    def __lt__(self, other):
+        return self._compare(other, lambda s, o: s < o)
+
+    def __le__(self, other):
+        return self._compare(other, lambda s, o: s <= o)
+
+    def __eq__(self, other):
+        return self._compare(other, lambda s, o: s == o)
+
+    def __ge__(self, other):
+        return self._compare(other, lambda s, o: s >= o)
+
+    def __gt__(self, other):
+        return self._compare(other, lambda s, o: s > o)
+
+    def __ne__(self, other):
+        return self._compare(other, lambda s, o: s != o)
+
+    def _compare(self, other, method):
+        if not isinstance(other, _BaseVersion):
+            return NotImplemented
+
+        return method(self._key, other._key)
+
+
+class LegacyVersion(_BaseVersion):
+
+    def __init__(self, version):
+        self._version = str(version)
+        self._key = _legacy_cmpkey(self._version)
+
+    def __str__(self):
+        return self._version
+
+    def __repr__(self):
+        return "<LegacyVersion({0})>".format(repr(str(self)))
+
+    @property
+    def public(self):
+        return self._version
+
+    @property
+    def base_version(self):
+        return self._version
+
+    @property
+    def local(self):
+        return None
+
+    @property
+    def is_prerelease(self):
+        return False
+
+    @property
+    def is_postrelease(self):
+        return False
+
+
+_legacy_version_component_re = re.compile(
+    r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE,
+)
+
+_legacy_version_replacement_map = {
+    "pre": "c", "preview": "c", "-": "final-", "rc": "c", "dev": "@",
+}
+
+
+def _parse_version_parts(s):
+    for part in _legacy_version_component_re.split(s):
+        part = _legacy_version_replacement_map.get(part, part)
+
+        if not part or part == ".":
+            continue
+
+        if part[:1] in "0123456789":
+            # pad for numeric comparison
+            yield part.zfill(8)
+        else:
+            yield "*" + part
+
+    # ensure that alpha/beta/candidate are before final
+    yield "*final"
+
+
+def _legacy_cmpkey(version):
+    # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch
+    # greater than or equal to 0. This will effectively put the LegacyVersion,
+    # which uses the defacto standard originally implemented by setuptools,
+    # as before all PEP 440 versions.
+    epoch = -1
+
+    # This scheme is taken from pkg_resources.parse_version setuptools prior to
+    # it's adoption of the packaging library.
+    parts = []
+    for part in _parse_version_parts(version.lower()):
+        if part.startswith("*"):
+            # remove "-" before a prerelease tag
+            if part < "*final":
+                while parts and parts[-1] == "*final-":
+                    parts.pop()
+
+            # remove trailing zeros from each series of numeric parts
+            while parts and parts[-1] == "00000000":
+                parts.pop()
+
+        parts.append(part)
+    parts = tuple(parts)
+
+    return epoch, parts
+
+# Deliberately not anchored to the start and end of the string, to make it
+# easier for 3rd party code to reuse
+VERSION_PATTERN = r"""
+    v?
+    (?:
+        (?:(?P<epoch>[0-9]+)!)?                           # epoch
+        (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
+        (?P<pre>                                          # pre-release
+            [-_\.]?
+            (?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))
+            [-_\.]?
+            (?P<pre_n>[0-9]+)?
+        )?
+        (?P<post>                                         # post release
+            (?:-(?P<post_n1>[0-9]+))
+            |
+            (?:
+                [-_\.]?
+                (?P<post_l>post|rev|r)
+                [-_\.]?
+                (?P<post_n2>[0-9]+)?
+            )
+        )?
+        (?P<dev>                                          # dev release
+            [-_\.]?
+            (?P<dev_l>dev)
+            [-_\.]?
+            (?P<dev_n>[0-9]+)?
+        )?
+    )
+    (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
+"""
+
+
+class Version(_BaseVersion):
+
+    _regex = re.compile(
+        r"^\s*" + VERSION_PATTERN + r"\s*$",
+        re.VERBOSE | re.IGNORECASE,
+    )
+
+    def __init__(self, version):
+        # Validate the version and parse it into pieces
+        match = self._regex.search(version)
+        if not match:
+            raise InvalidVersion("Invalid version: '{0}'".format(version))
+
+        # Store the parsed out pieces of the version
+        self._version = _Version(
+            epoch=int(match.group("epoch")) if match.group("epoch") else 0,
+            release=tuple(int(i) for i in match.group("release").split(".")),
+            pre=_parse_letter_version(
+                match.group("pre_l"),
+                match.group("pre_n"),
+            ),
+            post=_parse_letter_version(
+                match.group("post_l"),
+                match.group("post_n1") or match.group("post_n2"),
+            ),
+            dev=_parse_letter_version(
+                match.group("dev_l"),
+                match.group("dev_n"),
+            ),
+            local=_parse_local_version(match.group("local")),
+        )
+
+        # Generate a key which will be used for sorting
+        self._key = _cmpkey(
+            self._version.epoch,
+            self._version.release,
+            self._version.pre,
+            self._version.post,
+            self._version.dev,
+            self._version.local,
+        )
+
+    def __repr__(self):
+        return "<Version({0})>".format(repr(str(self)))
+
+    def __str__(self):
+        parts = []
+
+        # Epoch
+        if self._version.epoch != 0:
+            parts.append("{0}!".format(self._version.epoch))
+
+        # Release segment
+        parts.append(".".join(str(x) for x in self._version.release))
+
+        # Pre-release
+        if self._version.pre is not None:
+            parts.append("".join(str(x) for x in self._version.pre))
+
+        # Post-release
+        if self._version.post is not None:
+            parts.append(".post{0}".format(self._version.post[1]))
+
+        # Development release
+        if self._version.dev is not None:
+            parts.append(".dev{0}".format(self._version.dev[1]))
+
+        # Local version segment
+        if self._version.local is not None:
+            parts.append(
+                "+{0}".format(".".join(str(x) for x in self._version.local))
+            )
+
+        return "".join(parts)
+
+    @property
+    def public(self):
+        return str(self).split("+", 1)[0]
+
+    @property
+    def base_version(self):
+        parts = []
+
+        # Epoch
+        if self._version.epoch != 0:
+            parts.append("{0}!".format(self._version.epoch))
+
+        # Release segment
+        parts.append(".".join(str(x) for x in self._version.release))
+
+        return "".join(parts)
+
+    @property
+    def local(self):
+        version_string = str(self)
+        if "+" in version_string:
+            return version_string.split("+", 1)[1]
+
+    @property
+    def is_prerelease(self):
+        return bool(self._version.dev or self._version.pre)
+
+    @property
+    def is_postrelease(self):
+        return bool(self._version.post)
+
+
+def _parse_letter_version(letter, number):
+    if letter:
+        # We consider there to be an implicit 0 in a pre-release if there is
+        # not a numeral associated with it.
+        if number is None:
+            number = 0
+
+        # We normalize any letters to their lower case form
+        letter = letter.lower()
+
+        # We consider some words to be alternate spellings of other words and
+        # in those cases we want to normalize the spellings to our preferred
+        # spelling.
+        if letter == "alpha":
+            letter = "a"
+        elif letter == "beta":
+            letter = "b"
+        elif letter in ["c", "pre", "preview"]:
+            letter = "rc"
+        elif letter in ["rev", "r"]:
+            letter = "post"
+
+        return letter, int(number)
+    if not letter and number:
+        # We assume if we are given a number, but we are not given a letter
+        # then this is using the implicit post release syntax (e.g. 1.0-1)
+        letter = "post"
+
+        return letter, int(number)
+
+
+_local_version_seperators = re.compile(r"[\._-]")
+
+
+def _parse_local_version(local):
+    """
+    Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
+    """
+    if local is not None:
+        return tuple(
+            part.lower() if not part.isdigit() else int(part)
+            for part in _local_version_seperators.split(local)
+        )
+
+
+def _cmpkey(epoch, release, pre, post, dev, local):
+    # When we compare a release version, we want to compare it with all of the
+    # trailing zeros removed. So we'll use a reverse the list, drop all the now
+    # leading zeros until we come to something non zero, then take the rest
+    # re-reverse it back into the correct order and make it a tuple and use
+    # that for our sorting key.
+    release = tuple(
+        reversed(list(
+            itertools.dropwhile(
+                lambda x: x == 0,
+                reversed(release),
+            )
+        ))
+    )
+
+    # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
+    # We'll do this by abusing the pre segment, but we _only_ want to do this
+    # if there is not a pre or a post segment. If we have one of those then
+    # the normal sorting rules will handle this case correctly.
+    if pre is None and post is None and dev is not None:
+        pre = -Infinity
+    # Versions without a pre-release (except as noted above) should sort after
+    # those with one.
+    elif pre is None:
+        pre = Infinity
+
+    # Versions without a post segment should sort before those with one.
+    if post is None:
+        post = -Infinity
+
+    # Versions without a development segment should sort after those with one.
+    if dev is None:
+        dev = Infinity
+
+    if local is None:
+        # Versions without a local segment should sort before those with one.
+        local = -Infinity
+    else:
+        # Versions with a local segment need that segment parsed to implement
+        # the sorting rules in PEP440.
+        # - Alpha numeric segments sort before numeric segments
+        # - Alpha numeric segments sort lexicographically
+        # - Numeric segments sort numerically
+        # - Shorter versions sort before longer versions when the prefixes
+        #   match exactly
+        local = tuple(
+            (i, "") if isinstance(i, int) else (-Infinity, i)
+            for i in local
+        )
+
+    return epoch, release, pre, post, dev, local