diff --git a/geninfo/genisolist.ini b/geninfo/genisolist.ini index ffe8e28..3aac768 100644 --- a/geninfo/genisolist.ini +++ b/geninfo/genisolist.ini @@ -1335,17 +1335,8 @@ pattern = Notepad2_(HD)?(?:_)?([^/]+)_(\w+)_v([^/]+).zip platform = $3 type = $2 $1 version = $4 -key_by = $2 $3 sort_by = $2 $3 -[notepad2-findinfiles] -distro = Notepad2-zufuliu -location = github-release/zufuliu/notepad2/LatestRelease/* -pattern = FindInFiles-net([\.\d]+)\.zip -type = FindInFiles -version = $1 -category = app - [nanazip] distro = NanaZip location = github-release/M2Team/NanaZip/LatestRelease/* @@ -1375,17 +1366,15 @@ category = app [crystaldiskinfo] distro = CrystalDiskInfo location = osdn/crystaldiskinfo/*/* -pattern = osdn/crystaldiskinfo/(?:[\d]+)/CrystalDiskInfo(\w+)\.(exe|zip) +pattern = osdn/crystaldiskinfo/(?:[\d]+)/CrystalDiskInfo(\w+)\.exe listvers = 4 -type = $2 version = $1 category = app [crystaldiskmark] distro = CrystalDiskMark location = osdn/crystaldiskmark/*/* -pattern = osdn/crystaldiskmark/(?:[\d]+)/CrystalDiskMark(\w+)\.(exe|zip) +pattern = osdn/crystaldiskmark/(?:[\d]+)/CrystalDiskMark(\w+)\.exe listvers = 4 -type = $2 version = $1 category = app diff --git a/geninfo/genisolist.py b/geninfo/genisolist.py index 45f4d23..887baeb 100755 --- a/geninfo/genisolist.py +++ b/geninfo/genisolist.py @@ -226,11 +226,11 @@ def parseSection(items, rsync=False): imageinfo["version"] = "0.0" sort_by = items.get("sort_by", "") if not (sort_by): - imageinfo["sort_key"] = ( + imageinfo["sort_key"] = [ imageinfo["version"], imageinfo["platform"], imageinfo["type"], - ) + ] else: imageinfo["sort_key"] = getSortKeys(sort_by, result)