Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Update wireshark.ini for upstream new format #13

Merged
merged 6 commits into from
Dec 30, 2024
Merged

fix: Update wireshark.ini for upstream new format #13

merged 6 commits into from
Dec 30, 2024

Conversation

laozhoubuluo
Copy link
Contributor

修复 tuna/issues#2097 提到的问题

@laozhoubuluo laozhoubuluo mentioned this pull request Dec 29, 2024
Closed
1 task
@taoky
Copy link
Member

taoky commented Dec 29, 2024 •
edited
Loading 

[
  {
    "distro": "Wireshark",
    "category": "app",
    "urls": [
      {
        "name": "latest (x64, msi)",
        "url": "/wireshark/win64/Wireshark-latest-x64.msi"
      },
      {
        "name": "latest (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-latest-arm64.exe"
      },
      {
        "name": "latest (x64, exe)",
        "url": "/wireshark/win64/Wireshark-latest-x64.exe"
      },
      {
        "name": "Portable latest (win, portable)",
        "url": "/wireshark/win64/WiresharkPortable64_latest.paf.exe"
      },
      {
        "name": "Portable 4.4.2 (win, portable)",
        "url": "/wireshark/win64/WiresharkPortable64_4.4.2.paf.exe"
      },
      {
        "name": "Portable 4.4.1 (win, portable)",
        "url": "/wireshark/win64/WiresharkPortable64_4.4.1.paf.exe"
      },
      {
        "name": "Portable 4.4.0 (win, portable)",
        "url": "/wireshark/win64/WiresharkPortable64_4.4.0.paf.exe"
      },
      {
        "name": "Portable 4.2.9 (win, portable)",
        "url": "/wireshark/win64/WiresharkPortable64_4.2.9.paf.exe"
      },
      {
        "name": "Portable 4.2.8 (win, portable)",
        "url": "/wireshark/win64/WiresharkPortable64_4.2.8.paf.exe"
      },
      {
        "name": "Portable 4.2.7 (win, portable)",
        "url": "/wireshark/win64/WiresharkPortable64_4.2.7.paf.exe"
      },
      {
        "name": "Portable 4.2.6 (win, portable)",
        "url": "/wireshark/win64/WiresharkPortable64_4.2.6.paf.exe"
      },
      {
        "name": "Portable 4.0.17 (win, portable)",
        "url": "/wireshark/win64/WiresharkPortable64_4.0.17.paf.exe"
      },
      {
        "name": "Portable 4.0.16 (win, portable)",
        "url": "/wireshark/win64/WiresharkPortable64_4.0.16.paf.exe"
      },
      {
        "name": "4.4.2 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.4.2-x64.msi"
      },
      {
        "name": "4.4.2 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.4.2-arm64.exe"
      },
      {
        "name": "4.4.2 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.4.2-x64.exe"
      },
      {
        "name": "4.4.2 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.2 Arm 64.dmg"
      },
      {
        "name": "4.4.2 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.2 Intel 64.dmg"
      },
      {
        "name": "4.4.1 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.4.1-x64.msi"
      },
      {
        "name": "4.4.1 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.4.1-arm64.exe"
      },
      {
        "name": "4.4.1 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.4.1-x64.exe"
      },
      {
        "name": "4.4.1 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.1 Arm 64.dmg"
      },
      {
        "name": "4.4.1 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.1 Intel 64.dmg"
      },
      {
        "name": "4.4.0 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.4.0-x64.msi"
      },
      {
        "name": "4.4.0 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.4.0-arm64.exe"
      },
      {
        "name": "4.4.0 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.4.0-x64.exe"
      },
      {
        "name": "4.4.0 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.0 Arm 64.dmg"
      },
      {
        "name": "4.4.0 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.0 Intel 64.dmg"
      },
      {
        "name": "4.2.9 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.2.9-x64.msi"
      },
      {
        "name": "4.2.9 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.9-arm64.exe"
      },
      {
        "name": "4.2.9 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.9-x64.exe"
      },
      {
        "name": "4.2.9 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.9 Arm 64.dmg"
      },
      {
        "name": "4.2.9 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.9 Intel 64.dmg"
      },
      {
        "name": "4.2.8 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.2.8-x64.msi"
      },
      {
        "name": "4.2.8 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.8-arm64.exe"
      },
      {
        "name": "4.2.8 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.8-x64.exe"
      },
      {
        "name": "4.2.8 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.8 Arm 64.dmg"
      },
      {
        "name": "4.2.8 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.8 Intel 64.dmg"
      },
      {
        "name": "4.2.7 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.2.7-x64.msi"
      },
      {
        "name": "4.2.7 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.7-arm64.exe"
      },
      {
        "name": "4.2.7 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.7-x64.exe"
      },
      {
        "name": "4.2.7 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.7 Arm 64.dmg"
      },
      {
        "name": "4.2.7 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.7 Intel 64.dmg"
      },
      {
        "name": "4.2.6 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.2.6-x64.msi"
      },
      {
        "name": "4.2.6 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.6-arm64.exe"
      },
      {
        "name": "4.2.6 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.6-x64.exe"
      },
      {
        "name": "4.2.6 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.6 Arm 64.dmg"
      },
      {
        "name": "4.2.6 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.6 Intel 64.dmg"
      },
      {
        "name": "4.0.17 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.0.17 Arm 64.dmg"
      },
      {
        "name": "4.0.17 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.0.17 Intel 64.dmg"
      },
      {
        "name": "4.0.16 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.0.16 Arm 64.dmg"
      },
      {
        "name": "4.0.16 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.0.16 Intel 64.dmg"
      }
    ]
  }
]

@taoky taoky requested a review from Harry-Chen December 29, 2024 04:54
@laozhoubuluo
Copy link
Contributor Author

将解析结果与 https://www.wireshark.org/download.html 进行了比对，在新的提交中将 PortableApps 版本的命名规则与官网进行了统一。

@taoky
Copy link
Member

taoky commented Dec 29, 2024 

[
  {
    "distro": "Wireshark",
    "category": "app",
    "urls": [
      {
        "name": "latest (x64, msi)",
        "url": "/wireshark/win64/Wireshark-latest-x64.msi"
      },
      {
        "name": "latest (x64, exe, PortableApps)",
        "url": "/wireshark/win64/WiresharkPortable64_latest.paf.exe"
      },
      {
        "name": "latest (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-latest-arm64.exe"
      },
      {
        "name": "latest (x64, exe)",
        "url": "/wireshark/win64/Wireshark-latest-x64.exe"
      },
      {
        "name": "4.4.2 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.4.2-x64.msi"
      },
      {
        "name": "4.4.2 (x64, exe, PortableApps)",
        "url": "/wireshark/win64/WiresharkPortable64_4.4.2.paf.exe"
      },
      {
        "name": "4.4.2 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.4.2-arm64.exe"
      },
      {
        "name": "4.4.2 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.4.2-x64.exe"
      },
      {
        "name": "4.4.2 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.2 Arm 64.dmg"
      },
      {
        "name": "4.4.2 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.2 Intel 64.dmg"
      },
      {
        "name": "4.4.1 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.4.1-x64.msi"
      },
      {
        "name": "4.4.1 (x64, exe, PortableApps)",
        "url": "/wireshark/win64/WiresharkPortable64_4.4.1.paf.exe"
      },
      {
        "name": "4.4.1 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.4.1-arm64.exe"
      },
      {
        "name": "4.4.1 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.4.1-x64.exe"
      },
      {
        "name": "4.4.1 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.1 Arm 64.dmg"
      },
      {
        "name": "4.4.1 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.1 Intel 64.dmg"
      },
      {
        "name": "4.4.0 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.4.0-x64.msi"
      },
      {
        "name": "4.4.0 (x64, exe, PortableApps)",
        "url": "/wireshark/win64/WiresharkPortable64_4.4.0.paf.exe"
      },
      {
        "name": "4.4.0 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.4.0-arm64.exe"
      },
      {
        "name": "4.4.0 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.4.0-x64.exe"
      },
      {
        "name": "4.4.0 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.0 Arm 64.dmg"
      },
      {
        "name": "4.4.0 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.0 Intel 64.dmg"
      },
      {
        "name": "4.2.9 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.2.9-x64.msi"
      },
      {
        "name": "4.2.9 (x64, exe, PortableApps)",
        "url": "/wireshark/win64/WiresharkPortable64_4.2.9.paf.exe"
      },
      {
        "name": "4.2.9 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.9-arm64.exe"
      },
      {
        "name": "4.2.9 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.9-x64.exe"
      },
      {
        "name": "4.2.9 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.9 Arm 64.dmg"
      },
      {
        "name": "4.2.9 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.9 Intel 64.dmg"
      },
      {
        "name": "4.2.8 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.2.8-x64.msi"
      },
      {
        "name": "4.2.8 (x64, exe, PortableApps)",
        "url": "/wireshark/win64/WiresharkPortable64_4.2.8.paf.exe"
      },
      {
        "name": "4.2.8 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.8-arm64.exe"
      },
      {
        "name": "4.2.8 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.8-x64.exe"
      },
      {
        "name": "4.2.8 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.8 Arm 64.dmg"
      },
      {
        "name": "4.2.8 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.8 Intel 64.dmg"
      },
      {
        "name": "4.2.7 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.2.7-x64.msi"
      },
      {
        "name": "4.2.7 (x64, exe, PortableApps)",
        "url": "/wireshark/win64/WiresharkPortable64_4.2.7.paf.exe"
      },
      {
        "name": "4.2.7 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.7-arm64.exe"
      },
      {
        "name": "4.2.7 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.7-x64.exe"
      },
      {
        "name": "4.2.7 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.7 Arm 64.dmg"
      },
      {
        "name": "4.2.7 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.7 Intel 64.dmg"
      },
      {
        "name": "4.2.6 (x64, msi)",
        "url": "/wireshark/win64/Wireshark-4.2.6-x64.msi"
      },
      {
        "name": "4.2.6 (x64, exe, PortableApps)",
        "url": "/wireshark/win64/WiresharkPortable64_4.2.6.paf.exe"
      },
      {
        "name": "4.2.6 (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.6-arm64.exe"
      },
      {
        "name": "4.2.6 (x64, exe)",
        "url": "/wireshark/win64/Wireshark-4.2.6-x64.exe"
      },
      {
        "name": "4.2.6 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.6 Arm 64.dmg"
      },
      {
        "name": "4.2.6 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.2.6 Intel 64.dmg"
      },
      {
        "name": "4.0.17 (x64, exe, PortableApps)",
        "url": "/wireshark/win64/WiresharkPortable64_4.0.17.paf.exe"
      },
      {
        "name": "4.0.17 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.0.17 Arm 64.dmg"
      },
      {
        "name": "4.0.17 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.0.17 Intel 64.dmg"
      },
      {
        "name": "4.0.16 (x64, exe, PortableApps)",
        "url": "/wireshark/win64/WiresharkPortable64_4.0.16.paf.exe"
      },
      {
        "name": "4.0.16 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.0.16 Arm 64.dmg"
      },
      {
        "name": "4.0.16 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.0.16 Intel 64.dmg"
      }
    ]
  }
]

@Harry-Chen
Copy link
Contributor

建议保留更少的版本，现在的列表有一些长

@laozhoubuluo
Copy link
Contributor Author

建议保留更少的版本，现在的列表有一些长

已增加 listvers = 1 参数。

@taoky
Copy link
Member

taoky commented Dec 29, 2024

macOS 版本的还是怪怪的。我觉得可以都限制只显示 latest。

[
  {
    "distro": "Wireshark",
    "category": "app",
    "urls": [
      {
        "name": "latest (x64, msi)",
        "url": "/wireshark/win64/Wireshark-latest-x64.msi"
      },
      {
        "name": "latest (x64, exe, PortableApps)",
        "url": "/wireshark/win64/WiresharkPortable64_latest.paf.exe"
      },
      {
        "name": "latest (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-latest-arm64.exe"
      },
      {
        "name": "latest (x64, exe)",
        "url": "/wireshark/win64/Wireshark-latest-x64.exe"
      },
      {
        "name": "4.4.2 (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.2 Arm 64.dmg"
      },
      {
        "name": "4.4.2 (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark 4.4.2 Intel 64.dmg"
      }
    ]
  }
]

@laozhoubuluo
Copy link
Contributor Author

macOS 版本的还是怪怪的。我觉得可以都限制只显示 latest。

Wireshark macOS 版本打包的名字类似 Wireshark Latest Arm 64.dmg ，这个命名方式很奇怪。
我正则按照它的规则修改了，您看下后端是否能正常识别出来这个版本是最新版。

@taoky
Copy link
Member

taoky commented Dec 29, 2024

名字仍然是不一致的 :(

我的建议是：筛选文件的时候就只选择 latest，然后 version 里面就对应写死 "Latest" 或者 "latest"

[
  {
    "distro": "Wireshark",
    "category": "app",
    "urls": [
      {
        "name": "latest (x64, msi)",
        "url": "/wireshark/win64/Wireshark-latest-x64.msi"
      },
      {
        "name": "latest (x64, exe, PortableApps)",
        "url": "/wireshark/win64/WiresharkPortable64_latest.paf.exe"
      },
      {
        "name": "latest (arm64, exe)",
        "url": "/wireshark/win64/Wireshark-latest-arm64.exe"
      },
      {
        "name": "latest (x64, exe)",
        "url": "/wireshark/win64/Wireshark-latest-x64.exe"
      },
      {
        "name": "Latest (Arm 64, dmg)",
        "url": "/wireshark/osx/Wireshark Latest Arm 64.dmg"
      },
      {
        "name": "Latest (Intel 64, dmg)",
        "url": "/wireshark/osx/Wireshark Latest Intel 64.dmg"
      }
    ]
  }
]

@laozhoubuluo
Copy link
Contributor Author

名字仍然是不一致的 :(

我的建议是：筛选文件的时候就只选择 latest，然后 version 里面就对应写死 "Latest" 或者 "latest"

写死了，应该这次都是 latest 了。

@laozhoubuluo laozhoubuluo requested a review from taoky December 29, 2024 11:25
taoky
taoky reviewed Dec 29, 2024
View reviewed changes
@Harry-Chen Harry-Chen merged commit a459a3b into mirrorz-org:main Dec 30, 2024
4 checks passed
@shirok1 shirok1 mentioned this pull request Jan 20, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@taoky taoky taoky approved these changes

@Harry-Chen Harry-Chen Awaiting requested review from Harry-Chen

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@laozhoubuluo @taoky @Harry-Chen