Fix regex for new isoinfo

geninfo/genisolist.ini

@@ -855,114 +855,123 @@ platform = $3
 [KaOS]
 distro = KaOS
 location = KaOS/*
-pattern = KaOS-([^/]+)\.iso
+pattern = KaOS-([^/]+)-([^/]+)\.iso
 version = $1
+platform = $2
 type = iso
 
 [NetBSD]
 distro = NetBSD
 location = NetBSD/iso/*/*
-pattern = NetBSD-([^/]+)\.iso
+pattern = NetBSD-([\.\d]+)-([-\w]+)\.iso(?!.)
 version = $1
+platform = $2
 type = iso
 
 [Anthon]
 distro = Anthon
-location = anthon/aosc-os/os/*/*/*
-pattern = aosc-os([^/]+)\.(tar\.xz|img)
-version = $1
-type = $2
+location = anthon/aosc-os/*/*/*
+pattern = aosc-os_([^/]+)_(\d+)_(\w+)\.(tar\.xz|img)(?!.)
+version = $2
+type = $1
+platform = $3
 
 [ArchLinuxARM]
 distro = Arch Linux ARM
 location = archlinuxarm/os/*
-pattern = ArchLinuxARM-([^/]+)\.tar\.gz
-version = $1
+pattern = ArchLinuxARM-([^/]+)-latest\.tar\.gz(?!.)
+version = latest
 type = tar.gz
+platform = $1
 
 [Armbian]
 distro = Armbian
 location = armbian-releases/*/archive/*
-pattern = Armbian_([^/]+)\.img\.xz
+pattern = Armbian_([\.\d]+)_([^/]+)\.img\.xz(?!.)
 version = $1
+platform = $2
 type = img.xz
 
 [blackarch]
 distro = BlackArch
 location = blackarch/iso/*
-pattern = blackarch-([^/]+)\.iso
-version = $1
-type = iso
-
-[Chakra]
-distro = Chakra
-location = chakra-releases/*
-pattern = chakra-([^/]+)\.iso
-version = $1
-type = iso
+pattern = blackarch-([^/]+)-([^/]+)-([\.\w]+)-([^/]+)\.iso(?!.)
+version = $3
+platform = $1
+type = $2 $4 iso
 
 [Garuda]
 distro = Garuda Linux
 location = osdn/storage/g/g/ga/garuda-linux/*/*/*
-pattern = garuda-([^/]+)\.iso
+pattern = garuda-([-\w]+)-([\.\w]+)\.iso(?!.)
 version = $1
-type = iso
-
-[postmarketOS]
-distro = postmarketOS
-location = postmarketOS-images/*/*
-pattern = ([^/]+)\.img\.(xz|gz)
-version = $1
-type = img.$2
-
-[proxmox]
-distro = Proxmox
-location = proxmox/iso/*
-pattern = proxmox-([^/]+)\.iso
-version = $1
-type = iso
+platform = $2
 
 [qubesos]
 distro = Qubes OS
 location = qubesos/iso/*
-pattern = Qubes-([^/]+)\.iso
+pattern = Qubes-R([\.\d]+)(-\w+)?-(\w+)\.iso(?!.)
 version = $1
+platform = $2
 type = iso
 
 [lyx]
 distro = TeX 排版系统
 location = lyx/bin/*/*
-pattern = [lL]yx-([^/]+)\.(dmg|exe|tar\.gz)
-version = $1
-type = $2
+pattern = [lL]yx-([\.\d]+)-?_?([^/]+)\.(dmg|exe|tar\.gz)(?!.)
+version = LyX $1
+platform = $2
+type = $3
 category = app
 
 [mageia]
 distro = Mageia
 location = mageia/iso/*/*/*
-pattern = Mageia-([^/]+)\.iso
+pattern = Mageia-([\d]+)-([^/]+)-([\w]+)\.iso(?!.)
 version = $1
+platform = $3
 type = $2
 
 [endeavouros]
 distro = EndeavourOS
 location = endeavouros/iso/*
-pattern = endeavouros-([^/]+)\.iso
+pattern = endeavouros-([\.\d]+)-(\w+)\.iso(?!.)
 version = $1
+platform = $2
 type = iso
 
 [linuxlite]
 distro = Linux Lite
 location_0 = osdn/storage/g/l/li/linuxlite/*/*.iso
 location_1 = osdn/storage/g/l/li/linuxlite/*/*/*.iso
-pattern = linux-lite-([^/]+)\.iso
+pattern = linux-lite-([\.\d]+)-(\w+)\.iso(?!.)
 version = $1
+platform = $2
 type = iso
 
-[wireshark]
+[wireshark win]
 distro = Wireshark
 location = osdn/storage/g/w/wi/wireshark/*/*
-pattern = ([^/]+)\.(dmg|exe|msi)
-version = $1
+pattern = Wireshark-([^/]+)-([\.\d]+)\.(exe|msi)
+version = $2
+platform = $1
+type = $3
+category = app
+
+[wireshark portable]
+distro = Wireshark
+location = osdn/storage/g/w/wi/wireshark/*/*
+pattern = WiresharkPortable_([\.\d]+)\.(paf\.exe)
+version = Portable $1
+platform = win
 type = $2
 category = app
+
+[wireshark osx]
+distro = Wireshark
+location = osdn/storage/g/w/wi/wireshark/osx/*.dmg
+pattern = Wireshark ([\.\d]+) ([^/]+)\.dmg
+version = $1
+platform = $2
+type = dmg
+category = app