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

Add Mod Loader and MC Version changes to diff #48

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Add Mod Loader and MC Version changes to diff #48

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e50bd97
Fix newlines on some edge cases
Wxrlds Sep 12, 2024
737dba9
Add mod loader section to diff
Wxrlds Sep 18, 2024
3269677
Add Minecraft version section to diff
Wxrlds Sep 20, 2024
bbced1a
Fix verbose option crashing for mod loaders
Wxrlds Oct 8, 2024
1302bba
Merge branch 'juraj-hrivnak:main' into modloader-changelog
Wxrlds Oct 13, 2024
fff39df
Introduce functions and simplify logic
Wxrlds Oct 13, 2024
bf350a5
Add --header-size option
Wxrlds Oct 13, 2024
7f36f50
Implement diff test logic
Wxrlds Oct 29, 2024
13ce567
Remove comparison test and add test that checks for newlines around h…
Wxrlds Nov 23, 2024
8562ed5
Add test for "markdown-diff" diff
Wxrlds Nov 23, 2024
559e89b
Add comparison test
Wxrlds Nov 23, 2024
7f0ea3d
Rename header size variable
Wxrlds Dec 10, 2024
b36ac8b
Remove functions for added and removed versions
Wxrlds Dec 10, 2024
b7af9d1
Make console printing use less arguments
Wxrlds Dec 10, 2024
5339bb2
Move each test output into its own test
Wxrlds Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/topics/pakku-diff.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ Diff projects in modpack
`-v`, `--verbose`
: Gives detailed information on which mods were updated

`-h`, `--header-size`
: Specifies the base header size. Default = 2

</snippet>

`-h`, `--help`
Expand Down
356 changes: 285 additions & 71 deletions src/commonMain/kotlin/teksturepako/pakku/cli/cmd/Diff.kt
View file
Open in desktop

Large diffs are not rendered by default.

300 changes: 300 additions & 0 deletions src/commonTest/kotlin/teksturepako/pakku/cli/cmd/DiffTest.kt
View file
Open in desktop

Large diffs are not rendered by default.

255 changes: 255 additions & 0 deletions src/commonTest/resources/diffTest/combinations.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,255 @@
Game Added
Game Removed
Loader Added
Loader Removed
Loader Updated
Project Added
Project Removed
Project Updated
Game Added, Game Removed
Game Added, Loader Added
Game Added, Loader Removed
Game Added, Loader Updated
Game Added, Project Added
Game Added, Project Removed
Game Added, Project Updated
Game Removed, Loader Added
Game Removed, Loader Removed
Game Removed, Loader Updated
Game Removed, Project Added
Game Removed, Project Removed
Game Removed, Project Updated
Loader Added, Loader Removed
Loader Added, Loader Updated
Loader Added, Project Added
Loader Added, Project Removed
Loader Added, Project Updated
Loader Removed, Loader Updated
Loader Removed, Project Added
Loader Removed, Project Removed
Loader Removed, Project Updated
Loader Updated, Project Added
Loader Updated, Project Removed
Loader Updated, Project Updated
Project Added, Project Removed
Project Added, Project Updated
Project Removed, Project Updated
Game Added, Game Removed, Loader Added
Game Added, Game Removed, Loader Removed
Game Added, Game Removed, Loader Updated
Game Added, Game Removed, Project Added
Game Added, Game Removed, Project Removed
Game Added, Game Removed, Project Updated
Game Added, Loader Added, Loader Removed
Game Added, Loader Added, Loader Updated
Game Added, Loader Added, Project Added
Game Added, Loader Added, Project Removed
Game Added, Loader Added, Project Updated
Game Added, Loader Removed, Loader Updated
Game Added, Loader Removed, Project Added
Game Added, Loader Removed, Project Removed
Game Added, Loader Removed, Project Updated
Game Added, Loader Updated, Project Added
Game Added, Loader Updated, Project Removed
Game Added, Loader Updated, Project Updated
Game Added, Project Added, Project Removed
Game Added, Project Added, Project Updated
Game Added, Project Removed, Project Updated
Game Removed, Loader Added, Loader Removed
Game Removed, Loader Added, Loader Updated
Game Removed, Loader Added, Project Added
Game Removed, Loader Added, Project Removed
Game Removed, Loader Added, Project Updated
Game Removed, Loader Removed, Loader Updated
Game Removed, Loader Removed, Project Added
Game Removed, Loader Removed, Project Removed
Game Removed, Loader Removed, Project Updated
Game Removed, Loader Updated, Project Added
Game Removed, Loader Updated, Project Removed
Game Removed, Loader Updated, Project Updated
Game Removed, Project Added, Project Removed
Game Removed, Project Added, Project Updated
Game Removed, Project Removed, Project Updated
Loader Added, Loader Removed, Loader Updated
Loader Added, Loader Removed, Project Added
Loader Added, Loader Removed, Project Removed
Loader Added, Loader Removed, Project Updated
Loader Added, Loader Updated, Project Added
Loader Added, Loader Updated, Project Removed
Loader Added, Loader Updated, Project Updated
Loader Added, Project Added, Project Removed
Loader Added, Project Added, Project Updated
Loader Added, Project Removed, Project Updated
Loader Removed, Loader Updated, Project Added
Loader Removed, Loader Updated, Project Removed
Loader Removed, Loader Updated, Project Updated
Loader Removed, Project Added, Project Removed
Loader Removed, Project Added, Project Updated
Loader Removed, Project Removed, Project Updated
Loader Updated, Project Added, Project Removed
Loader Updated, Project Added, Project Updated
Loader Updated, Project Removed, Project Updated
Project Added, Project Removed, Project Updated
Game Added, Game Removed, Loader Added, Loader Removed
Game Added, Game Removed, Loader Added, Loader Updated
Game Added, Game Removed, Loader Added, Project Added
Game Added, Game Removed, Loader Added, Project Removed
Game Added, Game Removed, Loader Added, Project Updated
Game Added, Game Removed, Loader Removed, Loader Updated
Game Added, Game Removed, Loader Removed, Project Added
Game Added, Game Removed, Loader Removed, Project Removed
Game Added, Game Removed, Loader Removed, Project Updated
Game Added, Game Removed, Loader Updated, Project Added
Game Added, Game Removed, Loader Updated, Project Removed
Game Added, Game Removed, Loader Updated, Project Updated
Game Added, Game Removed, Project Added, Project Removed
Game Added, Game Removed, Project Added, Project Updated
Game Added, Game Removed, Project Removed, Project Updated
Game Added, Loader Added, Loader Removed, Loader Updated
Game Added, Loader Added, Loader Removed, Project Added
Game Added, Loader Added, Loader Removed, Project Removed
Game Added, Loader Added, Loader Removed, Project Updated
Game Added, Loader Added, Loader Updated, Project Added
Game Added, Loader Added, Loader Updated, Project Removed
Game Added, Loader Added, Loader Updated, Project Updated
Game Added, Loader Added, Project Added, Project Removed
Game Added, Loader Added, Project Added, Project Updated
Game Added, Loader Added, Project Removed, Project Updated
Game Added, Loader Removed, Loader Updated, Project Added
Game Added, Loader Removed, Loader Updated, Project Removed
Game Added, Loader Removed, Loader Updated, Project Updated
Game Added, Loader Removed, Project Added, Project Removed
Game Added, Loader Removed, Project Added, Project Updated
Game Added, Loader Removed, Project Removed, Project Updated
Game Added, Loader Updated, Project Added, Project Removed
Game Added, Loader Updated, Project Added, Project Updated
Game Added, Loader Updated, Project Removed, Project Updated
Game Added, Project Added, Project Removed, Project Updated
Game Removed, Loader Added, Loader Removed, Loader Updated
Game Removed, Loader Added, Loader Removed, Project Added
Game Removed, Loader Added, Loader Removed, Project Removed
Game Removed, Loader Added, Loader Removed, Project Updated
Game Removed, Loader Added, Loader Updated, Project Added
Game Removed, Loader Added, Loader Updated, Project Removed
Game Removed, Loader Added, Loader Updated, Project Updated
Game Removed, Loader Added, Project Added, Project Removed
Game Removed, Loader Added, Project Added, Project Updated
Game Removed, Loader Added, Project Removed, Project Updated
Game Removed, Loader Removed, Loader Updated, Project Added
Game Removed, Loader Removed, Loader Updated, Project Removed
Game Removed, Loader Removed, Loader Updated, Project Updated
Game Removed, Loader Removed, Project Added, Project Removed
Game Removed, Loader Removed, Project Added, Project Updated
Game Removed, Loader Removed, Project Removed, Project Updated
Game Removed, Loader Updated, Project Added, Project Removed
Game Removed, Loader Updated, Project Added, Project Updated
Game Removed, Loader Updated, Project Removed, Project Updated
Game Removed, Project Added, Project Removed, Project Updated
Loader Added, Loader Removed, Loader Updated, Project Added
Loader Added, Loader Removed, Loader Updated, Project Removed
Loader Added, Loader Removed, Loader Updated, Project Updated
Loader Added, Loader Removed, Project Added, Project Removed
Loader Added, Loader Removed, Project Added, Project Updated
Loader Added, Loader Removed, Project Removed, Project Updated
Loader Added, Loader Updated, Project Added, Project Removed
Loader Added, Loader Updated, Project Added, Project Updated
Loader Added, Loader Updated, Project Removed, Project Updated
Loader Added, Project Added, Project Removed, Project Updated
Loader Removed, Loader Updated, Project Added, Project Removed
Loader Removed, Loader Updated, Project Added, Project Updated
Loader Removed, Loader Updated, Project Removed, Project Updated
Loader Removed, Project Added, Project Removed, Project Updated
Loader Updated, Project Added, Project Removed, Project Updated
Game Added, Game Removed, Loader Added, Loader Removed, Loader Updated
Game Added, Game Removed, Loader Added, Loader Removed, Project Added
Game Added, Game Removed, Loader Added, Loader Removed, Project Removed
Game Added, Game Removed, Loader Added, Loader Removed, Project Updated
Game Added, Game Removed, Loader Added, Loader Updated, Project Added
Game Added, Game Removed, Loader Added, Loader Updated, Project Removed
Game Added, Game Removed, Loader Added, Loader Updated, Project Updated
Game Added, Game Removed, Loader Added, Project Added, Project Removed
Game Added, Game Removed, Loader Added, Project Added, Project Updated
Game Added, Game Removed, Loader Added, Project Removed, Project Updated
Game Added, Game Removed, Loader Removed, Loader Updated, Project Added
Game Added, Game Removed, Loader Removed, Loader Updated, Project Removed
Game Added, Game Removed, Loader Removed, Loader Updated, Project Updated
Game Added, Game Removed, Loader Removed, Project Added, Project Removed
Game Added, Game Removed, Loader Removed, Project Added, Project Updated
Game Added, Game Removed, Loader Removed, Project Removed, Project Updated
Game Added, Game Removed, Loader Updated, Project Added, Project Removed
Game Added, Game Removed, Loader Updated, Project Added, Project Updated
Game Added, Game Removed, Loader Updated, Project Removed, Project Updated
Game Added, Game Removed, Project Added, Project Removed, Project Updated
Game Added, Loader Added, Loader Removed, Loader Updated, Project Added
Game Added, Loader Added, Loader Removed, Loader Updated, Project Removed
Game Added, Loader Added, Loader Removed, Loader Updated, Project Updated
Game Added, Loader Added, Loader Removed, Project Added, Project Removed
Game Added, Loader Added, Loader Removed, Project Added, Project Updated
Game Added, Loader Added, Loader Removed, Project Removed, Project Updated
Game Added, Loader Added, Loader Updated, Project Added, Project Removed
Game Added, Loader Added, Loader Updated, Project Added, Project Updated
Game Added, Loader Added, Loader Updated, Project Removed, Project Updated
Game Added, Loader Added, Project Added, Project Removed, Project Updated
Game Added, Loader Removed, Loader Updated, Project Added, Project Removed
Game Added, Loader Removed, Loader Updated, Project Added, Project Updated
Game Added, Loader Removed, Loader Updated, Project Removed, Project Updated
Game Added, Loader Removed, Project Added, Project Removed, Project Updated
Game Added, Loader Updated, Project Added, Project Removed, Project Updated
Game Removed, Loader Added, Loader Removed, Loader Updated, Project Added
Game Removed, Loader Added, Loader Removed, Loader Updated, Project Removed
Game Removed, Loader Added, Loader Removed, Loader Updated, Project Updated
Game Removed, Loader Added, Loader Removed, Project Added, Project Removed
Game Removed, Loader Added, Loader Removed, Project Added, Project Updated
Game Removed, Loader Added, Loader Removed, Project Removed, Project Updated
Game Removed, Loader Added, Loader Updated, Project Added, Project Removed
Game Removed, Loader Added, Loader Updated, Project Added, Project Updated
Game Removed, Loader Added, Loader Updated, Project Removed, Project Updated
Game Removed, Loader Added, Project Added, Project Removed, Project Updated
Game Removed, Loader Removed, Loader Updated, Project Added, Project Removed
Game Removed, Loader Removed, Loader Updated, Project Added, Project Updated
Game Removed, Loader Removed, Loader Updated, Project Removed, Project Updated
Game Removed, Loader Removed, Project Added, Project Removed, Project Updated
Game Removed, Loader Updated, Project Added, Project Removed, Project Updated
Loader Added, Loader Removed, Loader Updated, Project Added, Project Removed
Loader Added, Loader Removed, Loader Updated, Project Added, Project Updated
Loader Added, Loader Removed, Loader Updated, Project Removed, Project Updated
Loader Added, Loader Removed, Project Added, Project Removed, Project Updated
Loader Added, Loader Updated, Project Added, Project Removed, Project Updated
Loader Removed, Loader Updated, Project Added, Project Removed, Project Updated
Game Added, Game Removed, Loader Added, Loader Removed, Loader Updated, Project Added
Game Added, Game Removed, Loader Added, Loader Removed, Loader Updated, Project Removed
Game Added, Game Removed, Loader Added, Loader Removed, Loader Updated, Project Updated
Game Added, Game Removed, Loader Added, Loader Removed, Project Added, Project Removed
Game Added, Game Removed, Loader Added, Loader Removed, Project Added, Project Updated
Game Added, Game Removed, Loader Added, Loader Removed, Project Removed, Project Updated
Game Added, Game Removed, Loader Added, Loader Updated, Project Added, Project Removed
Game Added, Game Removed, Loader Added, Loader Updated, Project Added, Project Updated
Game Added, Game Removed, Loader Added, Loader Updated, Project Removed, Project Updated
Game Added, Game Removed, Loader Added, Project Added, Project Removed, Project Updated
Game Added, Game Removed, Loader Removed, Loader Updated, Project Added, Project Removed
Game Added, Game Removed, Loader Removed, Loader Updated, Project Added, Project Updated
Game Added, Game Removed, Loader Removed, Loader Updated, Project Removed, Project Updated
Game Added, Game Removed, Loader Removed, Project Added, Project Removed, Project Updated
Game Added, Game Removed, Loader Updated, Project Added, Project Removed, Project Updated
Game Added, Loader Added, Loader Removed, Loader Updated, Project Added, Project Removed
Game Added, Loader Added, Loader Removed, Loader Updated, Project Added, Project Updated
Game Added, Loader Added, Loader Removed, Loader Updated, Project Removed, Project Updated
Game Added, Loader Added, Loader Removed, Project Added, Project Removed, Project Updated
Game Added, Loader Added, Loader Updated, Project Added, Project Removed, Project Updated
Game Added, Loader Removed, Loader Updated, Project Added, Project Removed, Project Updated
Game Removed, Loader Added, Loader Removed, Loader Updated, Project Added, Project Removed
Game Removed, Loader Added, Loader Removed, Loader Updated, Project Added, Project Updated
Game Removed, Loader Added, Loader Removed, Loader Updated, Project Removed, Project Updated
Game Removed, Loader Added, Loader Removed, Project Added, Project Removed, Project Updated
Game Removed, Loader Added, Loader Updated, Project Added, Project Removed, Project Updated
Game Removed, Loader Removed, Loader Updated, Project Added, Project Removed, Project Updated
Loader Added, Loader Removed, Loader Updated, Project Added, Project Removed, Project Updated
Game Added, Game Removed, Loader Added, Loader Removed, Loader Updated, Project Added, Project Removed
Game Added, Game Removed, Loader Added, Loader Removed, Loader Updated, Project Added, Project Updated
Game Added, Game Removed, Loader Added, Loader Removed, Loader Updated, Project Removed, Project Updated
Game Added, Game Removed, Loader Added, Loader Removed, Project Added, Project Removed, Project Updated
Game Added, Game Removed, Loader Added, Loader Updated, Project Added, Project Removed, Project Updated
Game Added, Game Removed, Loader Removed, Loader Updated, Project Added, Project Removed, Project Updated
Game Added, Loader Added, Loader Removed, Loader Updated, Project Added, Project Removed, Project Updated
Game Removed, Loader Added, Loader Removed, Loader Updated, Project Added, Project Removed, Project Updated
Game Added, Game Removed, Loader Added, Loader Removed, Loader Updated, Project Added, Project Removed, Project Updated
12 changes: 12 additions & 0 deletions src/commonTest/resources/diffTest/diffMatch/1-markdown-diff-expected.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
```diff
+ 1.7.10
- 1.14

+ Fabric
- Forge
! Neoforge

+ Applied Energistics 2
- ContentTweaker
! Mekanism
```
12 changes: 12 additions & 0 deletions src/commonTest/resources/diffTest/diffMatch/1-markdown-diff-verbose-expected.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
```diff
+ 1.7.10
- 1.14

+ Fabric
- Forge
! Neoforge 21.1.64 -> Neoforge 21.1.65

+ Applied Energistics 2
- ContentTweaker
! Mekanism-1.12.2-9.7.2.373.jar -> Mekanism-1.12.2-9.7.4.375.jar
```
37 changes: 37 additions & 0 deletions src/commonTest/resources/diffTest/diffMatch/1-markdown-expected.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
## Minecraft

### Added

- 1.7.10

### Removed

- 1.14

## Loaders

### Added

- Fabric

### Removed

- Forge

### Updated

- Neoforge

## Projects

### Added

- Applied Energistics 2

### Removed

- ContentTweaker

### Updated

- Mekanism
37 changes: 37 additions & 0 deletions src/commonTest/resources/diffTest/diffMatch/1-markdown-verbose-expected.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
## Minecraft

### Added

- 1.7.10

### Removed

- 1.14

## Loaders

### Added

- Fabric

### Removed

- Forge

### Updated

- Neoforge 21.1.64 -> Neoforge 21.1.65

## Projects

### Added

- Applied Energistics 2

### Removed

- ContentTweaker

### Updated

- Mekanism-1.12.2-9.7.2.373.jar -> Mekanism-1.12.2-9.7.4.375.jar
1 change: 1 addition & 0 deletions src/commonTest/resources/diffTest/diffMatch/1-new.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"mc_versions":["1.21","1.16","1.7.10"],"loaders":{"neoforge":"21.1.65","quilt":"0.26.3","fabric":"0.16.4"},"projects":[{"pakku_id":"mVI8OcdAvlmoplT1","type":"MOD","slug":{"curseforge":"mekanism"},"name":{"curseforge":"Mekanism"},"id":{"curseforge":"268560"},"files":[{"type":"curseforge","file_name":"Mekanism-1.12.2-9.7.4.375.jar","mc_versions":["1.12.2"],"release_type":"release","url":"https://edge.forgecdn.net/files/2707/235/Mekanism-1.12.2-9.7.4.375.jar","id":"2707235","parent_id":"268560","hashes":{"sha1":"48fa3295b050d3f88934f9fbf8ac9972430b0aa7","md5":"8ba28800a7b27124125c5f62d8a1ba7d"},"required_dependencies":[],"size":7921690}]},{"pakku_id":"McxeYHDSbBIxuT1h","type":"MOD","slug":{"curseforge":"chisel"},"name":{"curseforge":"Chisel"},"id":{"curseforge":"235279"},"files":[{"type":"curseforge","file_name":"Chisel-MC1.12.2-0.2.1.35.jar","mc_versions":["1.12.1","1.12.2"],"release_type":"beta","url":"https://edge.forgecdn.net/files/2619/468/Chisel-MC1.12.2-0.2.1.35.jar","id":"2619468","parent_id":"235279","hashes":{"sha1":"1dda45074e17128451b3c8f66172bfaddf84f443","md5":"dbda5475859bcffc9f572c5a1506a1f4"},"required_dependencies":["267602"],"size":4310011}]},{"pakku_id":"9w5zQeCOycVOIVbD","type":"MOD","slug":{"curseforge":"ender-io"},"name":{"curseforge":"Ender IO"},"id":{"curseforge":"64578"},"files":[{"type":"curseforge","file_name":"EnderIO-1.12.2-5.0.43.jar","mc_versions":["1.12.2"],"release_type":"release","url":"https://edge.forgecdn.net/files/2692/118/EnderIO-1.12.2-5.0.43.jar","id":"2692118","parent_id":"64578","hashes":{"sha1":"091a898644292b1eec56d1b6f697c87c2f669588","md5":"a08e6e9c81135fa77ac1df1f2f98c594"},"required_dependencies":["231868"],"size":7288125}]},{"pakku_id":"404Wa3Gx9kPP5KFO","type":"MOD","slug":{"curseforge":"applied-energistics-2"},"name":{"curseforge":"Applied Energistics 2"},"id":{"curseforge":"223794"},"files":[{"type":"curseforge","file_name":"appliedenergistics2-rv6-stable-6.jar","mc_versions":["1.12.2"],"release_type":"release","url":"https://edge.forgecdn.net/files/2652/453/appliedenergistics2-rv6-stable-6.jar","id":"2652453","parent_id":"223794","hashes":{"sha1":"e5b66725610e84b35faac0514e49f9ee4b5beeb9","md5":"9c7b1b142d9676cec4f92b7e07ac3cd9"},"required_dependencies":[],"size":4062132}]}],"lockfile_version":1}
Loading