-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
SABnzbd: use cross/7zz and cross/unrar7 #6366
Conversation
- add cross7zip v24.09 - add p7zip to development environment - add 7z to extract methods - temp install p7zip
- add unrar v7.1.2
- avoid the need of p7zip
hey @hgy59, I note a build error because there is no dependent package. This I believe can be easily fixed with a conditional in the |
@mreid-tt you can create a dedicated PR (I will add 7zip and unrar7 to spk/sabnzbd, so this will not be an issue here). |
I've done a test install on DSM 7.2.2-72806 Update 2 on x64 and it installs okay. I've also done some test downloads to test out the new decompression binaries. Everything looks good so far... Startup detects the new tools:
Decompression using both of these work well:
|
- add patch to define additional cflags for ARMv7 - add patch for older compilers (required for x64 and evansport on DSM 6) - add patch to fix XzCrc64Opt.c (required for qoriq) - add custom patch target to make files to patch writable and to run patch in different folder
- remove cross/busybox: use cross/coreutils for nice and cross/ionice - update cross/coreutils from v8.21 to v9.5 and limit tools to 'nice' - remarks: DSM 6+ and SRM 1.3+ already have nice (but an older version)
- update cross/par2cmdline-turbo to v1.2.0 and optimize code - fix of animetosho/par2cmdline-turbo#22 is included - former post_install_target is obsolete
@Safihre this PR is now an update of SABnzb dependencies. Can you please have a look at the packages created by github build action? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice work. Just for some reason it isn't picking up the new 7zip, but unrar is working.. Strange!
Tested on my arch64-7.1 system.
I promised a reward, so you can contact me on Discord so I can send it to you for the work :)
cross/7zz/Makefile
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why also include 7zz?
One of them is enough?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
7zz has additional capabilities like unrar and is the recommended tool under linux,
but sabnzbd does not support it (yet?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do support it, it's the first one we look for:
https://github.com/sabnzbd/sabnzbd/blob/7de08693765fac39192e4cbcffdcc725244a943e/sabnzbd/newsunpack.py#L148-L154
Could use that one instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes we can.
does SABnzbd use 7zz to unpack rar or does it still require unrar?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unrar is more optimized for Rar and since most of usenet content is rar'ed it makese sense that it's the main tool.
@@ -0,0 +1 @@ | |||
bin:bin/7za |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For some reason SABnzbd isn't seeing it and jumping to the old system 7zip.
2025-01-13 22:37:33,269::INFO::[SABnzbd:460] UNRAR binary... found (/volume1/@appstore/sabnzbd/bin/unrar)
2025-01-13 22:37:33,269::INFO::[SABnzbd:468] UNRAR binary version 7.10
2025-01-13 22:37:33,270::INFO::[SABnzbd:475] 7za binary... found (/bin/7z)
2025-01-13 22:37:33,270::INFO::[SABnzbd:477] 7za binary version 16.02
We just look at the PATH
and then check for any of the listed executable names in each part of the PATH
.
https://github.com/sabnzbd/sabnzbd/blob/7de08693765fac39192e4cbcffdcc725244a943e/sabnzbd/newsunpack.py#L148-L154
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Safihre thanks for the feedback, guess I fixed it.
Formats supported by 7za:
Formats supported by 7zz:
|
Thanks, I did this for free. You can sponser the SynoCommunity project instead (hopefully we will get a new respository server some day). |
Donated $250. |
I've performed another test install on DSM 7.2.2-72806 Update 2 on x64 and it installs okay. I've also done some test downloads to test out the new decompression binaries. Decompression using both of these work well:
As for the startup, this reports the following detections:
Note that it reports |
- avoid conflicting changes with SynoCommunity#6366
* redesign dependency-list creation for github prepare action - add script to evaluate the dependencies - use new script in global Makefile for the dependency-list target - use global Makefile to create dependency-list in prepare.sh - avoid variables in DEPENDS definitions - make dependency-list.sh executable * stockfish-webgui: fix digests * dependency-list: add python and ffmpeg dependency based on include file * revert changes in sabnzbd - avoid conflicting changes with #6366 * revert changes in vim - avoid conflicting changes with #6398 * revert changes in java-11-openjdk - avoid conflicting changes with #6394
@hgy59, is this ready to merge now? |
It will still be a while before the next Sab release, so I think this shouldn't wait for that. |
Description
related to #6356 (comment)
Add cross/7zz, cross/7za and cross/unrar7
SABnzbd
Fixes #
Checklist
all-supported
completed successfullyType of change