Miroirs/pinxi
1
0
Fork 0
mirror of https://codeberg.org/smxi/pinxi.git synced 2024-09-28 15:20:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

overly loose sandisk id falsely made seagate into sandisk.

Browse source
This commit is contained in:
Harald Hope 2024-02-10 21:01:18 -08:00
parent 7a79e28d10
commit 53e0369e18
4 changed files with 63 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pinxi
View file

@ -50,8 +50,8 @@ use POSIX qw(ceil uname strftime ttyname);
## INXI INFO ##
my $self_name='pinxi';
my $self_version='3.3.33';
my $self_date='2024-02-06';
my $self_patch='01';
my $self_date='2024-02-10';
my $self_patch='02';
## END INXI INFO ##
my ($b_pledge,@pledges);
@ -13917,7 +13917,7 @@ sub set_disk_vendors {
# HM320II HM320II HM
['(SAMSUNG|^(AWMB|[BC]DS20|[BC]WB|BJ[NT]|[BC]GND|CJ[NT]|CKT|CUT|[DG]3 Station|DUO\b|DUT|EB\dMW|E[CS]\d[A-Z]\d|FD\d[A-Z]\dGE4S5|[GS]2 Portable|GN|HD\d{3}[A-Z]{2}$|(HM|SP)\d{2}|HS\d|M[AB]G\d[FG]|MCC|MCBOE|MCG\d+GC|[CD]JN|MZ|^G[CD][1-9][QS]|P[BM]\d|(SSD\s?)?SM\s?841)|^SSD\s?[89]\d{2}\s(DCT|PRO|QVD|\d+[GT]B)|\bEVO\b|SV\d|[BE][A-Z][1-9]QT|YP\b|[CH]N-M|MMC[QR]E)','SAMSUNG','Samsung',''], # maybe ^SM, ^HM
# Android UMS Composite?U1
['(SanDisk|0781|^(A[BCD]LC[DE]|AFGCE|D[AB]4|DX[1-9]|Extreme|Firebird|S[CD]\d{2}G|SC\d{3,4}|SD(CF|S[S]?[ADQ]|SL\d+G|SU\d|U\d|\sUltra)|SDW[1-9]|SE\d{2}|SEM\d{2}|\d[STU]|U(3\b|1\d0))|Clip Sport|Cruzer|iXpand|SN(\d+G|128|256)|SSD (Plus|U1[01]0) [1-9]|ULTRA\s(FIT|trek|II)|X[1-6]\d{2})','(SanDisk|0781)','SanDisk',''],
['(SanDisk|0781|^(A[BCD]LC[DE]|AFGCE|D[AB]4|DX[1-9]|Extreme|Firebird|S[CD]\d{2}G|SC\d{3,4}|SD(CF|S[S]?[ADQ]|SL\d+G|SU\d|U\d|\sUltra)|SDW[1-9]|SE\d{2}|SEM\d{2}|\d[STU]|U(3\b|1\d0))|Clip Sport|Cruzer|iXpand|SN(\d+G|128|256)|SSD (Plus|U1[01]0) [1-9]|ULTRA\s(FIT|trek|II)|^X[1-6]\d{2})','(SanDisk|0781)','SanDisk',''],
# these are HP/Sandisk cobranded. DX110064A5xnNMRI ids as HP and Sandisc
['(^DX[1-9])','^(HP\b|SANDDISK)','Sandisk/HP',''], # ssd drive, must come before seagate ST test
# real, SSEAGATE Backup+; XP1600HE30002 | 024 HN (spinpoint) ; possible usb: 24AS
@ -14526,6 +14526,7 @@ sub disk_vendor {
# Data URLs: inxi-resources.txt Section: DriveItem device_vendor()
# $model = 'H10 HBRPEKNX0202A NVMe INTEL 512GB';
# $model = 'SD Ultra 3D 1TB';
# $model = 'ST8000DM004-2CX188_WCT193ZX';
set_disk_vendors() if !$vendors;
# prefilter this one, some usb enclosurs and wrong master/slave hdd show default
$model =~ s/^Initio[\s_]//i;

49
pinxi.changelog
View file

@ -1,3 +1,52 @@
================================================================================
Version: 3.3.34
Patch: 00
Date: 2024-??-??
--------------------------------------------------------------------------------
RELEASE NOTES:
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
SPECIAL THANKS:
--------------------------------------------------------------------------------
KNOWN ISSUES:
--------------------------------------------------------------------------------
BUGS:
--------------------------------------------------------------------------------
FIXES:
1. DRIVES: DiskItem::disk_vendor(): Fixed an overly loose SanDisk vendor ID that
led to a Seagate ST8000DM004-2CX188_WCT193ZX being ID'ed as a SanDisk. The
culprit was forgetting the 'starts with ^ in:
^X[1-6]\d{2}
Thanks Codebergy issue poster thatso in issue #299 for pointing this out.
--------------------------------------------------------------------------------
ENHANCEMENTS:
--------------------------------------------------------------------------------
CHANGES:
--------------------------------------------------------------------------------
DOCUMENTATION:
--------------------------------------------------------------------------------
CODE:
--------------------------------------------------------------------------------
-- Harald Hope - Sat, 10 Feb 2024 21:00:08 -0800
================================================================================
Version: 3.3.33
Patch: 00

5
tools/disk_vendors.pl
View file

@ -71,7 +71,7 @@ sub set_disk_vendors {
# HM320II HM320II HM
['(SAMSUNG|^(AWMB|[BC]DS20|[BC]WB|BJ[NT]|[BC]GND|CJ[NT]|CKT|CUT|[DG]3 Station|DUO\b|DUT|EB\dMW|E[CS]\d[A-Z]\d|FD\d[A-Z]\dGE4S5|[GS]2 Portable|GN|HD\d{3}[A-Z]{2}$|(HM|SP)\d{2}|HS\d|M[AB]G\d[FG]|MCC|MCBOE|MCG\d+GC|[CD]JN|MZ|^G[CD][1-9][QS]|P[BM]\d|(SSD\s?)?SM\s?841)|^SSD\s?[89]\d{2}\s(DCT|PRO|QVD|\d+[GT]B)|\bEVO\b|SV\d|[BE][A-Z][1-9]QT|YP\b|[CH]N-M|MMC[QR]E)','SAMSUNG','Samsung',''], # maybe ^SM, ^HM
# Android UMS Composite?U1
['(SanDisk|0781|^(A[BCD]LC[DE]|AFGCE|D[AB]4|DX[1-9]|Extreme|Firebird|S[CD]\d{2}G|SC\d{3,4}|SD(CF|S[S]?[ADQ]|SL\d+G|SU\d|U\d|\sUltra)|SDW[1-9]|SE\d{2}|SEM\d{2}|\d[STU]|U(3\b|1\d0))|Clip Sport|Cruzer|iXpand|SN(\d+G|128|256)|SSD (Plus|U1[01]0) [1-9]|ULTRA\s(FIT|trek|II)|X[1-6]\d{2})','(SanDisk|0781)','SanDisk',''],
['(SanDisk|0781|^(A[BCD]LC[DE]|AFGCE|D[AB]4|DX[1-9]|Extreme|Firebird|S[CD]\d{2}G|SC\d{3,4}|SD(CF|S[S]?[ADQ]|SL\d+G|SU\d|U\d|\sUltra)|SDW[1-9]|SE\d{2}|SEM\d{2}|\d[STU]|U(3\b|1\d0))|Clip Sport|Cruzer|iXpand|SN(\d+G|128|256)|SSD (Plus|U1[01]0) [1-9]|ULTRA\s(FIT|trek|II)|^X[1-6]\d{2})','(SanDisk|0781)','SanDisk',''],
# these are HP/Sandisk cobranded. DX110064A5xnNMRI ids as HP and Sandisc
['(^DX[1-9])','^(HP\b|SANDDISK)','Sandisk/HP',''], # ssd drive, must come before seagate ST test
# real, SSEAGATE Backup+; XP1600HE30002 | 024 HN (spinpoint) ; possible usb: 24AS
@ -681,6 +681,9 @@ sub disk_vendor {
# Data URLs: inxi-resources.txt Section: DriveItem device_vendor()
# $model = 'H10 HBRPEKNX0202A NVMe INTEL 512GB';
# $model = 'SD Ultra 3D 1TB';
# $model = 'ST8000DM004-2CX188_WCT193ZX';
# $model = 'ST8000DM004-2CX188_WG8020FG';
# $model = 'ST8000DM004-2CX188_ZCT1DWVR';
set_disk_vendors() if !$vendors;
# prefilter this one, some usb enclosurs and wrong master/slave hdd show default
$model =~ s/^Initio[\s_]//i;

7
tools/lists/disks.unhandled
View file

@ -96,6 +96,9 @@ type: 0-int model: DURM4R size: 116.48 GiB
type: 0-int model: EE4S5 size: 238.75 GiB
type: 0-int model: EHSAJM0008GB size: 8.0GB
type: 0-int model: EHSAJM0016GB size: 13.98 GiB/15.0GB
type: 0-int model: EX276688RUS 240GB size: 223.57 GiB
type: 0-int model: EX280461RUS size: 119.24 GiB
type: 0-int model: EX280462RUS size: 238.47 GiB
type: 0-int model: Ext HDD 1021 size: 2000.4GB
type: 0-int model: External size: 500.1GB
type: 0-int model: EYM512GB size: 476.94 GiB
@ -105,6 +108,7 @@ type: 0-int model: FD4Q5 size: 119.38 GiB
type: 0-int model: FM size: 64.0GB
type: 0-int model: FPT310M4SSD128G size: 119.24 GiB
type: 0-int model: FPT310M8SSD256G size: 238.47 GiB
type: 0-int model: FX128PRO size: 119.24 GiB
type: 0-int model: G521N256GB size: 238.47 GiB
type: 0-int model: GBRL0015XVEUCM size: 15.8GB
type: 0-int model: GE4S5 size: 238.75 GiB
@ -348,6 +352,7 @@ type: 0-int model: WLS size: 40.0GB
type: 0-int model: x e size: 0.3GB
type: 0-int model: X12 SSD 256GB size: 238.47 GiB
type: 0-int model: xD/SD/M.S. size: 1.0GB/31.5GB/32.0GB/63.5GB/7.29 GiB/7.9GB
type: 0-int model: XSJ-X100-120GB size: 111.79 GiB
type: 0-int model: YS SSD size: 119.24 GiB
type: FireWire model: 00JB size: 320.1GB
type: USB model: "PSP" MS size: 4.1GB
@ -842,4 +847,4 @@ type: USB model: W RAID0 size: 2000.3GB
type: USB model: Wireless Stick size: 31.9GB
type: USB model: xD/SDMMC/MS/Pro size: 1.0GB
type: USB model: xternal HD size: 1000.2GB
type: USB model: Z1E6FTKJ size: 2000.4GB
type: USB model: Z1E6FTKJ size: 2000.4GB