Merge pull request #46 from quadraticat/45-branch

[45] Updated GUID fetch logic.

.gitignore

@@ -5,4 +5,4 @@ debian/rpi-imager/**
 debian/.debhelper**
 debian/files
 debian/*.substvars
-debian/debhelper**
+debian/debhelper**.DS_Store

debian/unraid-usb-creator/DEBIAN/control

@@ -1,8 +1,8 @@
 Package: unraid-usb-creator
 Version: 1.0
 Architecture: amd64
-Maintainer: Floris Bos <[email protected]>
-Installed-Size: 2962
+Maintainer: Unraid Developers [email protected]
+Installed-Size: 2970
 Depends: libarchive13 (>= 3.0.4), libc6 (>= 2.34), libcurl3-gnutls (>= 7.16.2), libgcc-s1 (>= 3.3.1), libgnutls30 (>= 3.7.0), liblzma5 (>= 5.1.1alpha+20110809), libqt5core5a (>= 5.15.1), libqt5dbus5 (>= 5.14.1), libqt5gui5 (>= 5.10.0) | libqt5gui5-gles (>= 5.10.0), libqt5network5 (>= 5.12.2), libqt5qml5 (>= 5.10.0), libqt5widgets5 (>= 5.0.2), libstdc++6 (>= 12), qml-module-qtquick2, qml-module-qtquick-controls2, qml-module-qtquick-layouts, qml-module-qtquick-templates2, qml-module-qtquick-window2, qml-module-qtgraphicaleffects, dosfstools, fdisk
 Recommends: udisks2
 Section: admin

debian/unraid-usb-creator/DEBIAN/md5sums

@@ -1,4 +1,4 @@
-00402ea2d83f2dc8bf56b12036a133bc  usr/bin/unraid-usb-creator
+d2af054930493926471278d11433cf84  usr/bin/unraid-usb-creator
 56dbceb5198ff7545c315f9a812e3484  usr/share/applications/com.limetech.unraid-usb-creator.desktop
 cf8cee94e0a222f252e30701d87be77b  usr/share/doc/unraid-usb-creator/changelog.gz
 9cc7fd7ca7041b8d8b8335041ad0fe75  usr/share/doc/unraid-usb-creator/copyright

src/CMakeLists.txt

@@ -9,8 +9,8 @@ OPTION (DRIVELIST_FILTER_SYSTEM_DRIVES "Filter System drives from displayed driv
 project(unraid-usb-creator LANGUAGES CXX C)
 set(IMAGER_VERSION_MAJOR 1)
 set(IMAGER_VERSION_MINOR 0)
-set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.0")
-set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},0,0")
+set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.1")
+set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},1,0")
 add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}")
 add_definitions(-DIMAGER_VERSION_CSV=${IMAGER_VERSION_CSV})
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

src/dependencies/drivelist/src/darwin/list.mm

@@ -138,10 +138,16 @@ void GetDeviceVidPidSerialNumber(const std::string& diskBsdName, DeviceDescripto
             s = (NSString *) serialNumberAsCFTypeRef;
             device_descriptor->serialNumber = std::string([s UTF8String]);
             NSNumber * n = (NSNumber *) vendorIdAsCFTypeRef;
-            s = [NSString stringWithFormat:@"%04X", [n intValue]];
+            s = [NSString stringWithFormat:@"%X", [n intValue]];
+            while ([s length] < 4) {
+              s = [@"0" stringByAppendingString:s];
+            }
             device_descriptor->vid = std::string([s UTF8String]);
             n = (NSNumber *) productIdAsCFTypeRef;
-            s = [NSString stringWithFormat:@"%04X", [n intValue]];
+            s = [NSString stringWithFormat:@"%X", [n intValue]];
+            while ([s length] < 4) {
+              s = [@"0" stringByAppendingString:s];
+            }
             device_descriptor->pid = std::string([s UTF8String]);
           }
           if(serialNumberAsCFTypeRef) CFRelease(serialNumberAsCFTypeRef);

src/dependencies/drivelist/src/windows/list.cpp

@@ -651,7 +651,7 @@ bool GetDeviceVidPidSerialNumber(HDEVINFO hDeviceInfo, PSP_DEVINFO_DATA deviceIn
 
         std::string deviceId_usb{wbuffer};
         std::smatch vid_pid_sn_match;
-        std::regex vid_pid_sn_regex("USB\\\\VID_([0-9A-Za-z]{4})&PID_([0-9A-Za-z]{4})\\\\([0-9A-Za-z]+)");
+        std::regex vid_pid_sn_regex("USB\\\\VID_([0-9A-Za-z]{4})(?:.*)&PID_([0-9A-Za-z]{4})(?:.*)\\\\([0-9A-Za-z]+)");
         if (std::regex_search(deviceId_usb, vid_pid_sn_match, vid_pid_sn_regex) && vid_pid_sn_match.size() == 4)
         {
             VID = vid_pid_sn_match[1];

src/linux/linuxdrivelist.cpp

@@ -61,7 +61,7 @@ namespace Drivelist
         }
 
 
-        QRegularExpression vidRegExp("VENDOR_ID=([0-9A-Za-z]{4})"), pidRegExp("MODEL_ID=([0-9A-Za-z]{4})"), snRegExp("SERIAL_SHORT=([0-9A-Za-z]+)");
+        QRegularExpression vidRegExp("VENDOR_ID=([0-9A-Za-z]{4})(?:.*)"), pidRegExp("MODEL_ID=([0-9A-Za-z]{4})(?:.*)"), snRegExp("SERIAL_SHORT=([0-9A-Za-z]+)");
 
         QJsonDocument d = QJsonDocument::fromJson(output);
         const QJsonArray a = d.object()["blockdevices"].toArray();