Compare commits

...

444 Commits

Author SHA1 Message Date
Safihre
11ba9ae12a Set version to 4.5.5 2025-10-24 12:58:51 +02:00
Safihre
a61a5539a7 Merge branch '4.5.x' 2025-10-24 12:58:35 +02:00
Safihre
77f7490aea Update text files for 4.5.5 2025-10-24 12:56:26 +02:00
Safihre
a7198b6a81 Merge branch 'develop' into 4.5.x 2025-10-24 12:47:36 +02:00
Safihre
4c77954526 Add 4.5.5 to appdata 2025-10-24 12:47:26 +02:00
SABnzbd Automation
a229a2a5ea Update translatable texts
[skip ci]
2025-10-24 10:35:59 +00:00
Safihre
0a2f3865ee Check if all macOS binary files support the minimal required version 2025-10-24 12:27:48 +02:00
Safihre
900e68bb9a Resolve PyGithub deprecation warnings 2025-10-22 23:25:42 +02:00
Safihre
977dbc805f Set version to 4.5.4 2025-10-22 23:09:30 +02:00
Safihre
abcca19820 Merge branch '4.5.x' 2025-10-22 23:09:14 +02:00
Safihre
52a7b5dcff Update text files for 4.5.4 2025-10-22 23:05:40 +02:00
Safihre
9518714885 Merge branch 'develop' into 4.5.x 2025-10-22 22:35:07 +02:00
Safihre
1de674a532 Correct appdata between branches 2025-10-22 22:33:55 +02:00
Safihre
e1dad3e4c4 Start SABnzbd service after installation, if installed 2025-10-20 13:18:44 +02:00
SABnzbd Automation
44f2eb8620 Update translatable texts
[skip ci]
2025-10-20 07:57:56 +00:00
renovate[bot]
70945a9c5b Update all dependencies (#3167)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-20 09:57:12 +02:00
SABnzbd Automation
fdfca97dfa Update translatable texts
[skip ci]
2025-10-16 08:58:27 +00:00
Safihre
b84900dcb5 Add extra warning to Remove All Orphans
See https://forums.sabnzbd.org/viewtopic.php?p=133922
2025-10-16 10:57:31 +02:00
Safihre
d989ec928a Small styling issue for tooltip in Night mode 2025-10-14 11:12:06 +02:00
Safihre
4a89fcf8ea Update text files for 4.5.4RC1 2025-10-13 16:25:48 +02:00
SABnzbd Automation
d7fa3e1f7b Update translatable texts
[skip ci]
2025-10-13 14:24:54 +00:00
Safihre
d11e757c6e Merge branch 'develop' into 4.5.x 2025-10-13 16:24:19 +02:00
Safihre
c1417c319d Add tooltip that users need to Test Server before saving/next 2025-10-13 16:24:04 +02:00
Safihre
6689939cc9 Large par2 files could require more parsing to get all crc32 slices
Closes #3164
2025-10-13 15:26:55 +02:00
Safihre
09347d0766 Switch everything to Python 3.14 2025-10-13 07:44:35 +02:00
SABnzbd Automation
41db09057c Update translatable texts
[skip ci]
2025-10-13 01:10:52 +00:00
renovate[bot]
6983058f49 Update all dependencies (#3165)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-13 01:09:52 +00:00
SABnzbd Automation
fb2d412c97 Update translatable texts
[skip ci]
2025-10-08 21:01:13 +00:00
Safihre
1c0b1205b2 Add quota notifications
Closes #2926
2025-10-08 22:58:08 +02:00
Safihre
f556cea488 Use release version of Python 3.14 in CI 2025-10-08 20:07:39 +02:00
Sander
a2447253a0 Local ipv4 with socks5 proxy (#3161)
* Update all dependencies

* use socks5 server as test server

* make black happy

* improved active_socks5_proxy(): default port = 1080

* improved local_ipv4()

* use int_conv

* black

* use socks.socksocket.default_proxy directly

* active_socks5_proxy cleaner with int_conv

* correct to windows-2022

* socks.socksocket.default_proxy as check

* uniform naming socks5host/port

Closes #3154
---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: sanderjo <sander.jonkers+github@github.com>
2025-10-08 19:10:47 +02:00
Safihre
3393d7c976 Changing server name shows button "failure" instead of "saving..."
Closes #1551
2025-10-06 15:54:11 +02:00
renovate[bot]
06572bdf7d Update all dependencies (#3159)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-06 02:33:57 +00:00
Safihre
4f9ed7803f Update text files for 4.5.4Beta2 2025-10-05 23:08:14 +02:00
Safihre
95bc069af9 Merge branch 'develop' into 4.5.x 2025-10-05 22:58:51 +02:00
Safihre
d4411f1b8f Replace vendored rarfile with official one
Closes #2560
2025-10-05 22:40:30 +02:00
SABnzbd Automation
1bfd1b8f41 Update translatable texts
[skip ci]
2025-10-05 20:38:14 +00:00
Safihre
c47dbfdc26 Let unrar handle rename of chars invalid on Windows filesystem
Closes #1574

Add tests for long paths

Make sure long path is >260

Add rar test file with invalid Windows filenames

Add rar_unpack tests for unicode and passworded sets

Simplify Unrar command building

Add test for rar_invalid_windows

Remove check for 260 chars in rar_unpack

Should never happen anymore

Let Unrar rename invalid filenames

Check full path output if rar_unpack

Add helper for check

Correct test_rar_unpack_invalid_windows_filenames

Apply changes also to Direct Unpacker

Extend testing to make sure full paths are tested

Add tests for long paths inside rar

Unrar auto-rename message is different on Linux
2025-10-05 22:37:22 +02:00
Safihre
b5e55cd9b2 Unselect Multi-Operations Play/Resume on second click
Closes #2725
2025-10-03 15:06:37 +02:00
Hugo Lloreda
85c98d7203 Add option to bind outgoing connections (#3155)
* refactor outgoing interface

* refactor

* rollback old change

* We actually don't need another port


Closes #3153

* refactor

* refactor

* refactor to be compatible with old python versions

* forgot to remove match

* fix no route to host on mac

* fix no route to host on mac + rename interface to ip

* fix black + try to fix windows error

* fix black + try to fix windows error

* fix windows error

* fix windows failure

* rollback optional changes

* Remove optional type

* rollback changes + fix issue

* black change

* refactor

* missing refactor
2025-10-03 11:28:44 +02:00
Safihre
9e95717619 Enable Make Windows compatible if we cannot write special characters 2025-09-30 12:18:18 +02:00
SABnzbd Automation
90b4ff2720 Update translatable texts
[skip ci]
2025-09-30 09:28:01 +00:00
Safihre
0f97a9fdfc Workaround for macOS statvfs no longer needed
Part of Python 3.13 and above.
https://github.com/python/cpython/pull/99570
2025-09-30 11:21:14 +02:00
Safihre
90caf0c164 Lock changes to job properties during URL-grabbed NZO creation
Closes #1908
2025-09-29 15:51:26 +02:00
Safihre
9b3fe470a0 Run tests on Python 3.14
Force newer pytest

Force beta release of tavern

Unfix werkzeug

Allow latest tavern only on Python 3.11 and above

Fix test failure in Python 3.14
2025-09-29 13:29:50 +02:00
SABnzbd Automation
ab318729ab Update translatable texts
[skip ci]
2025-09-29 10:43:50 +00:00
Safihre
9576554426 Move to top/bottom for Multi edit
Closes #1088
2025-09-29 12:40:44 +02:00
Safihre
3cd819b78d Refactor history API call handling 2025-09-29 11:56:03 +02:00
renovate[bot]
bb24f3f04e Update all dependencies (#3156)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-09-29 07:28:52 +00:00
Safihre
6f4416236d Prevent renovate from updating macOS version
Due to #3131
2025-09-29 09:10:23 +02:00
SABnzbd Automation
47dcccd17f Update translatable texts
[skip ci]
2025-09-26 14:29:44 +00:00
Safihre
6b026d8274 Add way to mark job as Completed and remove Incomplete
Closes #1174
2025-09-26 16:28:57 +02:00
Safihre
ec18606557 Require correct server test in Wizard
Closes #3148
General refactor.
2025-09-25 13:40:25 +02:00
Safihre
825322baa4 Set version to 4.5.3 2025-08-25 15:25:56 +02:00
Safihre
7a5ca5b226 Merge branch '4.5.x' 2025-08-25 15:25:41 +02:00
Safihre
6864810ace Set version to 4.5.2 2025-07-09 20:22:44 +02:00
Safihre
bae55636a8 Merge branch '4.5.x' 2025-07-09 20:22:27 +02:00
Safihre
3b72a005fd Set version to 4.5.1 2025-04-11 11:48:24 +02:00
Safihre
afb9a4758f Merge branch '4.5.x' 2025-04-11 11:47:59 +02:00
Safihre
bd9a8e5c33 Set version to 4.5.0 2025-03-30 18:09:51 +02:00
Safihre
c55d662e1f Merge branch '4.5.x' 2025-03-30 18:07:42 +02:00
Safihre
d897936da5 Set version to 4.4.1 2024-12-20 14:10:49 +01:00
Safihre
f81a8c97c4 Merge branch '4.4.x' 2024-12-20 11:16:30 +01:00
Safihre
e93e01dd59 Update text files for 4.4.1 2024-12-20 11:16:01 +01:00
Safihre
79b504ff93 Update text files for 4.4.1RC1 2024-12-18 13:17:47 +01:00
Safihre
52dafd4ab8 Add new Certificate verification setting Medium
Closes #2993
2024-12-18 12:53:59 +01:00
Safihre
0cc538ac5a Don't block virusscanner certificates on Windows
See #2993
2024-12-14 21:52:47 +01:00
Safihre
4b99d04454 Add missing hidden import for Windows notifications 2024-12-13 15:00:19 +01:00
Safihre
708fad33f3 Set version to 4.4.0 2024-12-09 21:56:46 +01:00
Safihre
c6dc25c9c2 Merge branch '4.4.x' 2024-12-09 21:56:29 +01:00
Safihre
07be38cd01 Update text files for 4.4.0 2024-12-09 21:55:33 +01:00
Safihre
0121e0ae16 Update release date of 4.4.0 in appdata 2024-12-09 21:50:07 +01:00
Safihre
f24b3ced28 Set version to 4.3.3 2024-08-21 13:26:46 +02:00
Safihre
157dfc928d Merge branch '4.3.x' 2024-08-21 13:26:14 +02:00
Safihre
d10639542d Update text files for 4.3.3 2024-08-21 13:25:48 +02:00
Safihre
c0f0b7eb31 Add Docker to CPU label 2024-08-19 20:22:29 +02:00
Safihre
d6d70325db Small style fixes for the Config 2024-08-19 20:22:23 +02:00
Safihre
46954165d2 Update text files for 4.3.3RC2 2024-08-17 15:08:57 +02:00
Safihre
58e7d520bf increase_bad_articles_counter should be called before register_article 2024-08-17 15:08:03 +02:00
Safihre
a4f8040324 Prevent excessive newswrapper data buffer size
Closes #2895
2024-08-17 15:07:57 +02:00
Safihre
8d5cc9a3e6 Do not use article_queue when resetting newswrapper
Relates to #2866
2024-08-17 15:07:52 +02:00
jcfp
4592ce4d55 Remove pyfakefs workarounds and put its new apply_umask option to good use (#2922) 2024-08-17 15:07:47 +02:00
Safihre
b62b38b5af Update text files for 4.3.3RC1 2024-08-13 10:29:25 +02:00
renovate[bot]
14b1d4630c Update all dependencies 2024-08-13 10:16:28 +02:00
Safihre
8a42abd1e7 Set version to 4.3.2 2024-05-29 16:38:23 +02:00
Safihre
41e5dfdf18 Merge branch '4.3.x' 2024-05-29 16:28:43 +02:00
Safihre
41de13388c Merge branch '4.3.x' 2024-05-04 09:48:35 +02:00
Safihre
1f16f13169 Set version to 4.3.1 2024-05-03 15:30:36 +02:00
Safihre
ef23d40972 Merge branch '4.3.x' 2024-05-03 15:30:17 +02:00
Safihre
b07b43496c Set version to 4.3.0 2024-05-01 21:45:22 +02:00
Safihre
2ba04f1a6a Merge branch '4.3.x' 2024-05-01 21:44:38 +02:00
Safihre
e7e06dea41 Update text files for 4.2.3 2024-03-11 08:42:25 +01:00
Safihre
ce32504a81 Set version to 4.2.3 2024-03-11 08:25:26 +01:00
Safihre
7cd6c94482 Merge branch '4.2.x' 2024-03-11 08:24:46 +01:00
Safihre
fcb3d01194 Correct input placeholder styling in Night themes 2024-03-04 09:57:51 +01:00
Safihre
af0b53990c Update text files for 4.2.3RC3 2024-03-04 08:46:42 +01:00
Safihre
e3861954ba Support NNTP code 220 after ARTICLE request
Closes #2817
2024-03-02 21:40:56 +01:00
Safihre
006dd8dc77 Do not log NNTP data in unknown status code warning
See #2817
2024-03-02 21:23:25 +01:00
Safihre
dbff203c62 Update text files for 4.2.3RC2 2024-02-26 22:30:38 +01:00
Safihre
f45eb891cd Correct translatable texts about connection threads 2024-02-26 22:23:51 +01:00
Safihre
77b58240cf Reduce Server test timeout to 10s
Unless otherwise specified
Related to #2802
2024-02-26 22:23:51 +01:00
Safihre
97ae1ff10e Refactor part of database.py
Use autocommit and skip unnecessary checks on every connect
2024-02-26 22:23:51 +01:00
Safihre
8734a4f24b Update text files for 4.2.3RC1 2024-02-19 22:19:43 +01:00
Shane Mc Cormack
480fce55a8 Handle NNTP error code 451 (#2808)
* Handle error code 451.

This is used by some servers to show that an article was intentionally removed.
Fix #2807

* Add a warning when an unknown status code is given for an article.

* Make warning message translatable.
2024-02-19 22:06:29 +01:00
thezoggy
d4136fadd2 Add missing tooltips (#2800)
Co-authored-by: Safihre <safihre@sabnzbd.org>
2024-02-18 13:42:48 +01:00
Safihre
308bc375bd Update log message about version check 2024-02-18 13:42:31 +01:00
Safihre
3bbcf6a41e Update standby command on macOS 2024-02-18 13:41:33 +01:00
Safihre
3d5d10a4c1 Remove parsing of Group command code
Since we never request it.
2024-02-18 13:41:05 +01:00
Safihre
0e979c14f0 Remove Send Group option
Closes #2715
2024-02-18 13:38:31 +01:00
Safihre
70f49114ac Wrong archive password is used for Retry
Closes #2790
2024-02-18 13:38:13 +01:00
Safihre
f730607414 Set version to 4.2.2 2024-01-30 21:48:15 +01:00
Safihre
0172ee25c9 Merge branch '4.2.x' 2024-01-30 21:47:59 +01:00
Safihre
699d75bb9f Update text files for 4.2.2 2024-01-30 21:46:56 +01:00
Safihre
95822704c8 Update black formatting 2024-01-30 21:36:34 +01:00
Safihre
76e5f69e67 Only attempt Windows Toasts on Windows 10 and above 2024-01-29 16:34:03 +01:00
Safihre
abd31d0249 Update text files for 4.2.2RC2 2024-01-24 13:28:19 +01:00
Safihre
9ae7ee6e2d Add logging which notification will be sent 2024-01-22 15:15:44 +01:00
Safihre
18f4cc25f3 Add 4.2.1 to appdata 2024-01-05 10:11:07 +01:00
Safihre
b755192600 Update version to 4.2.1 2024-01-05 09:54:19 +01:00
Safihre
045140cfbc Merge branch '4.2.x' 2024-01-05 09:54:04 +01:00
Safihre
4e7e44e25f Set version to 4.2.0 2024-01-03 14:17:07 +01:00
Safihre
5c4dfa4cc6 Merge branch '4.2.x' 2024-01-03 14:14:25 +01:00
Safihre
b7e3401e8e Set version to 4.1.0 2023-09-26 15:12:39 +02:00
Safihre
90cee7fb31 Merge branch '4.1.x' 2023-09-26 15:11:58 +02:00
Safihre
8e0e3cf35e Update appdata.xml for 4.1.0 2023-09-26 15:07:08 +02:00
Safihre
7f72584537 Update text files for 4.1.0 2023-09-26 14:28:05 +02:00
renovate[bot]
8f0d606892 Update dependency cryptography to v41.0.4 [SECURITY] 2023-09-26 14:15:15 +02:00
Safihre
9fafe64cff Update version to 4.0.3 2023-07-10 14:55:46 +02:00
Safihre
94b42e0597 Merge branch '4.0.x' 2023-07-10 14:55:16 +02:00
Safihre
b2c1960d93 Release notes were not present in releases 2023-07-10 14:54:34 +02:00
Safihre
9d24b4cc35 Correct finding of release in appdata 2023-07-10 14:19:56 +02:00
Safihre
3d675b033c Update text files for 4.0.3 2023-07-10 13:43:06 +02:00
Sander
0d2d9be8b3 better docker detections: works for older and newer docker versions (#2606)
* better docker detections: works for Ubuntu 18.04 and 22.04

* DOCKER = False, needed for non-POSIX

---------

Co-authored-by: sander <san.d.erjonkers+github@gmail.com>
2023-07-03 16:11:25 +02:00
Safihre
6e9b6dab97 add a grace period for expected filenames to show up (#2609) 2023-07-03 16:11:04 +02:00
Michael Nightingale
44a1717f6d Fix uu decoding when collapsing of lines starting with a doubled period is required (#2605) 2023-06-28 10:01:15 +02:00
Safihre
4f51c74297 Build binary using Python 3.11.4 2023-06-28 10:01:01 +02:00
thezoggy
87c64a8c5d add random import back to fixup (#2604) 2023-06-27 09:06:25 +02:00
Safihre
b6c6635f22 Add newline after link to Downloads page in Reddit post 2023-06-23 21:45:36 +02:00
Safihre
5a7abcb07c Update text files for 4.0.3RC1 2023-06-23 14:03:26 +02:00
jcfp
65232d134b Fix sorting for #2551 (#2598)
* fix #2551

* add test data dirs

* move sorting test data into subdir

* undo change to sabnews.create_nzb
2023-06-23 13:52:26 +02:00
Safihre
d7b4bdefe5 Check if version is present appdata before releasing 2023-06-23 13:52:12 +02:00
Safihre
6d9174bea1 Additional logging to debug Direct Unpack 2023-06-23 13:52:07 +02:00
François M
921edfd4c5 Add versions to appdata (#2595) 2023-06-23 13:52:00 +02:00
Safihre
786d5b0667 Lock add/remove_socket in Downloader
See if we can resolve #2591
2023-06-23 13:51:49 +02:00
Safihre
e846c71f20 Link to Downloads page was not included in Reddit post 2023-06-16 11:48:52 +02:00
Safihre
0108e2ef5a Update text files for 4.0.3Beta1 2023-06-16 10:53:58 +02:00
Safihre
9a81277ff6 No longer * import AppKit and Foundation 2023-06-16 09:07:29 +02:00
Safihre
06cc2ff316 Update release script to post directly to r/usenet and include link 2023-06-13 14:06:38 +02:00
renovate[bot]
7cdf4cb48c Update all dependencies 2023-06-13 14:06:31 +02:00
thezoggy
c34c547f1f Unable to modify Sorters (#2587) 2023-06-13 14:06:22 +02:00
Safihre
9507294db7 Move DirScanner Lock creation 2023-06-13 14:06:12 +02:00
Safihre
ae7dd62d9f Only initialize DirScanner Lock after starting event loop 2023-06-13 14:06:05 +02:00
renovate[bot]
52e309cb09 Update all dependencies 2023-06-13 14:06:00 +02:00
jcfp
b580373982 Fix sorting lowercasing (#2584)
* run lowercasing on season pack setname

* also subject %fn to lowercasing

* add tests

* woops
2023-06-13 14:05:37 +02:00
renovate[bot]
ec7bde5bb2 Update dependency cryptography to v41 [SECURITY] (#2583)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-13 14:05:30 +02:00
Safihre
3516eeec5b Force full refresh after changing items-per-page
Closes #2416
2023-06-13 14:05:24 +02:00
Safihre
52351192e6 Use more reliable marker if job is still active 2023-06-13 14:05:18 +02:00
Safihre
3a6f04496d Set version to 4.0.2 2023-06-07 17:31:29 +02:00
Safihre
47f2df2112 Merge branch '4.0.x' 2023-06-07 17:25:45 +02:00
Safihre
363a26b8a1 Update text files for 4.0.2 2023-06-07 17:24:54 +02:00
Safihre
7e50a00f55 Correct parameter in release script to merge PR of update 2023-05-31 22:06:26 +02:00
Safihre
a7d6a80e82 Update text files for 4.0.2RC2 2023-05-31 21:49:02 +02:00
Safihre
e7da95b2ac Merge branch 'develop' into 4.0.x 2023-05-31 21:38:48 +02:00
Safihre
74fca23d59 Update text files for 4.0.2RC1 2023-05-23 21:31:43 +02:00
Safihre
0a12fa1253 Merge branch 'develop' into 4.0.x 2023-05-23 21:31:11 +02:00
Safihre
1263068140 Set version to 4.0.1 2023-05-01 21:46:30 +02:00
Safihre
916c191b18 Merge branch '4.0.x' 2023-05-01 21:46:02 +02:00
Safihre
d8c0220353 Update text files for 4.0.1 2023-05-01 21:45:27 +02:00
Safihre
4ab425d15c Update appdata for 4.0.1 release 2023-05-01 21:41:48 +02:00
François M
74e5633d1c Add releases tag (#2539)
* Add 3.7.2 release tag

* Add 4.0.0 placeholder
2023-05-01 21:41:37 +02:00
Safihre
89d36bbc61 Update sabctools to 7.0.2 2023-05-01 21:36:32 +02:00
Safihre
1877ac18a5 Show a better crash on Python <3.8 2023-05-01 21:36:23 +02:00
Safihre
5e42e25617 Set version to 4.0.0 2023-04-28 14:56:51 +02:00
Safihre
c27c9564cf Merge branch '4.0.x' 2023-04-28 14:53:02 +02:00
Safihre
c4b0da335d Update text files for 4.0.0 2023-04-28 14:47:36 +02:00
Safihre
fab36ec008 Set version to 3.7.2 2023-02-05 22:17:20 +01:00
Safihre
8a2b875779 Merge branch '3.7.x' 2023-02-05 22:15:54 +01:00
Safihre
efaffb8298 Update text files for 3.7.2 2023-02-05 22:15:40 +01:00
jcfp
e004eb3f00 restore startup history purge (#2449) 2023-02-05 22:08:12 +01:00
Safihre
43e8f6dc81 Update formatting with black 23 rules 2023-02-05 22:08:07 +01:00
Safihre
f5bff8fe7c Update copyright year to 2023 2023-02-05 22:07:42 +01:00
Safihre
fad8484b93 Update text files for 3.7.2RC1 2023-01-23 21:49:08 +01:00
Safihre
7664b54f89 Fix orjson to 3.8.3 due to issue in 3.8.4 2023-01-15 13:52:25 +01:00
Safihre
21cbc353dd Update text files for 3.7.2Beta1 2023-01-15 13:46:21 +01:00
Safihre
8d66306ec4 Merge branch 'develop' into 3.7.x 2023-01-15 13:35:21 +01:00
Safihre
479daf0e76 Set version to 3.7.1 2022-12-16 22:04:36 +01:00
Safihre
bf0fbb7b10 Merge branch '3.7.x' 2022-12-16 22:03:56 +01:00
Safihre
d3c91f1585 Update text files for 3.7.1 2022-12-16 22:02:40 +01:00
Safihre
ca165b328a Update text files for 3.7.1RC2 2022-12-06 17:10:08 +01:00
Safihre
fa2ffeea92 Merge branch 'develop' into 3.7.x 2022-12-06 17:07:31 +01:00
Safihre
0d00965ac3 Update text files for 3.7.1RC1 2022-12-01 16:33:59 +01:00
Safihre
7d7bec1f80 Merge branch 'develop' into 3.7.x 2022-12-01 16:09:09 +01:00
Safihre
b6fd915365 Set version to 3.7.0 2022-11-04 10:36:24 +01:00
Safihre
fecae72267 Merge branch '3.7.x' 2022-11-04 10:23:22 +01:00
Safihre
7bffd91e3f Update text files for 3.7.0 2022-11-04 10:18:37 +01:00
Safihre
f859521a7e Replace apple-actions/import-codesign-certs 2022-11-04 10:17:28 +01:00
renovate[bot]
a869386fac Update dependency cryptography to v38.0.3 [SECURITY] 2022-11-04 09:30:25 +01:00
Safihre
8bc7885b7a Update translatable texts
[skip ci]
2022-11-04 09:29:14 +01:00
Safihre
78be46738d Correct typo of Python 3.11 version 2022-10-27 10:07:01 +02:00
Safihre
6fce73855c Update text files for 3.7.0RC1 2022-10-27 09:08:20 +02:00
Safihre
fa844a6223 Update Release Notes with right version 2022-08-18 10:46:08 +02:00
Safihre
906379dd09 Set all versions to 3.6.1 2022-08-18 09:52:31 +02:00
Safihre
37cded612f Set version to 3.6.1 2022-08-18 08:48:09 +02:00
Safihre
73e8fade61 Merge branch '3.6.x' 2022-08-18 08:47:17 +02:00
Safihre
758cc7afab Update text files for 3.6.1RC2 2022-08-12 20:18:11 +02:00
Safihre
d74b7b06d2 Update Unrar to 6.11/6.12
Closes #2265
2022-08-12 20:16:34 +02:00
Safihre
39009f2f71 Update text files for 3.6.1RC1 2022-08-03 21:44:29 +02:00
jcfp
9fdc1c6813 use OSType in pyfakefs instead of setting separate properties (#2243) 2022-08-03 21:44:29 +02:00
Safihre
c5568fe830 Remove deprecation notices 2022-08-02 22:31:49 +02:00
Safihre
bad81f84b9 Update dependencies and Python version 2022-08-02 22:29:58 +02:00
Safihre
2ac08dd0e6 Remove new QuickCheck implementation
See https://github.com/sabnzbd/sabnzbd/discussions/2160
And https://github.com/sabnzbd/sabnzbd/issues/2251
2022-08-02 22:21:12 +02:00
Safihre
408ffc4539 Downloads in Checking-status were not displayed correctly
Closes #2249
2022-07-25 11:02:50 +02:00
Safihre
eb958327c5 Prevent scheduler crash if event is canceled that was no longer queued
https://www.reddit.com/r/SABnzbd/comments/vfa1fr/what_is_causing_this_error_its_not_harming/
2022-06-19 20:37:14 +02:00
Safihre
e157d77a1e Prevent crash in new Quick-check if file was already moved 2022-06-16 13:54:19 +02:00
Joulinar
e961c9ea8f Update sabyenc3 to 5.4.3 (#2209)
* Update requirements.txt

Update requirements sabyenc3 to new version

* Update sabyenc3 to 5.4.3

Update sabyenc3 to 5.4.2
2022-06-15 13:25:27 +02:00
Safihre
258c4f769d Prevent showing crash on Status window during Shutdown 2022-06-14 14:59:06 +02:00
Safihre
b31fedd857 Set version to 3.6.0 2022-06-07 12:23:13 +02:00
Safihre
eafe69500b Merge branch '3.6.x' 2022-06-07 12:22:36 +02:00
Safihre
ae09990c43 Update text files for 3.6.0 2022-06-07 12:20:28 +02:00
Safihre
cf54b65c32 Remove enable_https_verification from possible deprecation list 2022-06-07 09:29:09 +02:00
Safihre
7974421fa1 Update text files for 3.6.0RC3 2022-05-29 14:34:48 +02:00
Safihre
847a098d4e Update sabyenc3 to 5.4.2 2022-05-29 14:28:55 +02:00
Safihre
eb4de0ae0f Remove helpful warning about new quick-check for release 2022-05-28 20:19:59 +02:00
Safihre
bca9f3b753 Set version to 3.5.3 2022-03-17 14:29:50 +01:00
Safihre
cad8a9a5d3 Merge branch '3.5.x' 2022-03-17 14:12:55 +01:00
Safihre
f5f36d21e8 Update text files 3.5.3 2022-03-17 14:12:40 +01:00
Safihre
c51435c114 Revert "Notify users of Prowl/Pushover/Pushbullet to switch to nzb-notify"
This reverts commit 56fe140ebf.
2022-03-15 21:52:16 +01:00
Safihre
2a7f1780b4 Update text files for 3.5.3RC1 2022-03-13 13:26:18 +01:00
Safihre
98a44e40fb Jobs waiting to fetch get stuck indefinitely upon restart
Closes #2114
2022-03-11 16:29:28 +01:00
Safihre
65cf6fa9a1 Prevent Direct Unpack proceeding faster than it should, locking files
Relates to #2113
2022-03-11 16:29:19 +01:00
Safihre
b2e32d1720 Log also the OSError.winerror just to be sure 2022-03-11 16:29:11 +01:00
Safihre
f0bfedbe8e Revert "Revert "Disable buffering when writing files in assembler""
This reverts commit 03b380f90b.
2022-03-11 16:29:04 +01:00
Safihre
fd4e059c13 Set version to 3.5.2 2022-03-09 14:33:48 +01:00
Safihre
a53575e154 Merge branch '3.5.x' 2022-03-09 14:24:26 +01:00
Safihre
4a73484603 Update text files for 3.5.2 2022-03-09 14:24:13 +01:00
Safihre
03b380f90b Revert "Disable buffering when writing files in assembler"
This reverts commit 3c3aeac93c.

It turns out this causes problems!
2022-03-03 15:44:15 +01:00
Safihre
a2bd3b2dfe RSS filters At most/least were broken 2022-03-01 08:42:31 +01:00
Safihre
56fe140ebf Notify users of Prowl/Pushover/Pushbullet to switch to nzb-notify
Relates to #2093
2022-02-24 16:47:44 +01:00
Safihre
4fafcce740 Set version to 3.5.1 2022-02-20 19:47:55 +01:00
Safihre
02352c4ae6 Merge branch '3.5.x' 2022-02-20 19:37:50 +01:00
Safihre
4b74aab335 Update text files for 3.5.1 2022-02-20 19:36:51 +01:00
Safihre
2d67ac189d Add Debug logging when applying permissions failed 2022-02-16 13:08:12 +01:00
Safihre
8ece62e23d Add small delay to test_download check of result file
To prevent zip-test-failures on Windows.
2022-02-16 12:48:53 +01:00
Safihre
56c2bdd77d Allow chmod failures if no custom permissions are set
This is the same as before 3.5.0!
2022-02-16 11:32:15 +01:00
Safihre
1f555f1930 Update text files for 3.5.1RC2 2022-02-14 09:22:45 +01:00
Wolfgang Scherer
8496432c14 Do not fail if attribute subject is missing in NZB file-section (#2075)
* Use attribute poster of file element, if attribute subject ist missing

* Don't fail, if subject is missing.

* Textual change

Co-authored-by: Safihre <safihre@sabnzbd.org>
2022-02-14 09:16:29 +01:00
jcfp
1672ffa670 set log level of "completed not on fat" to debug 2022-02-14 09:16:23 +01:00
Safihre
6aab199f12 Wait before removing the temporary directory in binary test 2022-02-09 14:58:17 +01:00
Safihre
46d0c379a4 Fix version of more dependencies 2022-02-09 14:58:12 +01:00
Safihre
99240f145a Restore correct display of Direct Unpack progress 2022-02-07 15:27:54 +01:00
Safihre
3c9079d73c Correctly handle the transition from download to active post-processing 2022-02-07 15:22:58 +01:00
Safihre
0eb98b9a6c Use nzo.deleted instead of nzo.is_gone to prevent assembly during pp
Relates to #2059, #2054 and #1509.
2022-02-07 12:14:00 +01:00
Safihre
76bfd98b77 Prevent Direct Unpack crash on obfuscated posts
Closes #2060
2022-02-07 11:57:55 +01:00
Safihre
3348640c88 Correct undefined function remove_data 2022-02-05 09:51:36 +01:00
Safihre
d81c64fd2b Use notarytool on macOS to do notarization 2022-02-04 22:28:46 +01:00
Safihre
8b4c919617 Test starting of binary during release building 2022-02-04 21:53:04 +01:00
Safihre
76c58953df Pin even more requirements
Closes #2056
2022-02-04 10:09:53 +01:00
thezoggy
4ddc5caa49 pin builder setuptools to deal with breakage on pyinstaller 4.8 2022-02-04 09:08:51 +01:00
Safihre
694663bd95 Update text files for 3.5.1RC1 2022-02-03 20:09:38 +01:00
Safihre
62aba5844e Add small delay between volumes in Direct Unpack to prevent UnRar error 2022-01-31 12:23:38 +01:00
Safihre
d0d60cef05 Disable buffering when writing files in assembler 2022-01-31 12:23:31 +01:00
Safihre
3d293fdcb0 RSS feeds with HTML-chars in the feed name would result in crash 2022-01-31 12:23:23 +01:00
Safihre
96e9528046 Fix dependencies in requirements.txt and configure dependabot 2022-01-30 10:52:52 +01:00
Safihre
4ea24b3203 Black formatting update 2022-01-30 09:43:31 +01:00
Safihre
a756eea25a Set version to 3.5.0 2022-01-28 11:47:15 +01:00
Safihre
210020e489 Merge branch '3.5.x' 2022-01-28 11:42:22 +01:00
Safihre
e586ead024 Update text files for 3.5.0 2022-01-28 11:39:21 +01:00
Safihre
14c80bf1dc Reduce par2cmdline output log in Debug mode 2022-01-28 11:35:59 +01:00
Safihre
bdd56e794a Prevent extra error when no 7zip is available
Closes #2036, #2035
2022-01-23 13:41:26 +01:00
Safihre
a544548934 Set Python for macOS release to 3.10.2 2022-01-21 16:53:29 +01:00
Safihre
e06c1d61fb Update text files for 3.5.0RC4 2022-01-18 09:41:26 +01:00
Safihre
600c5209c6 HTML-sanitizer would sanitize the source data
Closes #2026
2022-01-17 14:08:08 +01:00
Safihre
bee90366ee Update text files for 3.5.0RC3 2022-01-16 19:02:50 +01:00
Safihre
e9bc4e9417 Sort sevenset so x.7z.001 is always the first file 2022-01-15 17:09:21 +01:00
Safihre
f01ff15761 Failed 7zip unpack was not reported in the history 2022-01-15 17:05:03 +01:00
Safihre
356ada159d Update text files for 3.5.0RC2 2022-01-13 14:48:30 +01:00
Safihre
cc831e16d8 Set version to 3.4.2 2021-10-15 08:28:14 +02:00
Safihre
b8dc46ad01 Merge branch '3.4.x' 2021-10-15 08:24:21 +02:00
Safihre
d8ab19087d Update text files for 3.4.2 2021-10-15 08:19:00 +02:00
Safihre
ec8a79eedd Revert to using regex based sample detection
Closes #1964
2021-10-13 18:24:48 +02:00
Safihre
f1e2a8e9d8 Prevent double guessit parsing 2021-10-12 09:02:03 +02:00
Safihre
4042a5fe5d Update text files for 3.4.2RC3 2021-10-08 10:41:27 +02:00
Safihre
a4752751ed Fix tavern for Python 3.6 and run tests on Python 3.10 (Linux-only) 2021-10-08 10:34:14 +02:00
Safihre
e23ecf46d1 Correct behavior of Sorter when no filename and/or extension is supplied
Closes #1962, #1957
2021-10-08 10:24:44 +02:00
Safihre
70a8c597a6 Only fail jobs if the sorter should have renamed 2021-10-08 09:58:17 +02:00
Safihre
fa639bdb53 Use general detection of RAR-files in file-extension correction
Correct file_extension test
2021-10-08 09:58:17 +02:00
Safihre
233bdd5b1d Update text files for 3.4.2RC2 2021-10-06 15:00:44 +02:00
Safihre
a0ab6d35c7 Require at least 1 category to be set for Sorting and warn if not set
Before 3.4.0, only for TV sorting we allowed to set 0 categories. But for Movies and Date Sorting we did require at least 1 category to be set. This was harmonized in 3.4.0, breaking existing setups. Added warning for those users.
The Sorting behavior is different from Notifications: in Notifications selecting Default only(!) means to apply it to all categories.
However, that has never been the case for Sorting. So for now added a bit more help texts to the Affected categories box on both pages.
2021-10-06 14:50:00 +02:00
Sander
bd29680ce7 make .cbz a well-known extension, so that no extension is added (#1960) 2021-10-06 14:49:54 +02:00
Sander
7139e92554 make .cbr a well-known extension, so that no extension (".rar") is added (#1959) 2021-10-05 12:19:55 +02:00
Safihre
897df53466 Check for puremagic and guessit first and add comments about cherrypy 2021-10-04 08:57:58 +02:00
Safihre
58281711f6 Always show number of MB missing
https://forums.sabnzbd.org/viewtopic.php?f=2&t=25573
2021-10-04 08:57:51 +02:00
Safihre
b524383aa3 Job failure due to Sorting-problems was not shown in the interface 2021-10-01 15:35:09 +02:00
Safihre
75a16e3588 Update text files for 3.4.2RC1 2021-09-30 09:04:12 +02:00
Safihre
1453032ad6 rXX files are popular extensions and don't need renames
Closes #1955
2021-09-29 13:53:47 +02:00
Safihre
824ab4afad Do not search whole file when checking if txt or nzb file 2021-09-29 13:53:37 +02:00
Safihre
73dd41c67f Only run process_unpacked_par2 when cleanup happened
Relates to https://forums.sabnzbd.org/viewtopic.php?f=1&t=25552
2021-09-29 13:53:32 +02:00
Safihre
59ee77355d Make add_parfile return if it could actually add the file
Maybe it was long finished, which could result in crashes.
Closes #1953
2021-09-29 13:53:20 +02:00
Safihre
5c758773ad Do not rename in decode_par2 if the filename didn't change
Closes #1952
2021-09-29 13:53:14 +02:00
Safihre
46de49df06 Set version to 3.4.1 2021-09-23 09:21:11 +02:00
Safihre
d1c54a9a74 Merge branch 'develop' 2021-09-23 08:50:17 +02:00
Safihre
e7527c45cd Set version to 3.4.0 2021-09-17 22:01:19 +02:00
Safihre
7d5207aa67 Merge branch 'develop' 2021-09-17 20:46:31 +02:00
Safihre
654302e691 Set version to 3.3.1 2021-06-18 13:52:58 +02:00
Safihre
ee673b57fd Merge branch '3.3.x' 2021-06-18 13:51:48 +02:00
Safihre
2be374b841 Update text files for 3.3.1 2021-06-18 13:51:33 +02:00
puzzledsab
906e1eda89 Keep password order 2021-06-13 16:21:41 +02:00
Safihre
ece02cc4fa Automatically publish release when all files are present 2021-06-11 17:39:30 +02:00
Safihre
876ad60ddf Update text files for 3.3.1RC1 2021-06-11 14:59:25 +02:00
Safihre
862da354ac Add direct opening of tabs by URL to Glitter tab-layout 2021-06-11 14:28:31 +02:00
Safihre
8fd477b979 Include wiki URL in Internal internet access denied message 2021-06-05 15:56:20 +02:00
Safihre
2d7005655c Clean timeline_total of BPSMeter
Received multiple reports that somehow it could get corrupt values in there
2021-06-05 15:56:16 +02:00
Safihre
7322f8348a Filtering active post-proc queue by category was broken 2021-06-05 15:56:09 +02:00
Safihre
e3e3a12e73 Correct example in test_name_extractor 2021-06-05 15:56:04 +02:00
Safihre
77cdd057a4 Filenames should end after the extension 2021-06-01 11:19:49 +02:00
Safihre
e8206fbdd9 Set version to 3.3.0 2021-06-01 07:35:13 +02:00
Jiri van Bergen
589f15a77b Merge branch '3.3.x' 2021-06-01 07:34:59 +02:00
Safihre
7bb443678a Build release when creating the tag 2021-06-01 07:18:41 +02:00
Safihre
6390415101 Update text files for 3.3.0 2021-06-01 07:16:42 +02:00
Sander
4abf192e11 deobfuscate: bugfix for collections if extension in CAPITALS (#1904) 2021-06-01 07:06:21 +02:00
Safihre
1fed37f9da Notify users that Plush will be removed in 3.4.0
Relates to #1902
2021-05-25 09:28:10 +02:00
Safihre
a9d86a7447 Set version to 3.2.1 2021-03-31 10:24:42 +02:00
Safihre
2abe4c3cef Merge branch '3.2.x' 2021-03-31 09:25:49 +02:00
Safihre
0542c25003 Update text files for 3.2.1
draft release
2021-03-31 09:24:31 +02:00
puzzledsab
1b8ee4e290 Show server expiration date in server summary (#1841) 2021-03-31 08:57:38 +02:00
Safihre
51128cba55 Do not notify warning/errors from same source twice
Closes #1842
2021-03-30 17:30:07 +02:00
Safihre
3612432581 Do not discard data for CrcError's
https://forums.sabnzbd.org/viewtopic.php?f=11&t=25278
2021-03-30 16:05:04 +02:00
Safihre
deca000a1b Revert some improvements to the encrypted RAR-detection
Closes #1840
2021-03-29 14:05:52 +02:00
Safihre
39cccb5653 Update text files for 3.2.1RC2
draft release
2021-03-24 10:13:43 +01:00
Safihre
f6838dc985 Improvements to the encrypted RAR-detection 2021-03-20 18:32:11 +01:00
Safihre
8cd4d92395 Make get_all_passwords return only unique passwords
If the filename and the NZB specified the same one it could occur 2 or 3 times.
2021-03-20 18:32:05 +01:00
Safihre
3bf9906f45 Update text files for 3.2.1RC1
draft release
2021-03-18 10:30:05 +01:00
Safihre
9f7daf96ef Update URL for Python 3 information 2021-03-18 09:10:39 +01:00
Sander
67de4df155 deobfuscate: no globber, but use given filelist (#1830) 2021-03-18 09:10:31 +01:00
Safihre
bc51a4bd1c Remove old compatibility code from BPSMeter that causes crash on startup
Closes #1827
2021-03-18 09:10:23 +01:00
Sander
bb54616018 deobfuscate: rename accompanying (smaller) files with same basename, and no renaming of collections with same extension (#1826)
* deobfuscate: rename accompanying (smaller) files with same basename

* deobfuscate: do not rename collections of same extension

* deobfuscate: collection ... much easier with one loop, thanks safihre.

* deobfuscate: globber_full, and cleanup

* deobfuscate: unittest test_deobfuscate_big_file_small_accompanying_files

* deobfuscate: unittest test_deobfuscate_collection_with_same_extension

* deobfuscate: unittest test_deobfuscate_collection_with_same_extension
2021-03-18 09:10:18 +01:00
Safihre
6bcff5e014 More space for the RSS table
Closes #1824
2021-03-18 09:10:09 +01:00
puzzledsab
8970a03a9a Use binary mode to make write test more accurate on Windows (#1815) 2021-03-10 22:23:10 +01:00
Safihre
3ad717ca35 Single indexer categories would be saved with "," between each letter 2021-03-10 22:23:10 +01:00
jcfp
b14f72c67a fix config auto_sort setting, broken by #1666 (#1813)
* fix config auto_sort setting, broken by #1666

* oops I did it again
2021-03-10 22:23:10 +01:00
Safihre
45d036804f Show name of item to be deleted from queue/history in confirm dialog 2021-03-10 22:23:10 +01:00
Safihre
8f606db233 Add traceback when failing to read the password file
Closes #1810
2021-03-10 22:23:10 +01:00
Safihre
3766ba5402 pre-create subdir if needed (POSIX, par2) (#1802)
* pre-create subdir it needed

* pre-create subdir it needed: check if already exists

* use os.makedirs() to handle subdir1/subdir2/blabla

* protect against malicous "..", and better naming

* check for Windows \ and POSIX /

* check again within path, typo and formatting

* regex: square brackets

* cleanup: only "/" can occur in par2

* cleanup: better logging

* unit test: testing of filesystem.renamer()

* if subdir specified in par2: let filesystem.renamer() do all the work

* if create_local_directories=True, then renamer() must stay within specified directory. Plus unittest for that.

* if create_local_directories=True, then renamer() must stay within specified directory. Plus unittest for that.

* more comments in code

* use filesystem.create_all_dirs(), less logging, clearer "..", and other feedback from Safihre

* make remote black happy too

* Small changes in wording of comments and error

Co-authored-by: Safihre <safihre@sabnzbd.org>
2021-03-10 22:23:10 +01:00
jxyzn
e851813cef Sanitize names possibly derived from X-DNZB-EpisodeName (#1806) 2021-03-10 22:15:23 +01:00
thezoggy
4d49ad9141 3.2.x cleanup (#1808)
* Update uni_config bootstrap css to same version of js (3.3.7).
* small accessibility change, removed thin dot border on focus

* Ignore VS Code settings folder

* cherry picked 'Fix disabled select for Glitter Night'

* glitter night - fix search border color
2021-02-27 14:47:44 +01:00
Safihre
16618b3af2 Set version to 3.2.0 2021-02-26 10:30:00 +01:00
Safihre
0e5c0f664f Merge branch '3.2.x' 2021-02-26 10:29:39 +01:00
Safihre
7be9281431 Update text files for 3.2.0
draft release
2021-02-26 09:56:47 +01:00
Safihre
ee0327fac1 Update macOS build Python to 3.9.2 2021-02-26 09:44:51 +01:00
Safihre
9930de3e7f Log all nzo_info when adding NZB's
Relates to #1806
2021-02-26 09:18:14 +01:00
Sander
e8503e89c6 handle gracefully if no malloc_trim() available (#1800) 2021-02-26 09:18:00 +01:00
puzzledsab
1d9ed419eb Remove some redundant ifs (#1791) 2021-02-26 09:17:29 +01:00
Safihre
0207652e3e Update text files for 3.2.0RC2
draft release
2021-02-08 21:02:38 +01:00
Safihre
0f1e99c5cb Update translatable texts 2021-02-08 13:29:16 +01:00
puzzledsab
f134bc7efb Right-to-Left support for Glitter and Config (#1776)
* Add rtl on main page

* Adjustments to rtl

* Forgot to add black check for this checkout

* Remove unnecessary style

* Remove more redundant attributes

* Some more reordering and alignment

* Align sorting and nzb drop downs

* Update NZB details and shutdown page

* Fix format

* Fix SABnzbd Config title tag

* Change file list header direction

* Set rtl variables in build_header instead and test dir="rtl" in config pages

* Revert some changes and handle styling using CSS

* Move more items to CSS

* Config RTL

* Move even more to CSS

* Small tweak

Co-authored-by: Safihre <safihre@sabnzbd.org>
2021-02-08 13:23:03 +01:00
puzzledsab
dcd7c7180e Do full server check when there are busy_threads (#1786)
* Do full server check when there are busy_threads

* Reduce next_article_search delay to 0.5s
2021-02-08 13:19:38 +01:00
jcfp
fbbfcd075b fix bonjour with localhost, retire LOCALHOSTS constant (#1782)
* fix bonjour with localhost, retire LOCALHOSTS constant

* rename probablyipv[46] functions to is_ipv[46]_addr

* refuse to send ssdp description_xml to outsiders
2021-02-08 13:19:30 +01:00
Safihre
f42d2e4140 Rename Glitter Default to Light and make Auto the new Default 2021-02-05 15:01:28 +01:00
Sam Edwards
88882cebbc Support for auto night mode switching in Glitter (#1783) 2021-02-05 15:01:13 +01:00
Safihre
17a979675c Do not re-release from GA when the release tag is pushed 2021-02-05 15:01:04 +01:00
Safihre
4642850c79 Set macOS Python installer target to "/" 2021-02-05 15:01:00 +01:00
Safihre
e8d6eebb04 Set version to 3.1.1 2020-11-11 22:04:44 +01:00
Safihre
864c5160c0 Merge branch '3.1.x' 2020-11-11 22:01:20 +01:00
Safihre
99b5a00c12 Update text files for 3.1.1 2020-11-11 21:56:15 +01:00
Safihre
85ee1f07d7 Do not crash if we cannot format the error message 2020-11-08 15:06:50 +01:00
exizak42
e58b4394e0 Separate email message lines are with CRLF (#1671)
SMTP protocol dictates that all lines are supposed to be separated
with CRLF and not LF (even on LF-based systems). This change ensures
that even if the original byte string message is using `\n` for line
separators, the SMTP protocol will still work properly.

This resolves sabnzbd#1669

Fix code formatting
2020-11-08 14:44:44 +01:00
Safihre
1e91a57bf1 It was not possible to set directory-settings to empty values 2020-11-06 16:14:53 +01:00
Safihre
39cee52a7e Update text files for 3.1.1RC1 2020-11-02 20:03:43 +01:00
Safihre
72068f939d Improve handling of binary restarts (macOS / Windows) 2020-11-02 19:57:57 +01:00
Safihre
096d0d3cad Deobfuscate-during-download did not work
https://forums.sabnzbd.org/viewtopic.php?f=3&t=25037
2020-11-01 15:35:09 +01:00
Safihre
2472ab0121 Python 3.5 does not know ssl.PROTOCOL_TLS_SERVER
Closes #1658
2020-10-27 15:52:28 +01:00
Safihre
00421717b8 Queue Repair would fail if Rating is enabled
Closes #1649
2020-10-24 11:10:03 +02:00
Safihre
ae96d93f94 Set version to 3.1.0 2020-10-16 17:02:28 +02:00
Safihre
8522c40c8f Merge branch '3.1.x' 2020-10-16 16:58:58 +02:00
Safihre
23f86e95f1 Update text files for 3.1.0 2020-10-16 16:42:35 +02:00
Safihre
eed2045189 After pre-check the job was not restored to the original spot 2020-10-16 16:27:51 +02:00
Safihre
217785bf0f Applying Filters to a feed would result in crash
Closes #1634
2020-10-15 18:07:06 +02:00
Safihre
6aef50dc5d Update text files for 3.1.0RC3 2020-10-02 11:34:21 +02:00
Safihre
16b6e3caa7 Notify users of Deobfuscate.py that it is now part of SABnzbd 2020-09-29 14:08:51 +02:00
Safihre
3de4c99a8a Only set the "Waiting" status when the job hits post-processing
https://forums.sabnzbd.org/viewtopic.php?f=11&t=24969
2020-09-29 13:51:15 +02:00
Safihre
980aa19a75 Only run Windows Service code when executed from the executables
Could be made to work with the from-sources code.. But seems like very small usecase.
Closes #1623
2020-09-29 10:42:23 +02:00
Safihre
fb4b57e056 Update text files for 3.1.0RC2 2020-09-27 17:19:34 +02:00
Safihre
03638365ea Set execute bit on Deobfuscate.py 2020-09-27 17:17:30 +02:00
Safihre
157cb1c83d Handle failing RSS-feeds for feedparser 6.0.0+
Closes #1621
Now throws warnings (that can be disabled, helpfull_warnings) if readout failed.
2020-09-27 13:32:38 +02:00
Safihre
e51f11c2b1 Do not crash if attributes file is not present 2020-09-25 10:50:19 +02:00
Safihre
1ad0961dd8 Existing files were not parsed when re-adding a job 2020-09-25 10:49:50 +02:00
Safihre
46ff7dd4e2 Do not crash if we can't save attributes, the job might be gone 2020-09-25 10:03:05 +02:00
Safihre
8b067df914 Correctly parse failed_only for Plush 2020-09-23 16:56:57 +02:00
Safihre
ef43b13272 Assume RarFile parses the correct filepaths for the RAR-volumes
Parsing UTF8 from command-line still fails.
https://forums.sabnzbd.org/viewtopic.php?p=122267#p122267
2020-09-21 22:12:43 +02:00
Safihre
e8e9974224 work_name would not be sanatized when adding NZB's
Closes #1615
Now with tests, yeah.
2020-09-21 22:12:34 +02:00
Safihre
feebbb9f04 Merge branch '3.0.x' 2020-09-13 16:40:43 +02:00
Safihre
bc4f06dd1d Limit feedparser<6.0.0 for 3.0.x 2020-09-13 16:40:14 +02:00
Safihre
971e4fc909 Merge branch '3.0.x' 2020-08-30 20:58:31 +02:00
Safihre
51cc765949 Update text files for 3.0.2 2020-08-30 20:50:45 +02:00
Safihre
19c6a4fffa Propagation delay label was shown even if no delay was activated 2020-08-29 16:46:16 +02:00
Safihre
105ac32d2f Reading RSS feed with no categories set could result in crash
Closes #1589
2020-08-28 10:16:49 +02:00
Safihre
57550675d2 Removed logging in macOS sabApp that resulted in double logging 2020-08-28 10:16:41 +02:00
Safihre
e674abc5c0 Update text files for 3.0.2RC2 2020-08-26 08:56:29 +02:00
Safihre
f965c96f51 Change the macOS power assertion to NoIdleSleep 2020-08-26 08:50:54 +02:00
Safihre
c76b8ed9e0 End-of-queue-script did not run on Windows due to long-path
https://forums.sabnzbd.org/viewtopic.php?f=3&t=24918

Will refactor this so they all call 1 function.
2020-08-24 11:28:14 +02:00
Safihre
4fbd0d8a7b Check if name is a string before switching to nzbfile in addfile
Closes #1584
2020-08-24 09:05:25 +02:00
Safihre
2186c0fff6 Update text files for 3.0.2 RC 1 2020-08-21 15:42:35 +02:00
Safihre
1adca9a9c1 Do not crash if certifi certificates are not available
This could happen on Windows, due to overactive virus scanners
2020-08-21 15:26:06 +02:00
Safihre
9408353f2b Priority was not parsed correctly if supplied as string 2020-08-21 15:12:09 +02:00
Safihre
84f4d453d2 Permissions would be set even if user didn't set any
Windows developers like me shouldn't do permissions stuff..
2020-08-21 15:12:01 +02:00
Safihre
d10209f2a1 Extend tests of create_all_dirs to cover apply_umask=False 2020-08-21 15:11:53 +02:00
Safihre
3ae149c72f Split the make_mo.py command for NSIS 2020-08-19 22:21:02 +02:00
Safihre
47385acc3b Make sure we force the final_name to string on legacy get_attrib_file 2020-08-19 16:21:13 +02:00
Safihre
814eeaa900 Redesigned the saving of attributes
Now uses pickle, so that the type of the property is preserved.
Made flexible, so that more properties can be easily added later.
Closes #1575
2020-08-19 16:21:07 +02:00
Safihre
5f2ea13aad NzbFile comparison could crash when comparing finished_files
https://forums.sabnzbd.org/viewtopic.php?f=3&t=24902&p=121748
2020-08-19 08:50:06 +02:00
Safihre
41ca217931 Merge branch '3.0.x' 2020-08-18 11:05:50 +02:00
Safihre
b57d36e8dd Set version information to 3.0.1 2020-08-18 11:05:36 +02:00
Safihre
9a4be70734 List Cheetah minimal version in requirements.txt 2020-08-18 08:21:20 +02:00
Safihre
a8443595a6 Generalize use of certifi module 2020-08-18 08:20:47 +02:00
Safihre
fd0a70ac58 Update text files for 3.0.1 2020-08-17 16:52:23 +02:00
Safihre
8a8685c968 Permissions should only be applied if requested
Corrects 050b925f7b
2020-08-16 18:28:39 +02:00
Safihre
9e6cb8da8e Temporarily set cheroot version due to it breaking our tests
cherrypy/cheroot/issues/312
2020-08-16 18:28:13 +02:00
Safihre
054ec54d51 Basic authentication option was broken
Closes #1571
2020-08-10 15:34:01 +02:00
Safihre
272ce773cb Update text files for 3.0.1RC1 2020-08-07 15:28:11 +02:00
Safihre
050b925f7b Permissions were not set correctly when creating directories (#1568)
Restores changes made in d2e0ebe
2020-08-07 15:22:53 +02:00
Safihre
0087940898 Merge branch '3.0.x' into master 2020-08-02 09:46:41 +02:00
Safihre
e323c014f9 Set version information to 3.0.0 2020-08-01 16:17:08 +02:00
Safihre
cc465c7554 Update text files for 3.0.0
🎉🎉
2020-08-01 15:59:30 +02:00
Safihre
14cb37564f Update translate-link in SABnzbd 2020-07-19 13:01:39 +02:00
Safihre
094db56c3b Default-text for Automatically sort queue 2020-07-16 22:29:02 +02:00
Safihre
aabb709b8b Update text files for 3.0.0 RC 2 2020-07-15 14:10:35 +02:00
Safihre
0833dd2db9 Update translatable texts in 3.0.x branch 2020-07-15 14:07:21 +02:00
Safihre
cd3f912be4 RAR-renamer should be run on badly named RAR-files
https://forums.sabnzbd.org/viewtopic.php?f=2&t=24514&p=121433
2020-07-15 14:01:48 +02:00
Safihre
665c516db6 Only really run pre-script when it is set 2020-07-12 14:20:18 +02:00
Safihre
b670da9fa0 Always use Default-priority when creating NZB-objects
Closes #1552
2020-07-12 14:03:07 +02:00
Safihre
80bee9bffe Search-icon would be shown on top of drop-downs
Closes #1545
2020-06-30 12:57:28 +02:00
Safihre
d85a70e8ad Always report API paused status as a boolean
Closes #1542
2020-06-30 10:26:34 +02:00
Safihre
8f21533e76 Set version to 2.3.9 2019-05-24 11:39:14 +02:00
Safihre
89996482a1 Merge branch '2.3.x' 2019-05-24 09:33:12 +02:00
Safihre
03c10dce91 Update text files for 2.3.9 2019-05-24 09:32:34 +02:00
Safihre
bd5331be05 Merge branch 'develop' into 2.3.x 2019-05-24 09:12:02 +02:00
Safihre
46e1645289 Correct typo in release notes 2019-05-18 10:56:39 +02:00
Safihre
4ce3965747 Update text files for 2.3.9RC2 2019-05-18 09:56:05 +02:00
Safihre
9d4af19db3 Merge branch 'develop' into 2.3.x 2019-05-18 09:45:20 +02:00
Safihre
48e034f4be Update text files for 2.3.9RC1 2019-05-07 13:50:20 +02:00
Safihre
f8959baa2f Revert "Notify develop-users that we will switch to Python 3"
This reverts commit fb238af7de.
2019-05-07 13:35:13 +02:00
Safihre
8ed5997eae Merge branch 'develop' into 2.3.x 2019-05-07 13:10:10 +02:00
Safihre
daf9f50ac8 Set version to 2.3.8 2019-03-18 11:10:56 +01:00
Safihre
6b11013c1a Merge branch '2.3.x' 2019-03-18 11:09:35 +01:00
75 changed files with 1840 additions and 3693 deletions

View File

@@ -28,7 +28,7 @@
"packageRules": [
{
"matchManagers": ["github-actions"],
"matchPackageNames": ["windows"],
"matchPackageNames": ["windows", "macos"],
"enabled": false
},
{

View File

@@ -13,10 +13,10 @@ jobs:
timeout-minutes: 30
steps:
- uses: actions/checkout@v5
- name: Set up Python 3.13
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: "3.13"
python-version: "3.14"
architecture: "x64"
cache: pip
cache-dependency-path: "**/requirements.txt"
@@ -89,18 +89,18 @@ jobs:
# We need the official Python, because the GA ones only support newer macOS versions
# The deployment target is picked up by the Python build tools automatically
# If updated, make sure to also set LSMinimumSystemVersion in SABnzbd.spec
PYTHON_VERSION: "3.13.7"
MACOSX_DEPLOYMENT_TARGET: "10.13"
PYTHON_VERSION: "3.14.0"
MACOSX_DEPLOYMENT_TARGET: "10.15"
# We need to force compile for universal2 support
CFLAGS: -arch x86_64 -arch arm64
ARCHFLAGS: -arch x86_64 -arch arm64
steps:
- uses: actions/checkout@v5
- name: Set up Python 3.13
- name: Set up Python
# Only use this for the caching of pip packages!
uses: actions/setup-python@v6
with:
python-version: "3.13"
python-version: "3.14"
cache: pip
cache-dependency-path: "**/requirements.txt"
- name: Cache Python download
@@ -219,7 +219,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: "3.x"
python-version: "3.14"
cache: pip
cache-dependency-path: "builder/release-requirements.txt"
- name: Download Source distribution artifact

View File

@@ -31,16 +31,16 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
name: ["Linux"]
os: [ubuntu-latest]
include:
- name: macOS
os: macos-13
python-version: "3.13"
python-version: "3.14"
- name: Windows
os: windows-2022
python-version: "3.13"
python-version: "3.14"
steps:
- uses: actions/checkout@v5

View File

@@ -30,7 +30,7 @@ jobs:
run: |
python3 tools/make_mo.py
- name: Push translatable and translated texts back to repo
uses: stefanzweifel/git-auto-commit-action@v6.0.1
uses: stefanzweifel/git-auto-commit-action@v7.0.0
if: env.TX_TOKEN
with:
commit_message: |

View File

@@ -1,12 +1,41 @@
Release Notes - SABnzbd 4.5.4 Beta 1
Release Notes - SABnzbd 4.5.5
=========================================================
## Bug fixes and changes in 4.5.5
* macOS: Failed to start on versions of macOS older than 11.
Python 3.14 dropped support for macOS 10.13 and 10.14.
Because of that macOS 10.15 is required to run 4.5.5.
## Bug fixes and changes in 4.5.4
* Handle `S04 - 10` (anime) episode notation for Sorting and Duplicate Detection.
* Active connections counter in Status window were not updated correctly.
* Windows: Release is now signed using SignPath Foundation certificate.
* Windows: Start SABnzbd directly from the installer.
### New Features
* History details now includes option to mark job as `Completed`.
* `Quota` notifications available for all notification services.
- Sends alerts at 75%, 90%, and 100% quota usage.
* Multi-Operations now supports Move to Top/Bottom.
* New `outgoing_nntp_ip` option to bind outgoing NNTP connections to specific IP address.
### Improvements
* Setup wizard now requires successful Server Test before proceeding.
* Anime episode notation `S04 - 10` now supported for Sorting and Duplicate Detection.
* Multi-Operations: Play/Resume button unselects on second click for better usability.
* Unrar now handles renaming of invalid characters on Windows filesystem.
* Switched from vendored `sabnzbd.rarfile` module to `rarfile>=4.2`.
* Warning displayed when removing all Orphaned jobs (clears Temporary Download folder).
### Bug Fixes
* Active connections counter in Status window now updates correctly.
* Job setting changes during URL-grabbing no longer ignored.
* Incomplete `.par2` file parsing no longer leaves files behind.
* `Local IPv4 address` now detectable when using Socks5 proxy.
* Server configuration changes no longer show `Failure` message during page reload.
### Platform-Specific
* Linux: `Make Windows compatible` automatically enabled when needed.
* Windows: Executables are now signed using SignPath Foundation certificate.
* Windows: Can now start SABnzbd directly from installer.
* Windows and macOS: Binaries now use Python 3.14.
## Bug fixes and changes in 4.5.3
@@ -59,10 +88,8 @@ Release Notes - SABnzbd 4.5.4 Beta 1
## Upgrade notices
* You can directly upgrade from version 3.0.0 and newer.
* Upgrading from older versions will require performing a `Queue repair`.
* Downgrading from version 4.2.0 or newer to 3.7.2 or older will require
performing a `Queue repair` due to changes in the internal data format.
* Direct upgrade supported from version 3.0.0 and newer.
* Older versions require performing a `Queue repair` after upgrading.
## Known problems and solutions

View File

@@ -16,7 +16,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import glob
import platform
import re
import sys
import os
@@ -28,6 +27,7 @@ import tarfile
import urllib.request
import urllib.error
import configobj
import packaging.version
from typing import List
from constants import (
@@ -109,6 +109,52 @@ def patch_version_file(release_name):
ver.write(version_file)
def test_macos_min_version(binary_path: str):
# Skip check if nothing was set
if macos_min_version := os.environ.get("MACOSX_DEPLOYMENT_TARGET"):
# Skip any arm64 specific files
if "arm64" in binary_path:
print(f"Skipping arm64 binary {binary_path}")
return
# Check minimum macOS version is at least mac OS10.13
# We only check the x86_64 since for arm64 it's always macOS 11+
print(f"Checking if binary supports macOS {macos_min_version} and above: {binary_path}")
otool_output = run_external_command(
[
"otool",
"-arch",
"x86_64",
"-l",
binary_path,
],
print_output=False,
)
# Parse the output for LC_BUILD_VERSION minos
# The output is very large, so that's why we enumerate over it
req_version = packaging.version.parse(macos_min_version)
bin_version = None
lines = otool_output.split("\n")
for line_nr, line in enumerate(lines):
if "LC_VERSION_MIN_MACOSX" in line:
# Display the version in the next lines
bin_version = packaging.version.parse(lines[line_nr + 2].split()[1])
elif "minos" in line:
bin_version = packaging.version.parse(line.split()[1])
if bin_version and bin_version > req_version:
raise ValueError(f"{binary_path} requires {bin_version}, we want {req_version}")
else:
# We got the information we need
break
else:
print(lines)
raise RuntimeError(f"Could not determine minimum macOS version for {binary_path}")
else:
print(f"Skipping macOS version check, MACOSX_DEPLOYMENT_TARGET not set")
def test_sab_binary(binary_path: str):
"""Wrapper to have a simple start-up test for the binary"""
with tempfile.TemporaryDirectory() as config_dir:
@@ -290,7 +336,11 @@ if __name__ == "__main__":
"macos/7zip/7zz",
]
for file_to_sign in files_to_sign:
print("Signing %s with hardended runtime" % file_to_sign)
# Make sure it supports the macOS versions we want first
test_macos_min_version(file_to_sign)
# Then sign in
print("Signing %s with hardened runtime" % file_to_sign)
run_external_command(
[
"codesign",
@@ -315,13 +365,16 @@ if __name__ == "__main__":
# Make sure we created a fully universal2 release when releasing or during CI
if RELEASE_THIS or ON_GITHUB_ACTIONS:
for bin_to_check in glob.glob("dist/SABnzbd.app/Contents/MacOS/**/*.so", recursive=True):
for bin_to_check in glob.glob("dist/SABnzbd.app/**/*.so", recursive=True):
print("Checking if binary is universal2: %s" % bin_to_check)
file_output = run_external_command(["file", bin_to_check], print_output=False)
# Make sure we have both arm64 and x86
if not ("x86_64" in file_output and "arm64" in file_output):
raise RuntimeError("Non-universal2 binary found!")
# Make sure it supports the macOS versions we want
test_macos_min_version(bin_to_check)
# Only continue if we can sign
if authority:
# We use PyInstaller to sign the main SABnzbd executable and the SABnzbd.app

View File

@@ -75,7 +75,7 @@ print("----")
# Check if tagged as release and check for token
gh_token = os.environ.get("AUTOMATION_GITHUB_TOKEN", "")
if RELEASE_THIS and gh_token:
gh_obj = github.Github(gh_token)
gh_obj = github.Github(auth=github.Auth.Token(gh_token))
gh_repo = gh_obj.get_repo("sabnzbd/sabnzbd")
# Read the release notes
@@ -86,7 +86,7 @@ if RELEASE_THIS and gh_token:
for release in gh_repo.get_releases():
if release.tag_name == RELEASE_VERSION:
gh_release = release
print("Found existing release %s" % gh_release.title)
print("Found existing release %s" % gh_release.name)
break
else:
# Did not find it, so create the release, use the GitHub tag we got as input

View File

@@ -2,9 +2,9 @@
# Note that not all sub-dependencies are listed, but only ones we know could cause trouble
pyinstaller==6.16.0
packaging==25.0
pyinstaller-hooks-contrib==2025.8
pyinstaller-hooks-contrib==2025.9
altgraph==0.17.4
wrapt==1.17.3
wrapt==2.0.0
setuptools==80.9.0
# For the Windows build

View File

@@ -159,7 +159,16 @@ Unicode true
;------------------------------------------------------------------
; Run as user-level at end of install
Function PageFinishRun
${StdUtils.ExecShellAsUser} $0 "$INSTDIR\SABnzbd.exe" "" ""
; Check if SABnzbd service is installed
!insertmacro SERVICE "installed" "SABnzbd" ""
Pop $0 ;response
${If} $0 == true
; Service is installed, start the service
!insertmacro SERVICE "start" "SABnzbd" ""
${Else}
; Service not installed, run executable as user
${StdUtils.ExecShellAsUser} $0 "$INSTDIR\SABnzbd.exe" "" ""
${EndIf}
FunctionEnd

View File

@@ -132,7 +132,7 @@
<textarea name="notes" id="notes" rows="3" cols="50"></textarea>
</div>
<div class="field-pair no-field-pair-bg">
<button class="btn btn-default addNewServer" disabled><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
<button class="btn btn-default addNewServer" disabled data-toggle="tooltip" data-placement="top" title="$T('wizard-test-server-required')"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
<button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
</div>
<div class="field-pair result-box">
@@ -464,14 +464,14 @@
When finished loading
**/
jQuery(document).ready(function(){
// Initialize tooltips
jQuery('[data-toggle="tooltip"]').tooltip()
// Reload form in case we change items that make the servers appear different
jQuery('input[name="priority"], input[name="displayname"], textarea[name="notes"]').on('change', function() {
jQuery('.fullform').submit(function() {
// No ajax this time
jQuery('input[name="ajax"]').val('')
// Skip the fancy stuff, just submit
this.submit()
})
jQuery('input[name="priority"], input[name="displayname"], textarea[name="notes"]').on('change', function(event) {
var parentForm = jQuery(event.target).parents("form")
parentForm.unbind("submit")
parentForm.find('input[name="ajax"]').val('')
})
/**
@@ -563,6 +563,9 @@
// Allow adding the new server if we are in the new-server section
if(theButton.parents("form[action='addServer']").length) {
jQuery(".addNewServer").removeAttr("disabled")
jQuery(".addNewServer").removeAttr("data-toggle")
jQuery(".addNewServer").removeAttr("title")
jQuery(".addNewServer").tooltip("destroy")
}
} else {
resultBox.addClass('alert-danger')
@@ -571,6 +574,10 @@
// Disable the adding of new server, just to be sure
if(theButton.parents("form[action='addServer']").length) {
jQuery(".addNewServer").attr("disabled", "disabled")
jQuery(".addNewServer").attr("data-toggle", "tooltip")
jQuery(".addNewServer").attr("data-placement", "top")
jQuery(".addNewServer").attr("title", "$T('wizard-test-server-required')")
jQuery(".addNewServer").tooltip()
}
}
});

View File

@@ -50,7 +50,6 @@ textarea,
.navbar-default .navbar-nav>li>a:focus,
.navbar-logo:hover,
.quoteBlock,
.selected,
.server-disabled,
#serverResponse,
.table>tbody>tr:nth-child(odd),
@@ -62,30 +61,10 @@ select:hover {
color: #EBEBEB !important;
}
.correct {
border: 2px solid #00cc22 !important;
}
.failed,
.required-star,
.error-text {
.failed {
color: #ff3333 !important;
}
.unselected,
.selected {
border: 1px solid #EBEBEB !important;
color: #EBEBEB !important;
}
.incorrect {
border: 2px solid #ff3333 !important;
}
.disabled-text {
color: #777 !important;
}
#rightGreyText,
small {
color: #c7c7c7 !important;
@@ -306,6 +285,14 @@ col2 h3 a,
border-top-color: #E4E4E4 !important;
}
.tooltip.left .tooltip-arrow {
border-left-color: #E4E4E4 !important;
}
.tooltip.right .tooltip-arrow {
border-right-color: #E4E4E4 !important;
}
.Special .glyphicon-asterisk {
color: #E4E4E4 !important;
}

View File

@@ -93,7 +93,10 @@
</div>
<div class="row">
<div class="col-sm-2">$T('status')</div>
<div class="col-sm-10" data-bind="text: glitterTranslate.status[historyStatus.status()] ? glitterTranslate.status[historyStatus.status()] : statusText()"></div>
<div class="col-sm-10">
<span data-bind="text: glitterTranslate.status[historyStatus.status()] ? glitterTranslate.status[historyStatus.status()] : statusText()"></span>
<a href="#" class="mark-completed-link" data-bind="visible: failed(), click: markAsCompleted" title="$T('button-mark-completed')"><span class="glyphicon glyphicon-ok"></span> $T('post-Completed')</a>
</div>
</div>
<div class="row">
<div class="col-sm-2">$T('size')</div>
@@ -146,6 +149,7 @@
<a href="#" class="hover-button history-archive" title="$T('showArchive') / $T('showAllHis')" data-tooltip="true" data-placement="top" data-bind="click: history.toggleShowArchive, css: { 'history-options-show-failed': history.showArchive }"><svg viewBox="6 6 36 36" height="14" width="14" class="archive-icon"><path d="M41.09 10.45l-2.77-3.36c-.56-.66-1.39-1.09-2.32-1.09h-24c-.93 0-1.76.43-2.31 1.09l-2.77 3.36c-.58.7-.92 1.58-.92 2.55v25c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-25c0-.97-.34-1.85-.91-2.55zm-17.09 24.55l-11-11h7v-4h8v4h7l-11 11zm-13.75-25l1.63-2h24l1.87 2h-27.5z"/></svg></a>
<a href="#" class="hover-button" title="$T('showFailedHis') / $T('showAllHis')" data-tooltip="true" data-placement="top" data-bind="click: history.toggleShowFailed, css: { 'history-options-show-failed': history.showFailed }"><span class="glyphicon glyphicon-exclamation-sign"></span></a>
<a href="#" class="hover-button" title="$T('link-retryAll')" data-tooltip="true" data-placement="top" data-bind="click: history.retryAllFailed"><span class="glyphicon glyphicon-repeat"></span></a>
<a href="#" class="hover-button" title="$T('button-mark-completed')" data-bind="visible: (history.isMultiEditing() && hasHistory()), click: history.doMultiMarkCompleted" data-tooltip="true" data-placement="top"><span class="glyphicon glyphicon-ok"></span></a>
<div data-bind="visible: (history.isMultiEditing() && hasHistory())">
<span class="label label-default" data-bind="text: history.multiEditItems().length">0</span>

View File

@@ -179,14 +179,20 @@
</a>
</div>
<div class="add-nzb-inputbox add-nzb-inputbox-small">
<label for="multiedit-play">
<label for="multiedit-play" data-bind="event: { mousedown: queue.handleMultiEditStatusMouseDown }">
<input type="radio" name="multiedit-status" value="resume" id="multiedit-play" data-bind="event: { change: queue.doMultiEditUpdate }" />
<span class="glyphicon glyphicon-play" title="$T('link-resume')" data-tooltip="true" data-placement="top"></span>
</label>
<label for="multiedit-pause">
<label for="multiedit-pause" data-bind="event: { mousedown: queue.handleMultiEditStatusMouseDown }">
<input type="radio" name="multiedit-status" value="pause" id="multiedit-pause" data-bind="event: { change: queue.doMultiEditUpdate }" />
<span class="glyphicon glyphicon-pause" title="$T('link-pause')" data-tooltip="true" data-placement="top"></span>
</label>
<a href="#" class="hover-button" title="$T('Glitter-top')" data-bind="click: queue.doMultiMoveToTop" data-tooltip="true" data-placement="top">
<span class="glyphicon glyphicon-chevron-up"></span>
</a>
<a href="#" class="hover-button" title="$T('Glitter-bottom')" data-bind="click: queue.doMultiMoveToBottom" data-tooltip="true" data-placement="top">
<span class="glyphicon glyphicon-chevron-down"></span>
</a>
<span class="label label-default" data-bind="text: queue.multiEditItems().length">0</span>
</div>
<div class="add-nzb-inputbox-clear"></div>

View File

@@ -52,16 +52,15 @@
var glitterTranslate = new Object();
glitterTranslate.paused = "$T('post-Paused')";
glitterTranslate.left = "$T('Glitter-left')";
glitterTranslate.clearWarn = "$T('confirm')";
glitterTranslate.clearOrphanWarning = "$T('Glitter-clearOrphanWarning')";
glitterTranslate.pausePromptFail = "$T('Glitter-pausePromptFail')"
glitterTranslate.pauseFor = "$T('pauseFor')"
glitterTranslate.minutes = "$T('mins')"
glitterTranslate.shutdown = "$T('shutdownOK?')";
glitterTranslate.restart = "$T('explain-Restart') $T('explain-needNewLogin')".replace(/\<br(\s*\/|)\>/g, '\n');
glitterTranslate.repair = "$T('explain-Repair')".replace(/<br \/>/g, "\n").replace(/&quot;/g,'"');
glitterTranslate.deleteMsg = "$T('nzo-delete')";
glitterTranslate.removeDown = "$T('confirm')";
glitterTranslate.removeDow1 = "$T('confirm')";
glitterTranslate.confirm = "$T('confirm')";
glitterTranslate.markComplete = "$T('button-mark-completed')";
glitterTranslate.renameAbort = "$T('Glitter-confirmAbortDirectUnpack')\n$T('confirm')";
glitterTranslate.retryAll = "$T('link-retryAll')?";
glitterTranslate.fetch = "$T('Glitter-fetch')";

View File

@@ -420,6 +420,42 @@ function HistoryListModel(parent) {
self.triggerRemoveDownload(self.multiEditItems())
}
// Mark jobs as completed
self.markAsCompleted = function(items) {
// Confirm
if(!confirm(glitterTranslate.markComplete)) {
return
}
// Single or multiple items?
var strIDs = '';
if(items.length) {
$.each(items, function(index) {
strIDs = strIDs + this.id + ',';
})
} else {
strIDs = items.id
}
// Send the API call
callAPI({
mode: 'history',
name: 'mark_as_completed',
value: strIDs
}).then(function(response) {
// Force refresh to update the UI
self.parent.refresh(true);
});
}
// Mark all selected as completed
self.doMultiMarkCompleted = function() {
// Anything selected?
if(self.multiEditItems().length < 1) return;
// Mark them
self.markAsCompleted(self.multiEditItems());
}
// Focus on the confirm button
$('#modal-delete-history-job').on("shown.bs.modal", function() {
$('#modal-delete-history-job .btn[type="submit"]').focus()
@@ -571,6 +607,11 @@ function HistoryModel(parent, data) {
$('#modal-retry-job').modal("show")
};
// Mark as completed button
self.markAsCompleted = function() {
parent.markAsCompleted(self);
};
// Update information only on click
self.updateAllHistoryInfo = function(data, event) {
// Show

View File

@@ -895,7 +895,7 @@ function ViewModel() {
// Orphaned folder deletion of all
self.removeAllOrphaned = function() {
if (!self.confirmDeleteHistory() || confirm(glitterTranslate.clearWarn)) {
if (confirm(glitterTranslate.clearOrphanWarning)) {
// Show notification
showNotification('.main-notification-box-removing-multiple', 0, self.statusInfo.folders().length)
// Delete them all
@@ -912,7 +912,7 @@ function ViewModel() {
// Orphaned folder adding of all
self.addAllOrphaned = function() {
if (!self.confirmDeleteHistory() || confirm(glitterTranslate.clearWarn)) {
if (confirm(glitterTranslate.confirm)) {
// Show notification
showNotification('.main-notification-box-sendback')
// Delete them all

View File

@@ -423,6 +423,21 @@ function QueueListModel(parent) {
}
// Handle mousedown to capture state before change
self.handleMultiEditStatusMouseDown = function(item, event) {
var clickedValue = $(event.currentTarget).find("input").val();
// If this radio was already selected (same value as previous), clear it
if ($('.multioperations-selector input[name="multiedit-status"]:checked').val() === clickedValue) {
// Clear all radio buttons in this group after the click finished
// Hacky, but it works
setTimeout(function () {
$('.multioperations-selector input[name="multiedit-status"]').prop('checked', false);
}, 200)
}
return true;
}
// Remove downloads from queue
self.removeDownloads = function(form) {
// Hide modal and show notification
@@ -456,6 +471,50 @@ function QueueListModel(parent) {
self.triggerRemoveDownload(self.multiEditItems())
}
// Move all selected to top
self.doMultiMoveToTop = function() {
// Anything selected?
if(self.multiEditItems().length < 1) return;
// Move each item to the top, starting from the last one in the sorted list
var arrayList = self.multiEditItems()
var movePromises = [];
for(var i = arrayList.length - 1; i >= 0; i--) {
movePromises.push(callAPI({
mode: "switch",
value: arrayList[i].id,
value2: 0
}));
}
// Wait for all moves to complete then refresh
Promise.all(movePromises).then(function() {
self.parent.refresh();
});
}
// Move all selected to bottom
self.doMultiMoveToBottom = function() {
// Anything selected?
if(self.multiEditItems().length < 1) return;
// Move each item to the bottom, starting from the first one in the sorted list
var arrayList = self.multiEditItems()
var movePromises = [];
for(var i = 0; i < arrayList.length; i++) {
movePromises.push(callAPI({
mode: "switch",
value: arrayList[i].id,
value2: self.totalItems() - 1
}));
}
// Wait for all moves to complete then refresh
Promise.all(movePromises).then(function() {
self.parent.refresh();
});
}
// Focus on the confirm button
$('#modal-delete-queue-job').on("shown.bs.modal", function() {
$('#modal-delete-queue-job .btn[type="submit"]').focus()

View File

@@ -860,7 +860,7 @@ tr.queue-item>td:first-child>a {
}
.multioperations-selector .add-nzb-inputbox {
width: 20%;
width: 19%;
float: left;
}
@@ -871,7 +871,7 @@ tr.queue-item>td:first-child>a {
}
.multioperations-selector .add-nzb-inputbox-small {
width: 80px;
width: 115px;
float: right;
padding-left: 0;
padding-top: 12px;
@@ -1097,6 +1097,13 @@ tr.queue-item>td:first-child>a {
font-weight: bold;
}
.mark-completed-link {
font-weight: bold !important;
color: #28a745 !important;
text-decoration: underline;
margin-left: 10px;
}
.history-status-hidden {
display: none;
}

View File

@@ -163,7 +163,7 @@ tr.queue-item>td:first-child>a {
}
.multioperations-selector .add-nzb-inputbox-small {
width: 72px;
width: 115px;
}
.multioperations-selector .add-nzb-inputbox-clear {

View File

@@ -7,7 +7,9 @@
<h1>$T('wizard-quickstart')</h1>
<hr />
<script type="text/javascript">
var txtTestServer = "$T('wizard-server-text')";
var txtChecking = "$T('srv-testing')";
var txtTestRequired = "$T('wizard-test-server-required')";
<!--#include raw $webdir + "/static/javascript/checkserver.js"#-->
</script>
<h3>$T('wizard-server')</h3>
@@ -22,7 +24,7 @@
<div class="form-group">
<label for="host" class="col-sm-4 control-label">$T('srv-host')</label>
<div class="col-sm-8">
<input type="text" class="form-control" name="host" id="host" value="$host" placeholder="$T('wizard-example') news.newshosting.com" />
<input type="text" class="form-control" name="host" id="host" value="$host" placeholder="$T('wizard-example') news.newshosting.com" required />
</div>
</div>
<div class="form-group">
@@ -57,13 +59,13 @@
<div class="form-group">
<label for="port" class="col-sm-4 control-label">$T('srv-port')</label>
<div class="col-sm-8">
<input type="number" class="form-control" name="port" id="port" value="<!--#if $port then $port else '563' #-->" min="0" max="65535" />
<input type="number" class="form-control" name="port" id="port" value="<!--#if $port then $port else '563' #-->" min="0" max="65535" required />
</div>
</div>
<div class="form-group">
<label for="connections" class="col-sm-4 control-label">$T('srv-connections')</label>
<div class="col-sm-8">
<input type="number" class="form-control" name="connections" id="connections" value="<!--#if $connections then $connections else '8'#-->" min="1" max="500" data-toggle="tooltip" data-placement="right" title="$T('wizard-server-con-explain') $T('wizard-server-con-eg')" />
<input type="number" class="form-control" name="connections" id="connections" value="<!--#if $connections then $connections else '8'#-->" min="1" max="500" data-toggle="tooltip" data-placement="right" title="$T('wizard-server-con-explain') $T('wizard-server-con-eg')" required />
</div>
</div>
<div class="form-group">
@@ -81,7 +83,7 @@
</div>
<div class="row">
<div class="col-sm-4">
<button id="serverTest" class="btn btn-default"><span class="glyphicon glyphicon-sort"></span> $T('wizard-button-testServer')</button>
<button id="serverTest" class="btn btn-default" data-toggle="tooltip" data-placement="left"><span class="glyphicon glyphicon-sort"></span> $T('wizard-button-testServer')</button>
</div>
<div class="col-sm-8">
<div id="serverResponse" class="well well-sm">$T('wizard-server-text')</div>

View File

@@ -1,9 +1,31 @@
// Variable to track server test results
var serverTestSuccessful = false;
function resetTestResult() {
serverTestSuccessful = false;
$('#serverResponse').html(txtTestServer);
checkRequired();
}
function setTestResult(success) {
serverTestSuccessful = success;
checkRequired();
}
function checkRequired() {
if ($("#host").val() && $("#connections").val()) {
// Check if form is valid using HTML5 validation and if server test passed
if ($("form").get(0).checkValidity() && serverTestSuccessful) {
$("#next-button").removeClass('disabled')
$("#next-button").removeAttr('data-toggle')
$("#next-button").removeAttr('title')
$("#next-button").tooltip('destroy')
return true;
} else {
$("#next-button").addClass('disabled')
$("#next-button").attr('data-toggle', 'tooltip')
$("#next-button").attr('data-placement', 'left')
$("#next-button").attr('title', txtTestRequired)
$("#next-button").tooltip()
return false;
}
}
@@ -12,8 +34,13 @@ $(document).ready(function() {
// Add tooltips
$('[data-toggle="tooltip"]').tooltip()
// On form-submit
// On server test button click
$("#serverTest").click(function() {
// Check HTML5 form validation before testing server
if (!$("form").get(0).reportValidity()) {
return false;
}
$('#serverResponse').html(txtChecking);
$.getJSON(
"../api?mode=config&name=test_server&output=json",
@@ -21,8 +48,10 @@ $(document).ready(function() {
function(result) {
if (result.value.result) {
r = '<span class="success"><span class="glyphicon glyphicon-ok"></span> ' + result.value.message + '</span>';
setTestResult(true);
} else {
r = '<span class="failed"><span class="glyphicon glyphicon-minus-sign"></span> ' + result.value.message + '</span>';
setTestResult(false);
}
r = r.replace('https://sabnzbd.org/certificate-errors', '<a href="https://sabnzbd.org/certificate-errors" class="failed" target="_blank">https://sabnzbd.org/certificate-errors</a>')
$('#serverResponse').html(r);
@@ -31,26 +60,9 @@ $(document).ready(function() {
return false;
});
$("#port, #connections").bind('keyup blur', function() {
if (this.value > 0) {
$(this).removeClass("incorrect");
$(this).addClass("correct");
} else {
$(this).removeClass("correct");
$(this).addClass("incorrect");
}
checkRequired()
});
$("#host, #username, #password").bind('keyup blur', function() {
if (this.value) {
$(this).removeClass("incorrect");
$(this).addClass("correct");
} else {
$(this).removeClass("correct");
$(this).addClass("incorrect");
}
checkRequired();
// Reset test result when any form field changes
$("#host, #username, #password, #port, #connections, #ssl_verify").bind('input change', function() {
resetTestResult();
});
$('#ssl').click(function() {
@@ -65,13 +77,14 @@ $(document).ready(function() {
$('#port').val('119')
}
}
resetTestResult();
})
checkRequired()
$('form').submit(function(event) {
// Double check
if(!checkRequired()) {
// Check if server test passed (HTML5 validation is automatic)
if(!serverTestSuccessful) {
event.preventDefault();
}
})

View File

@@ -98,43 +98,15 @@ label {
.align-center {
text-align: center;
}
.unselected,
.selected {
display: inline-block;
}
.unselected {
padding: 6px 10px 6px 10px;
border: 1px solid #636363;
margin-left: 8px;
margin-right: 8px;
color: #636363;
}
.selected {
padding: 6px 10px 6px 10px;
color: white;
background-color: #636363;
border: 1px solid #636363;
margin-left: 8px;
margin-right: 8px;
}
.bigger {
font-size: 14px;
}
.bigger input {
font-size: 16px;
}
.required-star {
color: red;
}
.full-width {
width: 100%;
}
.correct {
border: 2px solid #00cc22;
}
.incorrect {
border: 2px solid red;
}
.hidden {
display: none !important;
}
@@ -150,20 +122,12 @@ label {
.input-group-bw {
width: 150px;
}
.disabled-text {
text-decoration: line-through;
color: #ccc;
}
#serverResponse {
padding: 6px 10px;
}
#host-tip {
margin-bottom: 5px;
}
.error-text {
display: inline;
color: red;
}
#bandwidth {
display: inline-block;
}

View File

@@ -30,7 +30,8 @@
<url type="faq">https://sabnzbd.org/wiki/faq</url>
<url type="contact">https://sabnzbd.org/live-chat.html</url>
<releases>
<release version="4.5.4" date="2025-10-31" type="stable"/>
<release version="4.5.5" date="2025-10-24" type="stable"/>
<release version="4.5.4" date="2025-10-22" type="stable"/>
<release version="4.5.3" date="2025-08-25" type="stable"/>
<release version="4.5.2" date="2025-07-09" type="stable"/>
<release version="4.5.1" date="2025-04-11" type="stable"/>

View File

@@ -298,6 +298,19 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr ""
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py, sabnzbd/skintext.py
msgid "Quota"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr ""
@@ -1001,10 +1014,6 @@ msgstr ""
msgid "Unpacking failed, disk full"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr ""
@@ -2244,6 +2253,11 @@ msgstr ""
msgid "Retry"
msgstr ""
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3301,10 +3315,6 @@ msgstr ""
msgid "Naming"
msgstr ""
#: sabnzbd/skintext.py
msgid "Quota"
msgstr ""
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr ""
@@ -3402,7 +3412,7 @@ msgid "Warn 5 days in advance of account expiration date."
msgstr ""
#: sabnzbd/skintext.py
msgid "Quota for this account, counted from the time it is set. In bytes, optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few minutes."
msgid "Quota for this server, counted from the time it is set. In bytes, optionally follow with K,M,G.<br />Checked every few minutes. Notification is sent when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4308,6 +4318,10 @@ msgstr ""
msgid "Retry all"
msgstr ""
#: sabnzbd/skintext.py
msgid "Are you sure you want to delete all folders in your Temporary Download Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr ""
@@ -4546,6 +4560,11 @@ msgstr ""
msgid "Start Wizard"
msgstr ""
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr ""

View File

@@ -335,6 +335,20 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr "Kvóta přesažena, pozastavuji stahování"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Nesprávný parametr"
@@ -1076,10 +1090,6 @@ msgstr "Rozbalování selhalo, chyba zápisu nebo plný disk?"
msgid "Unpacking failed, disk full"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Rozbalování selhalo, cesta k souboru je příliš dlouhá."
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Rozbalení selhalo, archiv vyžaduje heslo"
@@ -2334,6 +2344,11 @@ msgstr "Jméno"
msgid "Retry"
msgstr "Opakovat"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3473,10 +3488,6 @@ msgstr ""
msgid "Naming"
msgstr ""
#: sabnzbd/skintext.py
msgid "Quota"
msgstr ""
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr ""
@@ -3579,9 +3590,9 @@ msgstr ""
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4524,6 +4535,12 @@ msgstr ""
msgid "Retry all"
msgstr "Opakovat vše"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Získat NZB z URL"
@@ -4770,6 +4787,11 @@ msgstr ""
msgid "Start Wizard"
msgstr ""
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr ""

View File

@@ -352,6 +352,20 @@ msgstr "Job \"%s\" er sandsynligvis krypteret: \"password\" i filnavnet \"%s\""
msgid "Quota spent, pausing downloading"
msgstr "Kvote brugt, pause downloading"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Kvota"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Fejl parameter"
@@ -1116,10 +1130,6 @@ msgstr "Udpakning mislykkedes, skrivefejl eller disken fuld?"
msgid "Unpacking failed, disk full"
msgstr "Udpakning mislykkedes, disken er fuld"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Udpakningen mislykkedes, stien er for lang"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Udpakning mislykkedes, arkivet kræver adgangskode"
@@ -2408,6 +2418,11 @@ msgstr "Navn"
msgid "Retry"
msgstr "Forsøg igen"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3600,10 +3615,6 @@ msgstr "Efterbehandling"
msgid "Naming"
msgstr "Navngivning"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Kvota"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Hvor meget der kan downloades i denne måned (K/M/G)"
@@ -3711,9 +3722,9 @@ msgstr ""
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4674,6 +4685,12 @@ msgstr "Fjern alle"
msgid "Retry all"
msgstr "Prøv igen alle"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Hent NZB fra URL"
@@ -4924,6 +4941,11 @@ msgstr "Afslut SABnzbd"
msgid "Start Wizard"
msgstr "Start guide"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr ""

View File

@@ -376,6 +376,20 @@ msgstr "Aufgabe \"%s\" ist wahrscheinlich verschlüsselt: \"Passwort\" im Datein
msgid "Quota spent, pausing downloading"
msgstr "Kontingent aufgebraucht, Downloads werden angehalten"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Kontingent"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Fehlerhafter Parameter"
@@ -1157,10 +1171,6 @@ msgstr ""
msgid "Unpacking failed, disk full"
msgstr "Fehler beim Entpacken: Festplatte voll"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Entpacken fehlgeschlagen, Pfad ist zu lang"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Entpacken fehlgeschlagen. Archiv benötigt ein Passwort."
@@ -2465,6 +2475,11 @@ msgstr "Name"
msgid "Retry"
msgstr "Erneut versuchen"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3729,10 +3744,6 @@ msgstr "Nachbearbeitung"
msgid "Naming"
msgstr "Benennung"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Kontingent"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Wie viel kann in diesem Monat heruntergeladen werden (K/M/G)?"
@@ -3846,13 +3857,10 @@ msgstr "5 Tage vor dem Ablauf des Accounts warnen."
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
"Kontingent für dieses Konto, gezählt ab dem Zeitpunkt, an dem es festgelegt "
"wird. In Bytes, optional gefolgt von K, M, G.<br />Warne, wenn es 0 "
"erreicht, wird alle paar Minuten überprüft."
#. Server's retention time in days
#: sabnzbd/skintext.py
@@ -4843,6 +4851,12 @@ msgstr "Alle löschen"
msgid "Retry all"
msgstr "Alle wiederholen"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "NZB aus URL laden"
@@ -5098,6 +5112,11 @@ msgstr "SABnzbd beenden"
msgid "Start Wizard"
msgstr "Assistenten starten"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr "Backup wiederherstellen"

View File

@@ -365,6 +365,20 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr "Quota gastado, pausando cola"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Cuota"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Parámetro incorrecto"
@@ -1148,10 +1162,6 @@ msgstr ""
msgid "Unpacking failed, disk full"
msgstr "Error al descomprimir, disco lleno"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Aperture de archivo fallo, la via es muy larga"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Error al descomprimir; El archivo está protegido por contraseña"
@@ -2456,6 +2466,11 @@ msgstr "Nombre"
msgid "Retry"
msgstr "Reintentar"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3703,10 +3718,6 @@ msgstr "Post procesado"
msgid "Naming"
msgstr "Nombrado"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Cuota"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Cantidad de descarga permitida este mes (K/M/G)"
@@ -3816,9 +3827,9 @@ msgstr "Advertir 5 días antes de la fecha de expiración de la cuenta."
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4812,6 +4823,12 @@ msgstr "Eliminar todo"
msgid "Retry all"
msgstr "Re-intentar todo"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Descargar NZB desde URL"
@@ -5067,6 +5084,11 @@ msgstr "Salir SABnzbd"
msgid "Start Wizard"
msgstr "Iniciar Asistente"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr "Restaurar copia de seguridad"

View File

@@ -334,6 +334,20 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr "Latausrajoitus saavutettu, keskeytetään lataukset"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Latausrajoitus"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Virheellinen parametri"
@@ -1079,10 +1093,6 @@ msgstr "Purkaminen epäonnistui, kirjoitusvirhe tai levy täynnä?"
msgid "Unpacking failed, disk full"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Purkaminen epäonnistui, polku on liian pitkä"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Purkaminen epäonnistui, arkisto vaatii salasanan"
@@ -2361,6 +2371,11 @@ msgstr "Nimi"
msgid "Retry"
msgstr "Yritä uudelleen"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3561,10 +3576,6 @@ msgstr "Jälkikäsittely"
msgid "Naming"
msgstr "Nimeäminen"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Latausrajoitus"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Kuinka paljon voidaan ladata tässä kuussa (K/M/G)"
@@ -3670,9 +3681,9 @@ msgstr ""
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4631,6 +4642,12 @@ msgstr "Poista kaikki"
msgid "Retry all"
msgstr "Yritä uudelleen kaikki"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Nouda NZB osoitteesta"
@@ -4883,6 +4900,11 @@ msgstr "Poistu SABnzbd:stä"
msgid "Start Wizard"
msgstr "Käynnistä velho"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr ""

View File

@@ -2,7 +2,7 @@
# Copyright 2007-2025 by The SABnzbd-Team (sabnzbd.org)
#
# Translators:
# Safihre <safihre@sabnzbd.org>, 2023
# Safihre <safihre@sabnzbd.org>, 2025
# Fred L <88com88@gmail.com>, 2025
#
msgid ""
@@ -370,6 +370,20 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr "Quota atteint, téléchargement mis en pause"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Quota"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr "Avertissement de limite de quota (%d%%)"
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr "Le téléchargement a repris après la réinitialisation du quota."
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Paramètre incorrect"
@@ -1151,10 +1165,6 @@ msgstr ""
msgid "Unpacking failed, disk full"
msgstr "Échec de l'extraction, disque plein"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Extraction échoué, le chemin est trop long"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Échec de l'extraction, l'archive nécessite un mot de passe"
@@ -2451,6 +2461,11 @@ msgstr "Nom"
msgid "Retry"
msgstr "Réessayer"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr "Marquer comme terminé & supprimer les fichiers temporaires"
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3713,10 +3728,6 @@ msgstr "Post-traitement"
msgid "Naming"
msgstr "Appellation"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Quota"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Combien peut-être télécharger ce mois (K/M/G)"
@@ -3827,13 +3838,13 @@ msgstr "Avertir 5 jours avant la date d'expiration du compte."
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
"Quota pour ce compte calculé à partir du moment où il est défini. En octets,"
" éventuellement suivi de K,M,G.<br />Avertir quand il atteint 0, vérifié "
"toutes les quelques minutes."
"Quota pour ce serveur, calculé à partir du moment où il est défini. En "
"octets, suivi éventuellement de K,M,G.<br />Vérifié toutes les quelques "
"minutes. Une notification est envoyée lorsque le quota est atteint."
#. Server's retention time in days
#: sabnzbd/skintext.py
@@ -4827,6 +4838,14 @@ msgstr "Tout supprimer"
msgid "Retry all"
msgstr "Réessayer tous"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
"Êtes-vous sûr de vouloir supprimer tous les dossiers de votre Dossier de "
"Téléchargement Temporaire ? Cette opération ne peut pas être annulée !"
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Importer le NZB depuis l'URL"
@@ -5085,6 +5104,11 @@ msgstr "Quitter SABnzbd"
msgid "Start Wizard"
msgstr "Lancer l'assistant"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr "Cliquez sur Tester le Serveur avant de continuer"
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr "Restaurer la sauvegarde"

View File

@@ -335,6 +335,20 @@ msgstr "העבודה \"%s\" כנראה מוצפנת: \"סיסמה\" בשם הק
msgid "Quota spent, pausing downloading"
msgstr "מכסה נוצלה, משהה הורדה"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "מכסה"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "פרמטר שגוי"
@@ -1089,10 +1103,6 @@ msgstr "פריקה נכשלה, שגיאת כתיבה או דיסק מלא?"
msgid "Unpacking failed, disk full"
msgstr "פריקה נכשלה, דיסק מלא"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "פריקה נכשלה, נתיב ארוך מדי"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "פריקה נכשלה, ארכיון דורש סיסמה"
@@ -2374,6 +2384,11 @@ msgstr "שם"
msgid "Retry"
msgstr "נסה שוב"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3565,10 +3580,6 @@ msgstr "בתר־עיבוד"
msgid "Naming"
msgstr "מתן שמות"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "מכסה"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "כמה ניתן להוריד החודש (ק״ב/מ״ב/ג״ב)"
@@ -3673,12 +3684,10 @@ msgstr "הזהר 5 ימים טרם תאריך תפוגת החשבון."
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
"מכסה עבור חשבון זה, נספרת מהזמן שהיא הוגדרה. בבתים, יכולה לבוא עם K,M,G.<br "
"/>הזהר כאשר המכסה מגיעה אל 0, היא נבדקת כל כמה דקות."
#. Server's retention time in days
#: sabnzbd/skintext.py
@@ -4641,6 +4650,12 @@ msgstr "מחק הכל"
msgid "Retry all"
msgstr "נסה שוב הכל"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "משוך NZB מכתובת"
@@ -4895,6 +4910,11 @@ msgstr "צא מן SABnzbd"
msgid "Start Wizard"
msgstr "התחל אשף"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr "שחזר גיבוי"

View File

@@ -361,6 +361,20 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr "Quota esaurita, download in pausa"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Quota"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Parametro non corretto"
@@ -1134,10 +1148,6 @@ msgstr "Estrazione fallita, errore di scrittura o disco pieno?"
msgid "Unpacking failed, disk full"
msgstr "Estrazione fallita, disco pieno"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Estrazione fallita, percorso troppo lungo"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Estrazione fallita, l'archivio richiede una password"
@@ -2429,6 +2439,11 @@ msgstr "Nome"
msgid "Retry"
msgstr "Riprova"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3672,10 +3687,6 @@ msgstr "Post-elaborazione"
msgid "Naming"
msgstr "Denominazione"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Quota"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Quanto può essere scaricato questo mese (K/M/G)"
@@ -3785,13 +3796,10 @@ msgstr "Avvisa 5 giorni prima della data di scadenza dell'account."
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
"Quota per questo account, contata dal momento in cui è impostata. In byte, "
"opzionalmente seguito da K,M,G.<br />Avvisa quando raggiunge 0, controllato "
"ogni pochi minuti."
#. Server's retention time in days
#: sabnzbd/skintext.py
@@ -4779,6 +4787,12 @@ msgstr "Elimina tutto"
msgid "Retry all"
msgstr "Riprova tutto"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Recupera NZB da URL"
@@ -5035,6 +5049,11 @@ msgstr "Esci da SABnzbd"
msgid "Start Wizard"
msgstr "Avvia procedura guidata"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr "Ripristina backup"

View File

@@ -332,6 +332,20 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr "Kvote oppbrukt, setter nedlasting på pause"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Kvote"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Feil parameter"
@@ -1076,10 +1090,6 @@ msgstr "Utpakking mislyktes, skrivefeil eller er disken full?"
msgid "Unpacking failed, disk full"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Utpakking feilet, stien er for lang"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Utpakking mislyktes, arkivet krever passord"
@@ -2359,6 +2369,11 @@ msgstr "Navn"
msgid "Retry"
msgstr "Prøv igjen"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3538,10 +3553,6 @@ msgstr "Postprosessering"
msgid "Naming"
msgstr "Filnavn"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Kvote"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Hvor mye can lastes ned denne måneden (K/M/G)"
@@ -3649,9 +3660,9 @@ msgstr ""
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4605,6 +4616,12 @@ msgstr "Ta bort alle"
msgid "Retry all"
msgstr "Prøv alle på nytt"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Hent NZB fra URL"
@@ -4855,6 +4872,11 @@ msgstr "Avslutt SABnzbd"
msgid "Start Wizard"
msgstr "Start Veiviser"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr ""

View File

@@ -358,6 +358,20 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr "Quotum verbruikt, download is gestopt"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Quotum"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Incorrecte parameter"
@@ -1138,10 +1152,6 @@ msgstr "Uitpakken mislukt, schrijffout of schijf vol?"
msgid "Unpacking failed, disk full"
msgstr "Uitpakken mislukt, de schijf is vol"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Uitpakken mislukt, bestandspad is te lang"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Uitpakken mislukt, archief vereist wachtwoord"
@@ -2432,6 +2442,11 @@ msgstr "Naam"
msgid "Retry"
msgstr "Opnieuw"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3672,10 +3687,6 @@ msgstr "Nabewerking"
msgid "Naming"
msgstr "Naamgeving"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Quotum"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Hoeval mag deze maand worden gedownload (K/M/G)"
@@ -3787,14 +3798,10 @@ msgstr "Ontvang 5 dagen voor de verloopdatum een waarschuwing."
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
"Quotum voor dit account, wordt geteld vanaf het moment dat het voor het "
"eerst ingesteld wordt. In bytes, in K,M,G notatie.<br />Er wordt een "
"waarschuwing gegeven als het quotum bereikt is, dit wordt elke paar minuten "
"gecontroleerd."
#. Server's retention time in days
#: sabnzbd/skintext.py
@@ -4777,6 +4784,12 @@ msgstr "Alles wissen"
msgid "Retry all"
msgstr "Alles opnieuw proberen"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Haal NZB op via URL"
@@ -5032,6 +5045,11 @@ msgstr "Stop SABnzbd"
msgid "Start Wizard"
msgstr "Wizard starten"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr "Backup herstellen"

View File

@@ -331,6 +331,20 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr "Przekroczono limit, wstrzymywanie pobierania"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Limit pobierania"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Błędny parametr"
@@ -1079,10 +1093,6 @@ msgstr "Rozpakowywanie nie powiodło się, błąd zapisu lub zapełniony dysk?"
msgid "Unpacking failed, disk full"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Rozpakowywanie nie powiodło się, zbyt długa ścieżka"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Rozpakowywanie nie powiodło się, archiwum wymaga podania hasła"
@@ -2368,6 +2378,11 @@ msgstr "Nazwa"
msgid "Retry"
msgstr "Ponów"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3549,10 +3564,6 @@ msgstr "Przetwarzanie końcowe"
msgid "Naming"
msgstr "Nazwy"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Limit pobierania"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Ile danych można pobrać w miesiącu (K/M/G)"
@@ -3661,9 +3672,9 @@ msgstr ""
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4617,6 +4628,12 @@ msgstr "Usuń wszystko"
msgid "Retry all"
msgstr "Ponów wszystkie"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Pobierz NZB z URL"
@@ -4865,6 +4882,11 @@ msgstr "Wyjście z SABnzbd"
msgid "Start Wizard"
msgstr "Uruchom kreatora konfiguracji"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr ""

View File

@@ -343,6 +343,20 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr "Quota esgotada, pausando o download"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Quota"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Parâmetro incorreto"
@@ -1091,10 +1105,6 @@ msgstr "A descompactação falhou. Erro de escrita ou disco cheio?"
msgid "Unpacking failed, disk full"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Descompactação falhou, o caminho é muito extenso"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "A descompactação falhou. O arquivo exige uma senha"
@@ -2379,6 +2389,11 @@ msgstr "Nome"
msgid "Retry"
msgstr "Repetir"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3561,10 +3576,6 @@ msgstr "Pós-processamento"
msgid "Naming"
msgstr "Nomeando"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Quota"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Quanto pode ser baixado neste mês (K/M/G)"
@@ -3672,9 +3683,9 @@ msgstr ""
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4628,6 +4639,12 @@ msgstr "Excluir Todos"
msgid "Retry all"
msgstr "Repetir todos"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Buscar NZB de uma URL"
@@ -4876,6 +4893,11 @@ msgstr "Sair do SABnzbd"
msgid "Start Wizard"
msgstr "Iniciar o Assistente"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr ""

View File

@@ -347,6 +347,20 @@ msgstr "Sarcina „%s” este probabil criptată: „parolă” în fișierul
msgid "Quota spent, pausing downloading"
msgstr "Cotă epuizată, întrerupem descărcarea"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Cotă"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Parametru Incorect"
@@ -1104,10 +1118,6 @@ msgstr "Dezarhivare nereuşită, eroare scriere sau disc plin?"
msgid "Unpacking failed, disk full"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Dezarhivare eșuată, calea este prea lungă"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Dezarhivare nereuşită, arhiva necesită o parolă"
@@ -2397,6 +2407,11 @@ msgstr "Nume"
msgid "Retry"
msgstr "Reîncearcă"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3580,10 +3595,6 @@ msgstr "Post procesare"
msgid "Naming"
msgstr "Redenumire"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Cotă"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Cât de mult poate fi descărcat în acestă lună (K/M/G)"
@@ -3692,9 +3703,9 @@ msgstr ""
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4647,6 +4658,12 @@ msgstr "Șterge tot"
msgid "Retry all"
msgstr "Reîncearcă toate"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Descarcă NZB din URL"
@@ -4898,6 +4915,11 @@ msgstr "Închide SABnzbd"
msgid "Start Wizard"
msgstr "Porneşte Vrăjitor"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr ""

View File

@@ -331,6 +331,20 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr "Квота исчерпана. Загрузка приостановлена"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Квота"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Неправильный параметр"
@@ -1075,10 +1089,6 @@ msgstr "Не удалось распаковать: ошибка записи и
msgid "Unpacking failed, disk full"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Ошибка распаковки: архив защищён паролем"
@@ -2361,6 +2371,11 @@ msgstr "Название"
msgid "Retry"
msgstr "Повторить"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3540,10 +3555,6 @@ msgstr "Пост-обработка"
msgid "Naming"
msgstr "Именование"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Квота"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Объем, который можно загрузить в месяц (K/M/G)"
@@ -3650,9 +3661,9 @@ msgstr ""
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4611,6 +4622,12 @@ msgstr "Удалить всё"
msgid "Retry all"
msgstr ""
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr ""
@@ -4861,6 +4878,11 @@ msgstr ""
msgid "Start Wizard"
msgstr ""
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr ""

View File

@@ -328,6 +328,20 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr "Kvota utrošena, pauziram preuzimanja"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Квота"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Погрешан параметар"
@@ -1071,10 +1085,6 @@ msgstr "Neuspašno raspakivanje, greška u pisanju ili je disk pun?"
msgid "Unpacking failed, disk full"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Neuspešno raspakivanje, putanja je predugačka"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Neuspešno raspakivanje, arhiva zahteva lozinku"
@@ -2354,6 +2364,11 @@ msgstr "Име"
msgid "Retry"
msgstr "Покушај опет"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3525,10 +3540,6 @@ msgstr "Накнадна обрада"
msgid "Naming"
msgstr "Именовање"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Квота"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Колико може да се преузме овог месеца (К/М/Г)"
@@ -3636,9 +3647,9 @@ msgstr ""
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4590,6 +4601,12 @@ msgstr "Избриши све"
msgid "Retry all"
msgstr "Ponovo pokušaj sve"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Povuci NZB sa URL"
@@ -4838,6 +4855,11 @@ msgstr "Затвори SABnzbd"
msgid "Start Wizard"
msgstr "Покрени чаробњака"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr ""

View File

@@ -328,6 +328,20 @@ msgstr ""
msgid "Quota spent, pausing downloading"
msgstr "Din kvot är uppnådd, pausar nerladdning"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Kvot"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Fel parameter"
@@ -1073,10 +1087,6 @@ msgstr "Uppackning misslyckades, skrivfel eller disken full?"
msgid "Unpacking failed, disk full"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Uppackning misslyckades, sökvägen är för lång"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Uppackning misslyckades, arkivet kräver lösenord"
@@ -2360,6 +2370,11 @@ msgstr "Namn"
msgid "Retry"
msgstr "Försök igen"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3537,10 +3552,6 @@ msgstr "Efterbehandling"
msgid "Naming"
msgstr "Döpning"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Kvot"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Hur mycket kan laddas ner denna månad (K/M/G)"
@@ -3648,9 +3659,9 @@ msgstr ""
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4602,6 +4613,12 @@ msgstr "Ta bort alla"
msgid "Retry all"
msgstr "Starta om alla"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "Hämta NZB från URL"
@@ -4852,6 +4869,11 @@ msgstr "Avsluta SABnzbd"
msgid "Start Wizard"
msgstr "Starta guide"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr ""

View File

@@ -362,6 +362,20 @@ msgstr "\"%s\" işi muhtemelen şifrelenmiştir: \"parola\", \"%s\" dosya ismind
msgid "Quota spent, pausing downloading"
msgstr "Kota kullanıldı, indirme duraklatılıyor"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Kota"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr "Kota sınır ikazı (%d%%)"
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr "İndirme kota sıfırlamasının ardından devam etti"
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "Yanlış parametre"
@@ -1127,10 +1141,6 @@ msgstr "Açma başarısız oldu, yazma hatası mı yoksa disk doldu mu?"
msgid "Unpacking failed, disk full"
msgstr "Açma başarısız oldu, disk dolu"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "Açma başarısız oldu, yok çok uzun"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "Açma başarısız oldu, arşiv bir parola gerektiriyor"
@@ -2422,6 +2432,11 @@ msgstr "İsim"
msgid "Retry"
msgstr "Tekrar dene"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr "Tamamlanmış Olarak İşaretle ve Geçici Dosyaları Kaldır"
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3660,10 +3675,6 @@ msgstr "Post processing"
msgid "Naming"
msgstr "İsimlendirme"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "Kota"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "Bu ay ne kadar indirme yapılabileceği (K/M/G)"
@@ -3771,13 +3782,14 @@ msgstr "Sonlanma tarihinden 5 gün evvel ikaz et."
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
"Bu hesap için kota, bu seçeneğin ayarlanmasından itibaren hesaplanır. Bayt "
"olarak, seçime dayalı bir şekilde K,M,G takip edebilir.<br />0 değerine "
"ulaştığında ikazda bulun, her birkaç dakikada bir kontrol edilir."
"Bu sunucu için, ayarlandığı zamandan itibaren hesaplanan kota. Bayt olarak, "
"seçime dayalı bir şekilde K, M, G takip edebilir. <br /> Her birkaç "
"dakikada bir kontrol edilir. Kota sonuna ulaşıldığında bir bildirim "
"gönderilir."
#. Server's retention time in days
#: sabnzbd/skintext.py
@@ -4768,6 +4780,14 @@ msgstr "Tümünü Sil"
msgid "Retry all"
msgstr "Tümünü tekrar dene"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
"Geçici İndirme Dizini'ndeki tüm dizinleri silmek istediğinizden emin "
"misiniz? Bu geri alınamaz!"
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "URL konumundan NZB al"
@@ -5024,6 +5044,11 @@ msgstr "SABnzb'den çık"
msgid "Start Wizard"
msgstr "Sihirbazı Başlat"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr "Devam etmeden evvel Sunucuyu Dene unsuruna tıklayın"
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr "Yedeklemeyi geri getir"

View File

@@ -327,6 +327,20 @@ msgstr "任务 \"%s\" 可能受加密保护:文件名 \"%s\" 中有 \"password
msgid "Quota spent, pausing downloading"
msgstr "配额已耗尽,暂停下载"
#. Warning message - Notification
#: sabnzbd/bpsmeter.py, sabnzbd/downloader.py, sabnzbd/notifier.py,
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "配额"
#: sabnzbd/bpsmeter.py
msgid "Quota limit warning (%d%%)"
msgstr ""
#: sabnzbd/bpsmeter.py
msgid "Downloading resumed after quota reset"
msgstr ""
#: sabnzbd/cfg.py, sabnzbd/interface.py
msgid "Incorrect parameter"
msgstr "参数不正确"
@@ -1067,10 +1081,6 @@ msgstr "解压失败,写入出错或磁盘已满?"
msgid "Unpacking failed, disk full"
msgstr ""
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, path is too long"
msgstr "解压失败,路径过长"
#: sabnzbd/newsunpack.py
msgid "Unpacking failed, archive requires a password"
msgstr "解压失败,压缩文件需要密码"
@@ -2348,6 +2358,11 @@ msgstr "名称"
msgid "Retry"
msgstr "重试"
#. History page button
#: sabnzbd/skintext.py
msgid "Mark as Completed & Remove Temporary Files"
msgstr ""
#. Queue page table, script selection menu
#: sabnzbd/skintext.py
msgid "Scripts"
@@ -3485,10 +3500,6 @@ msgstr "后期处理"
msgid "Naming"
msgstr "命名"
#: sabnzbd/skintext.py
msgid "Quota"
msgstr "配额"
#: sabnzbd/skintext.py
msgid "How much can be downloaded this month (K/M/G)"
msgstr "本月能下载多少数据量 (K/M/G)"
@@ -3591,9 +3602,9 @@ msgstr ""
#: sabnzbd/skintext.py
msgid ""
"Quota for this account, counted from the time it is set. In bytes, "
"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
" minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally"
" follow with K,M,G.<br />Checked every few minutes. Notification is sent "
"when quota is spent."
msgstr ""
#. Server's retention time in days
@@ -4542,6 +4553,12 @@ msgstr "全部删除"
msgid "Retry all"
msgstr "全部重试"
#: sabnzbd/skintext.py
msgid ""
"Are you sure you want to delete all folders in your Temporary Download "
"Folder? This cannot be undone!"
msgstr ""
#: sabnzbd/skintext.py
msgid "Fetch NZB from URL"
msgstr "从 URL 装取 NZB"
@@ -4788,6 +4805,11 @@ msgstr "退出 SABnzbd"
msgid "Start Wizard"
msgstr "启动向导"
#. Tooltip for disabled Next button
#: sabnzbd/skintext.py
msgid "Click on Test Server before continuing"
msgstr ""
#: sabnzbd/skintext.py
msgid "Restore backup"
msgstr ""

View File

@@ -1,6 +1,6 @@
# Main requirements
# Note that not all sub-dependencies are listed, but only ones we know could cause trouble
apprise==1.9.4
apprise==1.9.5
sabctools==8.2.6
CT3==3.4.0
cffi==2.0.0
@@ -25,13 +25,14 @@ portend==3.2.1
chardet==5.2.0
PySocks==1.7.1
puremagic==1.30
rarfile==4.2
guessit==3.8.0
babelfish==0.6.1
rebulk==3.2.0
# Recent cryptography versions require Rust. If you run into issues compiling this
# SABnzbd will also work with older pre-Rust versions such as cryptography==3.3.2
cryptography==46.0.1
cryptography==46.0.3
# We recommend using "orjson" as it is 2x as fast as "ujson". However, it requires
# Rust so SABnzbd works just as well with "ujson" or the Python built in "json" module
@@ -49,8 +50,8 @@ winrt-Windows.UI.Notifications==3.2.1; sys_platform == 'win32'
typing_extensions==4.15.0; sys_platform == 'win32'
# macOS system calls
pyobjc-core==11.1; sys_platform == 'darwin'
pyobjc-framework-Cocoa==11.1; sys_platform == 'darwin'
pyobjc-core==12.0; sys_platform == 'darwin'
pyobjc-framework-Cocoa==12.0; sys_platform == 'darwin'
# Linux notifications
notify2==0.3.1; sys_platform != 'win32' and sys_platform != 'darwin'
@@ -58,15 +59,15 @@ notify2==0.3.1; sys_platform != 'win32' and sys_platform != 'darwin'
# Apprise Requirements
requests==2.32.5
requests-oauthlib==2.0.0
PyYAML==6.0.2
PyYAML==6.0.3
markdown==3.9
paho-mqtt==1.6.1 # Pinned, newer versions don't work with AppRise yet
# Requests Requirements
charset_normalizer==3.4.3
idna==3.10
charset_normalizer==3.4.4
idna==3.11
urllib3==2.5.0
certifi==2025.8.3
certifi==2025.10.5
oauthlib==3.3.1
PyJWT==2.10.1
blinker==1.9.0

View File

@@ -480,8 +480,78 @@ def _api_add_all_orphan(value: str, kwargs: Dict[str, Union[str, List[str]]]) ->
def _api_history(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
"""API: accepts value(=nzo_id), start, limit, search, nzo_ids"""
"""API: Dispatcher for mode=history"""
value = kwargs.get("value", "")
return _api_history_table.get(name, (_api_history_default, 2))[0](value, kwargs)
def _api_history_delete(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
"""API: accepts value(=nzo_id or special), search, archive, del_files"""
search = kwargs.get("search")
archive = True
# Only skip archive if specifically requested
if kwargs.get("archive") == "0" or cfg.disable_archive():
archive = False
special = value.lower()
del_files = bool_conv(kwargs.get("del_files"))
if special in ("all", "failed", "completed"):
history_db = sabnzbd.get_db_connection()
if special in ("all", "failed"):
if del_files:
del_job_files(history_db.get_failed_paths(search))
if archive:
history_db.archive_with_status(Status.FAILED, search)
else:
history_db.remove_with_status(Status.FAILED, search)
if special in ("all", "completed"):
if archive:
history_db.archive_with_status(Status.COMPLETED, search)
else:
history_db.remove_with_status(Status.COMPLETED, search)
history_updated()
return report()
elif value:
for job in clean_comma_separated_list(value):
if sabnzbd.PostProcessor.get_path(job):
# This is always a permanent delete, no archiving
sabnzbd.PostProcessor.delete(job, del_files=del_files)
else:
history_db = sabnzbd.get_db_connection()
if del_files:
remove_all(history_db.get_incomplete_path(job), recursive=True)
if archive:
history_db.archive(job)
else:
history_db.remove(job)
history_updated()
return report()
else:
return report(_MSG_NO_VALUE)
def _api_history_mark_as_completed(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
"""API: accepts value(=nzo_id)"""
if value:
history_db = sabnzbd.get_db_connection()
for job in clean_comma_separated_list(value):
# Get incomplete path before marking as completed
incomplete_path = history_db.get_incomplete_path(job)
history_db.mark_as_completed(job)
# Remove incomplete folder if it exists
if incomplete_path:
remove_all(incomplete_path, recursive=True)
history_updated()
return report()
else:
return report(_MSG_NO_VALUE)
def _api_history_default(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
"""API: accepts start, limit, search, failed_only, archive, cat, status, nzo_ids"""
start = int_conv(kwargs.get("start"))
limit = int_conv(kwargs.get("limit"))
last_history_update = int_conv(kwargs.get("last_history_update", 0))
@@ -491,84 +561,38 @@ def _api_history(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
failed_only = bool_conv(kwargs.get("failed_only"))
nzo_ids = clean_comma_separated_list(kwargs.get("nzo_ids"))
archive = True
# Do we need to send anything?
if last_history_update == sabnzbd.LAST_HISTORY_UPDATE:
return report(keyword="history", data=False)
if name == "delete":
# Only skip archive if specifically requested
if kwargs.get("archive") == "0" or cfg.disable_archive():
archive = False
if failed_only:
# We ignore any other statuses, having both doesn't make sense
statuses = [Status.FAILED]
special = value.lower()
del_files = bool_conv(kwargs.get("del_files"))
if special in ("all", "failed", "completed"):
history_db = sabnzbd.get_db_connection()
if special in ("all", "failed"):
if del_files:
del_job_files(history_db.get_failed_paths(search))
if archive:
history_db.archive_with_status(Status.FAILED, search)
else:
history_db.remove_with_status(Status.FAILED, search)
if special in ("all", "completed"):
if archive:
history_db.archive_with_status(Status.COMPLETED, search)
else:
history_db.remove_with_status(Status.COMPLETED, search)
history_updated()
return report()
elif value:
for job in clean_comma_separated_list(value):
if sabnzbd.PostProcessor.get_path(job):
# This is always a permanent delete, no archiving
sabnzbd.PostProcessor.delete(job, del_files=del_files)
else:
history_db = sabnzbd.get_db_connection()
if del_files:
remove_all(history_db.get_incomplete_path(job), recursive=True)
if archive:
history_db.archive(job)
else:
history_db.remove(job)
history_updated()
return report()
else:
return report(_MSG_NO_VALUE)
elif not name:
# Do we need to send anything?
if last_history_update == sabnzbd.LAST_HISTORY_UPDATE:
return report(keyword="history", data=False)
if not limit:
limit = cfg.history_limit()
if failed_only:
# We ignore any other statuses, having both doesn't make sense
statuses = [Status.FAILED]
# Only show archive if specifically requested
archive = bool(int_conv(kwargs.get("archive")))
if not limit:
limit = cfg.history_limit()
# Only show archive if specifically requested
if not int_conv(kwargs.get("archive")):
archive = False
history = {}
grand, month, week, day = sabnzbd.BPSMeter.get_sums()
history["total_size"] = to_units(grand)
history["month_size"] = to_units(month)
history["week_size"] = to_units(week)
history["day_size"] = to_units(day)
history["slots"], history["ppslots"], history["noofslots"] = build_history(
start=start,
limit=limit,
archive=archive,
search=search,
categories=categories,
statuses=statuses,
nzo_ids=nzo_ids,
)
history["last_history_update"] = sabnzbd.LAST_HISTORY_UPDATE
history["version"] = sabnzbd.__version__
return report(keyword="history", data=history)
else:
return report(_MSG_NOT_IMPLEMENTED)
history = {}
grand, month, week, day = sabnzbd.BPSMeter.get_sums()
history["total_size"] = to_units(grand)
history["month_size"] = to_units(month)
history["week_size"] = to_units(week)
history["day_size"] = to_units(day)
history["slots"], history["ppslots"], history["noofslots"] = build_history(
start=start,
limit=limit,
archive=archive,
search=search,
categories=categories,
statuses=statuses,
nzo_ids=nzo_ids,
)
history["last_history_update"] = sabnzbd.LAST_HISTORY_UPDATE
history["version"] = sabnzbd.__version__
return report(keyword="history", data=history)
def _api_get_files(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
@@ -1051,6 +1075,12 @@ _api_queue_table = {
"sort": (_api_queue_sort, 2),
}
_api_history_table = {
"delete": (_api_history_delete, 2),
"mark_as_completed": (_api_history_mark_as_completed, 2),
}
_api_status_table = {
"unblock_server": (_api_unblock_server, 2),
"delete_orphan": (_api_delete_orphan, 2),
@@ -1075,6 +1105,8 @@ def api_level(mode: str, name: str) -> int:
"""Return access level required for this API call"""
if mode == "queue" and name in _api_queue_table:
return _api_queue_table[name][1]
if mode == "history" and name in _api_history_table:
return _api_history_table[name][1]
if mode == "status" and name in _api_status_table:
return _api_status_table[name][1]
if mode == "config" and name in _api_config_table:

View File

@@ -26,9 +26,10 @@ import re
from threading import Thread
import ctypes
from typing import Tuple, Optional, List
import rarfile
import sabnzbd
from sabnzbd.misc import get_all_passwords, match_str
from sabnzbd.misc import get_all_passwords, match_str, SABRarFile
from sabnzbd.filesystem import (
set_permissions,
clip_path,
@@ -42,7 +43,6 @@ from sabnzbd.constants import Status, GIGI, MAX_ASSEMBLER_QUEUE
import sabnzbd.cfg as cfg
from sabnzbd.nzbstuff import NzbObject, NzbFile
import sabnzbd.par2file as par2file
import sabnzbd.utils.rarfile as rarfile
class Assembler(Thread):
@@ -295,7 +295,7 @@ def check_encrypted_and_unwanted_files(nzo: NzbObject, filepath: str) -> Tuple[b
# Is it even a rarfile?
if rarfile.is_rarfile(filepath):
# Open the rar
zf = rarfile.RarFile(filepath, single_file_check=True)
zf = SABRarFile(filepath, part_only=True)
# Check for encryption
if (
@@ -322,12 +322,7 @@ def check_encrypted_and_unwanted_files(nzo: NzbObject, filepath: str) -> Tuple[b
logging.info('Trying password "%s" on job "%s"', password, nzo.final_name)
try:
zf.setpassword(password)
except rarfile.Error:
# On weird passwords the setpassword() will fail
# but the actual testrar() will work
pass
try:
zf.testrar()
zf.trigger_parse()
password_hit = password
break
except rarfile.RarWrongPassword:

View File

@@ -122,6 +122,7 @@ class BPSMeter:
"q_hour",
"q_minute",
"quota_enabled",
"quota_notifications_sent",
)
def __init__(self):
@@ -161,6 +162,7 @@ class BPSMeter:
self.q_hour = 0 # Quota reset hour
self.q_minute = 0 # Quota reset minute
self.quota_enabled: bool = True # Scheduled quota enable/disable
self.quota_notifications_sent: int = 0 # Track highest quota threshold that has been notified
def save(self):
"""Save admin to disk"""
@@ -323,10 +325,7 @@ class BPSMeter:
# Quota check
if self.have_quota and self.quota_enabled:
self.left -= self.sum_cached_amount
if self.left <= 0.0:
if not sabnzbd.Downloader.paused:
sabnzbd.Downloader.pause()
logging.warning(T("Quota spent, pausing downloading"))
self.check_quota()
# Speedometer
try:
@@ -431,15 +430,47 @@ class BPSMeter:
# We record every second, but display at the user's refresh-rate
return self.bps_list[::refresh_rate]
def check_quota(self):
"""Pause the queue when all quota is spent
Notify at specific quota usages (75%, 90%, 100%)
"""
if self.left <= 0.0:
if not sabnzbd.Downloader.paused:
sabnzbd.Downloader.pause()
logging.warning(T("Quota spent, pausing downloading"))
# Guard against zero division
if self.quota:
# Check for quota notifications (75%, 90%, 100%)
# Only send notification for the highest applicable threshold that hasn't been notified yet
used_percentage = ((self.quota - self.left) / self.quota) * 100
if used_percentage >= 100 and self.quota_notifications_sent < 100:
sabnzbd.notifier.send_notification(T("Quota"), T("Quota spent, pausing downloading"), "quota")
elif used_percentage >= 90 and self.quota_notifications_sent < 90:
sabnzbd.notifier.send_notification(
T("Quota"),
T("Quota limit warning (%d%%)") % used_percentage,
"quota",
)
elif used_percentage >= 75 and self.quota_notifications_sent < 75:
sabnzbd.notifier.send_notification(
T("Quota"),
T("Quota limit warning (%d%%)") % used_percentage,
"quota",
)
self.quota_notifications_sent = used_percentage
def reset_quota(self, force: bool = False):
"""Check if it's time to reset the quota, optionally resuming
Return True, when still paused or should be paused
"""
if force or (self.have_quota and time.time() > (self.q_time - 50)):
self.quota = self.left = cfg.quota_size.get_float()
self.quota_notifications_sent = 0
logging.info("Quota was reset to %s", self.quota)
if cfg.quota_resume():
logging.info("Auto-resume due to quota reset")
sabnzbd.notifier.send_notification(T("Quota"), T("Downloading resumed after quota reset"), "quota")
sabnzbd.Downloader.resume()
self.next_reset()
return False

View File

@@ -531,6 +531,7 @@ switchinterval = OptionNumber("misc", "switchinterval", 0.005, minval=0.001)
ssdp_broadcast_interval = OptionNumber("misc", "ssdp_broadcast_interval", 15, minval=1, maxval=600)
ext_rename_ignore = OptionList("misc", "ext_rename_ignore", validation=lower_case_ext)
unrar_parameters = OptionStr("misc", "unrar_parameters", validation=supported_unrar_parameters)
outgoing_nntp_ip = OptionStr("misc", "outgoing_nntp_ip")
##############################################################################
@@ -558,6 +559,7 @@ ncenter_prio_pp = OptionBool("ncenter", "ncenter_prio_pp", False)
ncenter_prio_complete = OptionBool("ncenter", "ncenter_prio_complete", True)
ncenter_prio_failed = OptionBool("ncenter", "ncenter_prio_failed", True)
ncenter_prio_disk_full = OptionBool("ncenter", "ncenter_prio_disk_full", True)
ncenter_prio_quota = OptionBool("ncenter", "ncenter_prio_quota", True)
ncenter_prio_new_login = OptionBool("ncenter", "ncenter_prio_new_login", False)
ncenter_prio_warning = OptionBool("ncenter", "ncenter_prio_warning", False)
ncenter_prio_error = OptionBool("ncenter", "ncenter_prio_error", False)
@@ -574,6 +576,7 @@ acenter_prio_pp = OptionBool("acenter", "acenter_prio_pp", False)
acenter_prio_complete = OptionBool("acenter", "acenter_prio_complete", True)
acenter_prio_failed = OptionBool("acenter", "acenter_prio_failed", True)
acenter_prio_disk_full = OptionBool("acenter", "acenter_prio_disk_full", True)
acenter_prio_quota = OptionBool("acenter", "acenter_prio_quota", True)
acenter_prio_new_login = OptionBool("acenter", "acenter_prio_new_login", False)
acenter_prio_warning = OptionBool("acenter", "acenter_prio_warning", False)
acenter_prio_error = OptionBool("acenter", "acenter_prio_error", False)
@@ -590,6 +593,7 @@ ntfosd_prio_pp = OptionBool("ntfosd", "ntfosd_prio_pp", False)
ntfosd_prio_complete = OptionBool("ntfosd", "ntfosd_prio_complete", True)
ntfosd_prio_failed = OptionBool("ntfosd", "ntfosd_prio_failed", True)
ntfosd_prio_disk_full = OptionBool("ntfosd", "ntfosd_prio_disk_full", True)
ntfosd_prio_quota = OptionBool("ntfosd", "ntfosd_prio_quota", True)
ntfosd_prio_new_login = OptionBool("ntfosd", "ntfosd_prio_new_login", False)
ntfosd_prio_warning = OptionBool("ntfosd", "ntfosd_prio_warning", False)
ntfosd_prio_error = OptionBool("ntfosd", "ntfosd_prio_error", False)
@@ -607,6 +611,7 @@ prowl_prio_pp = OptionNumber("prowl", "prowl_prio_pp", -3)
prowl_prio_complete = OptionNumber("prowl", "prowl_prio_complete", 0)
prowl_prio_failed = OptionNumber("prowl", "prowl_prio_failed", 1)
prowl_prio_disk_full = OptionNumber("prowl", "prowl_prio_disk_full", 1)
prowl_prio_quota = OptionNumber("prowl", "prowl_prio_quota", 0)
prowl_prio_new_login = OptionNumber("prowl", "prowl_prio_new_login", -3)
prowl_prio_warning = OptionNumber("prowl", "prowl_prio_warning", -3)
prowl_prio_error = OptionNumber("prowl", "prowl_prio_error", -3)
@@ -628,6 +633,7 @@ pushover_prio_pp = OptionNumber("pushover", "pushover_prio_pp", -3)
pushover_prio_complete = OptionNumber("pushover", "pushover_prio_complete", -1)
pushover_prio_failed = OptionNumber("pushover", "pushover_prio_failed", -1)
pushover_prio_disk_full = OptionNumber("pushover", "pushover_prio_disk_full", 1)
pushover_prio_quota = OptionNumber("pushover", "pushover_prio_quota", -1)
pushover_prio_new_login = OptionNumber("pushover", "pushover_prio_new_login", -3)
pushover_prio_warning = OptionNumber("pushover", "pushover_prio_warning", 1)
pushover_prio_error = OptionNumber("pushover", "pushover_prio_error", 1)
@@ -646,6 +652,7 @@ pushbullet_prio_pp = OptionBool("pushbullet", "pushbullet_prio_pp", False)
pushbullet_prio_complete = OptionBool("pushbullet", "pushbullet_prio_complete", True)
pushbullet_prio_failed = OptionBool("pushbullet", "pushbullet_prio_failed", True)
pushbullet_prio_disk_full = OptionBool("pushbullet", "pushbullet_prio_disk_full", True)
pushbullet_prio_quota = OptionBool("pushbullet", "pushbullet_prio_quota", True)
pushbullet_prio_new_login = OptionBool("pushbullet", "pushbullet_prio_new_login", False)
pushbullet_prio_warning = OptionBool("pushbullet", "pushbullet_prio_warning", False)
pushbullet_prio_error = OptionBool("pushbullet", "pushbullet_prio_error", False)
@@ -670,6 +677,8 @@ apprise_target_failed = OptionStr("apprise", "apprise_target_failed")
apprise_target_failed_enable = OptionBool("apprise", "apprise_target_failed_enable", True)
apprise_target_disk_full = OptionStr("apprise", "apprise_target_disk_full")
apprise_target_disk_full_enable = OptionBool("apprise", "apprise_target_disk_full_enable", False)
apprise_target_quota = OptionStr("apprise", "apprise_target_quota")
apprise_target_quota_enable = OptionBool("apprise", "apprise_target_quota_enable", True)
apprise_target_new_login = OptionStr("apprise", "apprise_target_new_login")
apprise_target_new_login_enable = OptionBool("apprise", "apprise_target_new_login_enable", True)
apprise_target_warning = OptionStr("apprise", "apprise_target_warning")
@@ -693,6 +702,7 @@ nscript_prio_pp = OptionBool("nscript", "nscript_prio_pp", False)
nscript_prio_complete = OptionBool("nscript", "nscript_prio_complete", True)
nscript_prio_failed = OptionBool("nscript", "nscript_prio_failed", True)
nscript_prio_disk_full = OptionBool("nscript", "nscript_prio_disk_full", True)
nscript_prio_quota = OptionBool("nscript", "nscript_prio_quota", True)
nscript_prio_new_login = OptionBool("nscript", "nscript_prio_new_login", False)
nscript_prio_warning = OptionBool("nscript", "nscript_prio_warning", False)
nscript_prio_error = OptionBool("nscript", "nscript_prio_error", False)

View File

@@ -232,6 +232,11 @@ class HistoryDB:
logging.info("Removing all jobs with status=%s", status)
self.execute("""DELETE FROM history WHERE name LIKE ? AND status = ?""", (search, status))
def mark_as_completed(self, job: str):
"""Mark a job as completed in the history"""
self.execute("""UPDATE history SET status = ? WHERE nzo_id = ?""", (Status.COMPLETED, job))
logging.info("[%s] Marked job %s as completed", caller_name(), job)
def get_failed_paths(self, search: Optional[str] = None) -> List[str]:
"""Return list of all storage paths of failed jobs (may contain non-existing or empty paths)"""
search = convert_search(search)

View File

@@ -70,6 +70,8 @@ def conditional_cache(cache_time: int):
Empty results (None, empty collections, empty strings, False, 0) are not cached.
If a keyword argument of `force=True` is used, the cache is skipped.
Unhashable types (such as List) can not be used as an input to the wrapped function in the current implementation!
:param cache_time: Time in seconds to cache non-empty results
"""
@@ -82,6 +84,8 @@ def conditional_cache(cache_time: int):
# Create cache key using functools._make_key
try:
key = functools._make_key(args, kwargs, typed=False)
# Make sure it's a hashable to be used as key, this changed in Python 3.14
hash(key)
except TypeError:
# If args/kwargs aren't hashable, skip caching entirely
return func(*args, **kwargs)

0
sabnzbd/deobfuscate_filenames.py Normal file → Executable file
View File

View File

@@ -30,13 +30,14 @@ from typing import Optional, Dict, List, Tuple
import sabnzbd
import sabnzbd.cfg as cfg
from sabnzbd.misc import int_conv, format_time_string, build_and_run_command
from sabnzbd.filesystem import long_path, remove_all, real_path, remove_file, get_basename
from sabnzbd.filesystem import remove_all, real_path, remove_file, get_basename, clip_path
from sabnzbd.nzbstuff import NzbObject, NzbFile
from sabnzbd.encoding import platform_btou
from sabnzbd.decorators import synchronized
from sabnzbd.newsunpack import RAR_EXTRACTFROM_RE, RAR_EXTRACTED_RE, rar_volumelist, add_time_left
from sabnzbd.postproc import prepare_extraction_path
from sabnzbd.utils.rarfile import RarFile
from sabnzbd.misc import SABRarFile
import rarfile
from sabnzbd.utils.diskspeed import diskspeedmeasure
# Need a lock to make sure start and stop is handled correctly
@@ -415,40 +416,24 @@ class DirectUnpacker(threading.Thread):
# Generate command
rarfile_path = os.path.join(self.nzo.download_path, self.rarfile_nzf.filename)
if sabnzbd.WINDOWS:
# On Windows, UnRar uses a custom argument parser
# See: https://github.com/sabnzbd/sabnzbd/issues/1043
# The -scf forces the output to be UTF8
command = [
sabnzbd.newsunpack.RAR_COMMAND,
action,
"-vp",
"-idp",
"-scf",
"-o+",
"-ai",
password_command,
rarfile_path,
"%s\\" % long_path(extraction_path),
]
else:
# The -scf forces the output to be UTF8
command = [
sabnzbd.newsunpack.RAR_COMMAND,
action,
"-vp",
"-idp",
"-scf",
"-o+",
"-ai",
password_command,
rarfile_path,
"%s/" % extraction_path,
]
# The -scf forces the output to be UTF8
command = [
sabnzbd.newsunpack.RAR_COMMAND,
action,
"-vp",
"-idp",
"-scf",
"-o+",
"-ai",
password_command,
rarfile_path,
clip_path(extraction_path),
]
if cfg.ignore_unrar_dates():
command.insert(3, "-tsm-")
if unrar_parameters := cfg.unrar_parameters().strip().split():
if unrar_parameters := cfg.unrar_parameters().split():
for param in unrar_parameters:
command.insert(-2, param)
@@ -456,6 +441,8 @@ class DirectUnpacker(threading.Thread):
self.cur_volume = 1
# Need to disable buffer to have direct feedback
# On Windows, UnRar uses a custom argument parser
# See: https://github.com/sabnzbd/sabnzbd/issues/1043
self.active_instance = build_and_run_command(
command, windows_unrar_command=True, text_mode=False, stdin=subprocess.PIPE
)
@@ -508,8 +495,8 @@ class DirectUnpacker(threading.Thread):
if one_folder:
# RarFile can fail for mysterious reasons
try:
rar_contents = RarFile(
os.path.join(self.nzo.download_path, rarfile_nzf.filename), single_file_check=True
rar_contents = SABRarFile(
os.path.join(self.nzo.download_path, rarfile_nzf.filename), part_only=True
).filelist()
for rm_file in rar_contents:
# Flat-unpack, so remove foldername from RarFile output

View File

@@ -1143,6 +1143,11 @@ def check_server_quota():
if server.quota():
if server.quota.get_int() + server.usage_at_start() < sabnzbd.BPSMeter.grand_total.get(srv, 0):
logging.warning(T("Server %s has used the specified quota"), server.displayname())
sabnzbd.notifier.send_notification(
T("Quota"),
T("Server %s has used the specified quota") % server.displayname(),
"quota",
)
server.quota.set("")
config.save_config()

View File

@@ -33,7 +33,6 @@ import fnmatch
import stat
import ctypes
import random
import functools
from typing import Union, List, Tuple, Any, Dict, Optional, BinaryIO
try:
@@ -55,7 +54,7 @@ from sabnzbd.constants import (
DEX_FILE_EXTENSION_MAX,
)
from sabnzbd.encoding import correct_unknown_encoding, utob, limit_encoded_length
from sabnzbd.utils import rarfile
import rarfile
# For Windows: determine executable extensions
@@ -991,50 +990,6 @@ def remove_all(path: str, pattern: str = "*", keep_folder: bool = False, recursi
##############################################################################
# Diskfree
##############################################################################
def disk_free_macos_clib_statfs64(directory: str) -> Tuple[int, int]:
# MacOS only!
# direct system call to c-lib's statfs(), not python's os.statvfs()
# because statvfs() on MacOS has a rollover at 4TB (possibly a 32bit rollover with 10bit block size)
# See https://bugs.python.org/issue43638
# Based on code of pudquick and blackntan
# Input: directory.
# Output: disksize and available space, in bytes
# format & parameters: on MacOS, see "man statfs", lines starting at
# "struct statfs { /* when _DARWIN_FEATURE_64_BIT_INODE is defined */"
class statfs64(ctypes.Structure):
_fields_ = [
("f_bsize", ctypes.c_uint32),
("f_iosize", ctypes.c_int32),
("f_blocks", ctypes.c_uint64),
("f_bfree", ctypes.c_uint64),
("f_bavail", ctypes.c_uint64),
("f_files", ctypes.c_uint64),
("f_ffree", ctypes.c_uint64),
("f_fsid", ctypes.c_uint64),
("f_owner", ctypes.c_uint32),
("f_type", ctypes.c_uint32),
("f_flags", ctypes.c_uint32),
("f_fssubtype", ctypes.c_uint32),
("f_fstypename", ctypes.c_char * 16),
("f_mntonname", ctypes.c_char * 1024),
("f_mntfromname", ctypes.c_char * 1024),
("f_reserved", ctypes.c_uint32 * 8),
]
fs_info64 = statfs64() # set up the parameters to be filled out
result = sabnzbd.MACOSLIBC.statfs64(
ctypes.create_string_buffer(utob(directory)), ctypes.byref(fs_info64)
) # fs_info64 gets filled out via the byref()
if result == 0:
# result = 0: "Upon successful completion, a value of 0 is returned."
return fs_info64.f_blocks * fs_info64.f_bsize, fs_info64.f_bavail * fs_info64.f_bsize
else:
# result = -1: "Otherwise, -1 is returned and the global variable errno is set to indicate the error."
logging.debug("Call to MACOSLIBC.statfs64 not successful. Value of errno is %s", ctypes.get_errno())
return 0, 0
def diskspace_base(dir_to_check: str) -> Tuple[float, float]:
"""Return amount of free and used diskspace in GBytes"""
# Find first folder level that exists in the path
@@ -1049,10 +1004,6 @@ def diskspace_base(dir_to_check: str) -> Tuple[float, float]:
return disk_size / GIGI, available / GIGI
except Exception:
return 0.0, 0.0
elif sabnzbd.MACOS:
# MacOS diskfree ... via c-lib call statfs()
disk_size, available = disk_free_macos_clib_statfs64(dir_to_check)
return disk_size / GIGI, available / GIGI
elif hasattr(os, "statvfs"):
# posix diskfree
try:
@@ -1290,6 +1241,10 @@ def check_filesystem_capabilities(test_dir: str) -> bool:
# if not on Windows, check special chars like \ and :
if not sabnzbd.WINDOWS and not directory_is_writable_with_file(test_dir, "sab_test \\ bla :: , bla.txt"):
# Always enable "Make Windows Compatible"
sabnzbd.cfg.sanitize_safe.set(True)
# However, external programs like unrar can still try to write them so we still warn the user
sabnzbd.misc.helpful_warning(
T("%s is not writable with special character filenames. This can cause problems."), test_dir
)

View File

@@ -73,9 +73,11 @@ def addresslookup6(myhost):
def active_socks5_proxy() -> Optional[str]:
"""Return the active proxy"""
if socket.socket == socks.socksocket:
return "%s:%s" % socks.socksocket.default_proxy[1:3]
"""Return the active proxy. And None if no proxy is set"""
if socks.socksocket.default_proxy:
socks5host = socks.socksocket.default_proxy[1]
socks5port = sabnzbd.misc.int_conv(socks.socksocket.default_proxy[2], default=1080)
return f"{socks5host}:{socks5port}"
return None
@@ -92,11 +94,21 @@ def dnslookup() -> bool:
def local_ipv4() -> Optional[str]:
"""return IPv4 address of default local LAN interface"""
try:
with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s_ipv4:
# Option: use 100.64.1.1 (IANA-Reserved IPv4 Prefix for Shared Address Space)
s_ipv4.connect(("10.255.255.255", 80))
ipv4 = s_ipv4.getsockname()[0]
if not socks.socksocket.default_proxy:
# No socks5 proxy, so we can use UDP (SOCK_DGRAM) and a non-reachable host
with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s_ipv4:
s_ipv4.connect(("10.255.255.255", 80))
ipv4 = s_ipv4.getsockname()[0]
else:
# socks5 proxy set, so we must use TCP (SOCK_STREAM) and a reachable host: the proxy server
socks5host = socks.socksocket.default_proxy[1]
socks5port = sabnzbd.misc.int_conv(socks.socksocket.default_proxy[2], default=1080)
logging.debug(f"Using proxy {socks5host} on port {socks5port} to determine local IPv4 address")
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s_ipv4:
s_ipv4.connect((socks5host, socks5port))
ipv4 = s_ipv4.getsockname()[0]
except socket.error:
ipv4 = None

View File

@@ -911,6 +911,7 @@ SPECIAL_VALUE_LIST = (
"selftest_host",
"ssdp_broadcast_interval",
"unrar_parameters",
"outgoing_nntp_ip",
)
SPECIAL_LIST_LIST = (
"rss_odd_titles",
@@ -2028,6 +2029,7 @@ NOTIFY_OPTIONS = {
"ncenter_prio_complete",
"ncenter_prio_failed",
"ncenter_prio_disk_full",
"ncenter_prio_quota",
"ncenter_prio_warning",
"ncenter_prio_error",
"ncenter_prio_queue_done",
@@ -2044,6 +2046,7 @@ NOTIFY_OPTIONS = {
"acenter_prio_complete",
"acenter_prio_failed",
"acenter_prio_disk_full",
"acenter_prio_quota",
"acenter_prio_warning",
"acenter_prio_error",
"acenter_prio_queue_done",
@@ -2060,6 +2063,7 @@ NOTIFY_OPTIONS = {
"ntfosd_prio_complete",
"ntfosd_prio_failed",
"ntfosd_prio_disk_full",
"ntfosd_prio_quota",
"ntfosd_prio_warning",
"ntfosd_prio_error",
"ntfosd_prio_queue_done",
@@ -2077,6 +2081,7 @@ NOTIFY_OPTIONS = {
"prowl_prio_complete",
"prowl_prio_failed",
"prowl_prio_disk_full",
"prowl_prio_quota",
"prowl_prio_warning",
"prowl_prio_error",
"prowl_prio_queue_done",
@@ -2096,6 +2101,7 @@ NOTIFY_OPTIONS = {
"pushover_prio_complete",
"pushover_prio_failed",
"pushover_prio_disk_full",
"pushover_prio_quota",
"pushover_prio_warning",
"pushover_prio_error",
"pushover_prio_queue_done",
@@ -2116,6 +2122,7 @@ NOTIFY_OPTIONS = {
"pushbullet_prio_complete",
"pushbullet_prio_failed",
"pushbullet_prio_disk_full",
"pushbullet_prio_quota",
"pushbullet_prio_warning",
"pushbullet_prio_error",
"pushbullet_prio_queue_done",
@@ -2140,6 +2147,8 @@ NOTIFY_OPTIONS = {
"apprise_target_failed_enable",
"apprise_target_disk_full",
"apprise_target_disk_full_enable",
"apprise_target_quota",
"apprise_target_quota_enable",
"apprise_target_warning",
"apprise_target_warning_enable",
"apprise_target_error",
@@ -2163,6 +2172,7 @@ NOTIFY_OPTIONS = {
"nscript_prio_complete",
"nscript_prio_failed",
"nscript_prio_disk_full",
"nscript_prio_quota",
"nscript_prio_warning",
"nscript_prio_error",
"nscript_prio_queue_done",

View File

@@ -24,7 +24,6 @@ import platform
import ssl
import sys
import logging
import functools
import urllib.request
import urllib.parse
import re
@@ -39,6 +38,7 @@ import html
import ipaddress
import socks
import math
import rarfile
from threading import Thread
from collections.abc import Iterable
from typing import Union, Tuple, Any, AnyStr, Optional, List, Dict, Collection
@@ -1585,3 +1585,40 @@ def convert_history_retention():
cfg.history_retention_number.set(to_keep)
elif to_keep < 0:
cfg.history_retention_option.set("all-delete")
##
## SABnzbd patched rarfile classes
## Patch for https://github.com/markokr/rarfile/issues/56#issuecomment-711146569
##
class SABRarFile(rarfile.RarFile):
"""SABnzbd patched RarFile class with info_callback fix for multi-volume archives"""
def __init__(self, *args, **kwargs):
"""Patch RarFile-call when using `part_only`
to store filenames inside the RAR-files"""
if kwargs.get("part_only"):
kwargs["info_callback"] = self.info_callback
# Let RarFile handle the rest!
super().__init__(*args, **kwargs)
def info_callback(self, rar_obj: rarfile.RarInfo):
"""Called for every RarInfo-object found"""
# We only care about files inside the Rar
# For Rar5 there is a separate object, for Rar3 we need to check if a filename was parsed
if isinstance(rar_obj, (rarfile.Rar5FileInfo, rarfile.Rar3Info)) and rar_obj.filename:
# Avoid duplicates
if rar_obj not in self._file_parser._info_list:
self._file_parser._info_list.append(rar_obj)
self._file_parser._info_map[rar_obj.filename.rstrip("/")] = rar_obj
def filelist(self):
"""Return list of filenames in archive."""
return [f.filename for f in self.infolist() if not f.isdir()]
def trigger_parse(self):
"""Force re-parse, wich is needed to trigger password checking logic"""
self._parse()

View File

@@ -28,11 +28,11 @@ import time
import io
import shutil
import functools
import rarfile
from typing import Tuple, List, BinaryIO, Optional, Dict, Any, Union, Set
import sabnzbd
from sabnzbd.encoding import correct_unknown_encoding, ubtou
import sabnzbd.utils.rarfile as rarfile
from sabnzbd.misc import (
format_time_string,
find_on_path,
@@ -44,6 +44,7 @@ from sabnzbd.misc import (
build_and_run_command,
format_time_left,
is_none,
SABRarFile,
)
from sabnzbd.filesystem import (
make_script_path,
@@ -66,7 +67,7 @@ from sabnzbd.filesystem import (
)
from sabnzbd.nzbstuff import NzbObject
import sabnzbd.cfg as cfg
from sabnzbd.constants import Status, JOB_ADMIN
from sabnzbd.constants import Status
# Regex globals
@@ -647,15 +648,14 @@ def rar_extract_core(
"""
start = time.time()
logging.debug("rar_extract(): Extractionpath: %s", extraction_path)
logging.debug("Extraction path: %s", extraction_path)
logging.debug("Found rar version: %s", rarfile.is_rarfile(rarfile_path))
if password:
password_command = "-p%s" % password
else:
password_command = "-p-"
############################################################################
if one_folder or cfg.flat_unpack():
action = "e"
else:
@@ -667,24 +667,7 @@ def rar_extract_core(
overwrite = "-o-" # Disable overwrite
rename = "-or" # Auto renaming
if sabnzbd.WINDOWS:
# On Windows, UnRar uses a custom argument parser
# See: https://github.com/sabnzbd/sabnzbd/issues/1043
# The -scf forces the output to be UTF8
command = [
RAR_COMMAND,
action,
"-idp",
"-scf",
overwrite,
rename,
"-ai",
password_command,
rarfile_path,
"%s\\" % long_path(extraction_path),
]
elif RAR_PROBLEM:
if RAR_PROBLEM:
# Use only oldest options, specifically no "-or" or "-scf"
command = [
RAR_COMMAND,
@@ -693,10 +676,11 @@ def rar_extract_core(
overwrite,
password_command,
rarfile_path,
"%s/" % extraction_path,
extraction_path,
]
else:
# The -scf forces the output to be UTF8
# On Windows, specifically remove long path from destination so Unrar handles it
command = [
RAR_COMMAND,
action,
@@ -707,17 +691,17 @@ def rar_extract_core(
"-ai",
password_command,
rarfile_path,
"%s/" % extraction_path,
clip_path(extraction_path),
]
if cfg.ignore_unrar_dates():
command.insert(3, "-tsm-")
if not RAR_PROBLEM and (unrar_parameters := cfg.unrar_parameters().strip().split()):
for param in unrar_parameters:
command.insert(-2, param)
if cfg.ignore_unrar_dates():
command.insert(3, "-tsm-")
if unrar_parameters := cfg.unrar_parameters().split():
for param in unrar_parameters:
command.insert(-2, param)
# Get list of all the volumes part of this set
logging.debug("Analyzing rar file ... %s found", rarfile.is_rarfile(rarfile_path))
# On Windows, UnRar uses a custom argument parser
# See: https://github.com/sabnzbd/sabnzbd/issues/1043
p = build_and_run_command(command, windows_unrar_command=True)
sabnzbd.PostProcessor.external_process = p
@@ -793,11 +777,21 @@ def rar_extract_core(
requires_kill = True
elif line.startswith("Cannot create"):
line2 = p.stdout.readline()
if "must not exceed 260" in line2:
msg = "%s: %s" % (T("Unpacking failed, path is too long"), line[13:])
else:
msg = "%s %s" % (T("Unpacking failed, write error or disk is full?"), line[13:])
# Check if maybe it can be salvaged
line = p.stdout.readline()
lines.append(line.strip())
# Error is different on Linux and Windows
if line.startswith(("Invalid argument", "The filename, directory name, or volume label syntax")):
# Read another line
line = p.stdout.readline()
lines.append(line.strip())
# Will it try to correct?
if line.startswith("WARNING: Attempting to correct"):
# Great! Let it try
logging.info("Unrar detected invalid filename and is attempting to correct")
continue
msg = "%s %s" % (T("Unpacking failed, write error or disk is full?"), line)
nzo.fail_msg = msg
nzo.set_unpack_info("Unpack", msg, setname)
fail = 1
@@ -1474,7 +1468,7 @@ def rar_volumelist(rarfile_path: str, password: str, known_volumes: List[str]) -
# UnRar is required to read some RAR files
# RarFile can fail in special cases
try:
zf = rarfile.RarFile(rarfile_path)
zf = SABRarFile(rarfile_path)
# setpassword can fail due to bugs in RarFile
if password:

View File

@@ -342,6 +342,20 @@ class NNTP:
self.sock.settimeout(self.nw.server.timeout)
# Connect
if outgoing_nntp_ip := sabnzbd.cfg.outgoing_nntp_ip():
try:
self.sock.bind((outgoing_nntp_ip, 0))
socket_info = self.sock.getsockname()
logging.debug(
"%s@%s: Successfully bound to following ip address: %s at following port: %d",
self.nw.thrdnum,
self.nw.server.host,
socket_info[0],
socket_info[1],
)
except socket.error:
raise ConnectionError(f"Could not bind to outgoing interface {outgoing_nntp_ip}")
self.sock.connect(self.addrinfo.sockaddr)
# Secured or unsecured?

View File

@@ -89,6 +89,7 @@ NOTIFICATION_TYPES = {
"warning": TT("Warning"), #: Notification
"error": TT("Error"), #: Notification
"disk_full": TT("Disk full"), #: Notification
"quota": TT("Quota"), #: Notification
"queue_done": TT("Queue finished"), #: Notification
"new_login": TT("User logged in"), #: Notification
"other": TT("Other Messages"), #: Notification
@@ -323,6 +324,8 @@ def send_apprise(title, msg, notification_type, force=False, test=None):
"error": apprise.common.NotifyType.FAILURE,
# Disk full
"disk_full": apprise.common.NotifyType.WARNING,
# Quota
"quota": apprise.common.NotifyType.WARNING,
# Queue finished
"queue_done": apprise.common.NotifyType.INFO,
# User logged in

View File

@@ -43,7 +43,8 @@ from sabnzbd.filesystem import (
)
from sabnzbd.misc import name_to_cat, cat_pp_script_sanitizer
from sabnzbd.constants import DEFAULT_PRIORITY, VALID_ARCHIVES, AddNzbFileResult
from sabnzbd.utils import rarfile
from sabnzbd.misc import SABRarFile
import rarfile
def add_nzbfile(
@@ -169,7 +170,7 @@ def process_nzb_archive_file(
if zipfile.is_zipfile(path):
zf = zipfile.ZipFile(path)
elif rarfile.is_rarfile(path):
zf = rarfile.RarFile(path)
zf = SABRarFile(path)
elif sabnzbd.newsunpack.is_sevenfile(path):
zf = sabnzbd.newsunpack.SevenZip(path)
else:

View File

@@ -246,7 +246,9 @@ class NzbQueue:
def set_top_only(self, value):
self.__top_only = value
@NzbQueueLocker
def change_opts(self, nzo_ids: List[str], pp: int) -> int:
"""Locked so changes during URLGrabbing are correctly passed to new job"""
result = 0
for nzo_id in nzo_ids:
if nzo_id in self.__nzo_table:
@@ -254,7 +256,9 @@ class NzbQueue:
result += 1
return result
@NzbQueueLocker
def change_script(self, nzo_ids: List[str], script: str) -> int:
"""Locked so changes during URLGrabbing are correctly passed to new job"""
result = 0
if (script is None) or is_valid_script(script):
for nzo_id in nzo_ids:
@@ -264,7 +268,9 @@ class NzbQueue:
result += 1
return result
@NzbQueueLocker
def change_cat(self, nzo_ids: List[str], cat: str) -> int:
"""Locked so changes during URLGrabbing are correctly passed to new job"""
result = 0
for nzo_id in nzo_ids:
if nzo_id in self.__nzo_table:
@@ -278,7 +284,9 @@ class NzbQueue:
result += 1
return result
@NzbQueueLocker
def change_name(self, nzo_id: str, name: str, password: str = None) -> bool:
"""Locked so changes during URLGrabbing are correctly passed to new job"""
if nzo_id in self.__nzo_table:
nzo = self.__nzo_table[nzo_id]
logging.info("Renaming %s to %s", nzo.final_name, name)
@@ -440,7 +448,9 @@ class NzbQueue:
handled.append(nzo_id)
return handled
@NzbQueueLocker
def pause_nzo(self, nzo_id: str) -> List[str]:
"""Locked so changes during URLGrabbing are correctly passed to new job"""
handled = []
if nzo_id in self.__nzo_table:
nzo = self.__nzo_table[nzo_id]

View File

@@ -194,9 +194,10 @@ def parse_par2_file(fname: str, md5of16k: Dict[bytes, str]) -> Tuple[str, Dict[s
for i in range(48, pack_len - 32, 20):
filecrc32[fileid].append(struct.unpack("<I", data[i + 16 : i + 20])[0])
# On large files, we stop after seeing all the listings
# On large files, we stop after seeing all the listings and have crc32 data for all listings
# Our unit-tests do not include large par2 files, so we cannot verify cases like #3164!
# On smaller files, we scan them fully to get the par2-creator
if total_size > SCAN_LIMIT and len(filepar2info) == nr_files:
if total_size > SCAN_LIMIT and len(filepar2info) == nr_files == len(filecrc32):
break
# Process all the data

View File

@@ -26,6 +26,7 @@ import time
import re
import gc
import queue
import rarfile
from typing import List, Optional, Tuple
import sabnzbd
@@ -46,6 +47,7 @@ from sabnzbd.misc import (
change_queue_complete_action,
run_script,
is_none,
SABRarFile,
)
from sabnzbd.filesystem import (
real_path,
@@ -89,7 +91,6 @@ import sabnzbd.config as config
import sabnzbd.cfg as cfg
import sabnzbd.database as database
import sabnzbd.notifier as notifier
import sabnzbd.utils.rarfile as rarfile
import sabnzbd.utils.rarvolinfo as rarvolinfo
import sabnzbd.utils.checkdir
import sabnzbd.deobfuscate_filenames as deobfuscate
@@ -892,7 +893,7 @@ def try_rar_check(nzo: NzbObject, rars: List[str]) -> bool:
nzo.set_action_line(T("Trying RAR-based verification"), "...")
try:
# Requires de-unicode for RarFile to work!
zf = rarfile.RarFile(rars[0])
zf = SABRarFile(rars[0])
# Skip if it's encrypted
if zf.needs_password():
@@ -952,8 +953,8 @@ def rar_renamer(nzo: NzbObject) -> int:
continue
if rarfile.is_rarfile(file_to_check):
# if a rar file is fully encrypted, rarfile.RarFile() will return an empty list:
if not rarfile.RarFile(file_to_check, single_file_check=True).filelist():
# if a rar file is fully encrypted, RarFile() will return an empty list:
if not SABRarFile(file_to_check, part_only=True).filelist():
logging.info(
"Download %s contains a fully encrypted & obfuscated rar-file: %s.",
nzo.final_name,
@@ -969,9 +970,7 @@ def rar_renamer(nzo: NzbObject) -> int:
logging.debug("Detected volume-number %s from RAR-header: %s ", rar_vol, file_to_check)
volnrext[file_to_check] = (rar_vol, new_extension)
# The files inside rar file
rar_contents = rarfile.RarFile(
os.path.join(nzo.download_path, file_to_check), single_file_check=True
).filelist()
rar_contents = SABRarFile(os.path.join(nzo.download_path, file_to_check), part_only=True).filelist()
try:
rarvolnr[rar_vol]
except Exception:

View File

@@ -171,6 +171,7 @@ SKIN_TEXT = {
"mode": TT("Processing"), #: Queue page table column header
"name": TT("Name"), #: Queue page table column header
"button-retry": TT("Retry"), #: Queue page button
"button-mark-completed": TT("Mark as Completed & Remove Temporary Files"), #: History page button
"eoq-scripts": TT("Scripts"), #: Queue page table, script selection menu
"purgeQueue": TT("Purge Queue"), #: Queue page button
"purgeQueueConf": TT("Delete all items from the queue?"), #: Confirmation popup
@@ -544,7 +545,8 @@ SKIN_TEXT = {
"srv-expire_date": TT("Account expiration date"),
"srv-explain-expire_date": TT("Warn 5 days in advance of account expiration date."),
"srv-explain-quota": TT(
"Quota for this account, counted from the time it is set. In bytes, optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few minutes."
"Quota for this server, counted from the time it is set. In bytes, optionally follow with K,M,G.<br />"
"Checked every few minutes. Notification is sent when quota is spent."
),
"srv-retention": TT("Retention time"), #: Server's retention time in days
"srv-ssl": TT("SSL"), #: Server SSL tickbox
@@ -838,6 +840,9 @@ SKIN_TEXT = {
"Glitter-backToQueue": TT("Send back to queue"),
"Glitter-purgeOrphaned": TT("Delete All"),
"Glitter-retryAllOrphaned": TT("Retry all"),
"Glitter-clearOrphanWarning": TT(
"Are you sure you want to delete all folders in your Temporary Download Folder? This cannot be undone!"
),
"Glitter-deleteJobAndFolders": TT("Remove NZB & Delete Files"),
"Glitter-addFromURL": TT("Fetch NZB from URL"),
"Glitter-addFromFile": TT("Upload NZB"),
@@ -914,6 +919,7 @@ SKIN_TEXT = {
"wizard-goto": TT("Go to SABnzbd"), #: Wizard step
"wizard-exit": TT("Exit SABnzbd"), #: Wizard EXIT button on first page
"wizard-start": TT("Start Wizard"), #: Wizard START button on first page
"wizard-test-server-required": TT("Click on Test Server before continuing"), #: Tooltip for disabled Next button
"restore-backup": TT("Restore backup"),
# Special
"yourRights": TT(

View File

@@ -48,6 +48,7 @@ import sabnzbd.filesystem
import sabnzbd.cfg as cfg
import sabnzbd.emailer as emailer
import sabnzbd.notifier as notifier
from sabnzbd.decorators import NZBQUEUE_LOCK
from sabnzbd.encoding import ubtou, utob
from sabnzbd.nzbparser import AddNzbFileResult
from sabnzbd.nzbstuff import NzbObject, NzbRejected, NzbRejectToHistory
@@ -263,21 +264,24 @@ class URLGrabber(Thread):
# If the user resumed a duplicate detected URL, skip the check
dup_check = future_nzo.duplicate != DuplicateStatus.DUPLICATE_IGNORED
# Add the new job to the queue
res, _ = sabnzbd.nzbparser.add_nzbfile(
path,
pp=future_nzo.pp,
script=future_nzo.script,
cat=future_nzo.cat,
priority=future_nzo.priority,
nzbname=future_nzo.custom_name,
nzo_info=nzo_info,
url=future_nzo.url,
keep=False,
password=future_nzo.password,
nzo_id=future_nzo.nzo_id,
dup_check=dup_check,
)
# Locked, so that changes to the future_nzo are picked up by the new nzo
with NZBQUEUE_LOCK:
# Add the new job to the queue
res, _ = sabnzbd.nzbparser.add_nzbfile(
path,
pp=future_nzo.pp,
script=future_nzo.script,
cat=future_nzo.cat,
priority=future_nzo.priority,
nzbname=future_nzo.custom_name,
nzo_info=nzo_info,
url=future_nzo.url,
keep=False,
password=future_nzo.password,
nzo_id=future_nzo.nzo_id,
dup_check=dup_check,
)
if res is AddNzbFileResult.RETRY:
logging.info("Incomplete NZB, retry after 5 min %s", url)
self.add(url, future_nzo, when=300)

View File

File diff suppressed because it is too large Load Diff

View File

@@ -19,14 +19,10 @@
"""
sabnzbd.utils.rarvolinfo - Find out volume number and/or original extension of a rar file. Useful with obfuscated files
"""
import logging
import os
try:
import sabnzbd.utils.rarfile as rarfile
except ImportError:
import rarfile
import rarfile
def get_rar_extension(myrarfile):
@@ -40,9 +36,9 @@ def get_rar_extension(myrarfile):
org_extension = False
try:
rar_ver = rarfile.is_rarfile(myrarfile)
rar_ver = rarfile.get_rar_version(myrarfile)
with open(myrarfile, "rb") as fh:
if rar_ver.endswith("3"):
if rar_ver == rarfile.RAR_V3:
# As it's rar3, let's first find the numbering scheme: old (rNN) or new (partNN.rar)
mybuf = fh.read(100) # first 100 bytes is enough
HEAD_FLAGS_LSB = mybuf[10] # LSB = Least Significant Byte
@@ -62,7 +58,7 @@ def get_rar_extension(myrarfile):
else:
org_extension = "r%02d" % (volumenumber - 2)
elif rar_ver.endswith("5"):
elif rar_ver == rarfile.RAR_V5:
mybuf = fh.read(100) # first 100 bytes is enough
# Get (and skip) the first 8 + 4 bytes

View File

@@ -6,5 +6,5 @@
# You MUST use double quotes (so " and not ')
# Do not forget to update the appdata file for every major release!
__version__ = "4.5.4Beta1"
__baseline__ = "unknown"
__version__ = "4.5.5"
__baseline__ = "a61a5539a7e0e0dc1f9ae140222436ba8f9fe679"

View File

Binary file not shown.

View File

Binary file not shown.

View File

@@ -3,13 +3,14 @@ pytest
setuptools
selenium
requests
pyfakefs>=5.6.0
werkzeug<2.1.0 # Breaks httpbin in newer versions
pyfakefs
werkzeug
pytest-httpbin
pytest-httpserver
flaky
xmltodict
tavern
tavern==3.0.0; python_version >= '3.11' # Latest version only supported on Python 3.11 and above
flask
tavalidate
importlib_metadata

View File

@@ -31,6 +31,7 @@ import sabnzbd
import sabnzbd.newsunpack as newsunpack
from sabnzbd.constants import JOB_ADMIN
from sabnzbd.misc import format_time_string
from sabnzbd.filesystem import long_path, create_all_dirs, listdir_full
class TestNewsUnpackFunctions:
@@ -276,3 +277,355 @@ class TestPar2Repair:
call("Verifying repair", "01/01"),
]
)
@pytest.mark.usefixtures("clean_cache_dir")
class TestRarUnpack:
@staticmethod
def _create_test_nzo(temp_dir, filename="test.nzb"):
"""Create a mock NZO object for testing"""
nzo = mock.Mock()
nzo.download_path = temp_dir
nzo.admin_path = os.path.join(temp_dir, JOB_ADMIN)
nzo.fail_msg = ""
nzo.final_name = filename
nzo.delete = True # Enable deletion of extracted files
nzo.direct_unpacker = None # No direct unpacker
nzo.set_unpack_info = mock.Mock()
nzo.set_action_line = mock.Mock()
# Mock password-related attributes
nzo.password = "" # No password by default
nzo.nzo_info = {} # Empty nzo_info
nzo.meta = {} # Empty meta data
nzo.correct_password = "" # No correct password found yet
return nzo
@staticmethod
def _run_rar_unpack(
test_dir,
rar_files,
one_folder=False,
custom_temp_test_dir=None,
custom_temp_complete_dir=None,
custom_nzo_settings=None,
):
"""Run rar_unpack with test data"""
# Base
temp_test_dir_base = temp_test_dir = long_path(os.path.join(SAB_CACHE_DIR, "rar_unpack_temp"))
temp_complete_dir_base = temp_complete_dir = long_path(os.path.join(SAB_CACHE_DIR, "rar_complete_temp"))
# Extend if needed
if custom_temp_test_dir:
temp_test_dir = os.path.join(temp_test_dir, custom_temp_test_dir)
if custom_temp_complete_dir:
temp_complete_dir = os.path.join(temp_complete_dir, custom_temp_complete_dir)
assert create_all_dirs(temp_test_dir), f"Failed to create {temp_test_dir}"
assert create_all_dirs(temp_complete_dir), f"Failed to create {temp_complete_dir}"
# Copy test files to temp directory
copied_rars = []
for rar_file in rar_files:
src_path = os.path.join(test_dir, rar_file)
if os.path.exists(src_path):
dst_path = os.path.join(temp_test_dir, rar_file)
shutil.copy(src_path, dst_path)
copied_rars.append(dst_path)
# Make sure all programs are found
newsunpack.find_programs(".")
# Mock PostProcessor that's needed for RAR extraction
sabnzbd.PostProcessor = mock.Mock()
# Create mock NZO
nzo = TestRarUnpack._create_test_nzo(temp_test_dir)
# Apply custom NZO settings if provided
if custom_nzo_settings:
for key, value in custom_nzo_settings.items():
setattr(nzo, key, value)
try:
# Run the rar_unpack function
error_code, extracted_files = newsunpack.rar_unpack(nzo, temp_complete_dir, one_folder, copied_rars)
# Get directory contents with full paths
complete_contents = listdir_full(temp_complete_dir) if os.path.exists(temp_complete_dir) else []
download_contents = os.listdir(temp_test_dir) if os.path.exists(temp_test_dir) else []
return error_code, extracted_files, complete_contents, download_contents, nzo, temp_complete_dir
finally:
# Cleanup
shutil.rmtree(temp_test_dir_base)
shutil.rmtree(temp_complete_dir_base)
def _assert_successful_extraction(
self,
error_code,
extracted_files,
complete_contents,
download_contents,
temp_complete_dir,
expected_files,
should_delete_original=True,
original_files=None,
):
"""Helper method to assert common successful extraction conditions"""
# Check that extraction was successful
assert error_code == 0, "RAR extraction should succeed"
assert len(extracted_files) > 0, "Should have extracted files"
assert len(complete_contents) > 0, "Should have files in complete directory"
# Check file deletion behavior
if should_delete_original and original_files:
for original_file in original_files:
rar_still_exists = any(original_file in f for f in download_contents)
assert not rar_still_exists, f"Original RAR file {original_file} should be deleted after extraction"
elif not should_delete_original and original_files:
for original_file in original_files:
rar_still_exists = any(original_file in f for f in download_contents)
assert rar_still_exists, f"Original RAR file {original_file} should still exist when delete=False"
# Verify full paths, but since extracted_files also includes the in-between folders we use issubset
complete_contents_set = set(complete_contents)
extracted_files_set = set(extracted_files)
assert complete_contents_set.issubset(
extracted_files_set
), f"{complete_contents_set} should be in {extracted_files_set}"
# Verify the expected files are present using full paths
expected_full_paths = {os.path.join(temp_complete_dir, filename) for filename in expected_files}
assert expected_full_paths.issubset(
extracted_files_set
), f"{expected_full_paths} should be in {extracted_files_set}"
def test_basic_rar_unpack(self):
"""Test basic RAR unpacking functionality"""
test_dir = "tests/data/basic_rar5"
rar_files = ["testfile.rar"]
expected_files = {"Testfile_1234.bin", "testfile.bin", "My_Test_Download.bin"}
error_code, extracted_files, complete_contents, download_contents, nzo, temp_complete_dir = (
self._run_rar_unpack(test_dir, rar_files)
)
self._assert_successful_extraction(
error_code,
extracted_files,
complete_contents,
download_contents,
temp_complete_dir,
expected_files,
should_delete_original=True,
original_files=rar_files,
)
def test_rar_unpack_no_delete(self):
"""Test RAR unpacking without deleting the original files"""
test_dir = "tests/data/basic_rar5"
rar_files = ["testfile.rar"]
expected_files = {"Testfile_1234.bin", "testfile.bin", "My_Test_Download.bin"}
custom_nzo_settings = {"delete": False}
error_code, extracted_files, complete_contents, download_contents, nzo, temp_complete_dir = (
self._run_rar_unpack(test_dir, rar_files, custom_nzo_settings=custom_nzo_settings)
)
self._assert_successful_extraction(
error_code,
extracted_files,
complete_contents,
download_contents,
temp_complete_dir,
expected_files,
should_delete_original=False,
original_files=rar_files,
)
def test_rar_unpack_long_path(self):
"""Test RAR unpacking with very long paths (>260 characters) for both download and complete directories"""
# Create very long paths that exceed 260 characters on all platforms
# This tests handling of long paths universally, not just on Windows
# Build long nested directory structure to guarantee >260 character paths
long_dir_name = "very_long_directory_name_" + "x" * 100 # 82 characters
nested_path_parts = [long_dir_name] * 4 # 4 levels of 82-char names = 328
temp_test_dir = os.path.join(*nested_path_parts)
temp_complete_dir = os.path.join(*nested_path_parts)
assert len(temp_test_dir) > 260, "Should have test directory > 260 characters"
assert len(temp_complete_dir) > 0, "Should have complete directory > 260 characters"
test_dir = "tests/data/basic_rar5"
rar_files = ["testfile.rar"]
expected_files = {"Testfile_1234.bin", "testfile.bin", "My_Test_Download.bin"}
error_code, extracted_files, complete_contents, download_contents, nzo, actual_temp_complete_dir = (
self._run_rar_unpack(
test_dir, rar_files, custom_temp_test_dir=temp_test_dir, custom_temp_complete_dir=temp_complete_dir
)
)
self._assert_successful_extraction(
error_code,
extracted_files,
complete_contents,
download_contents,
actual_temp_complete_dir,
expected_files,
should_delete_original=True,
original_files=rar_files,
)
def test_rar_unpack_rar_long_path_inside(self):
"""Test RAR unpacking functionality for file with long paths inside"""
# Test with the basic rar5 test file
test_dir = "tests/data/rar_long_path_inside"
rar_files = ["long_path_in_rar.rar"]
expected_files = {"Testfile_1234.bin", "testfile.bin", "My_Test_Download.bin"}
# The long nested directory structure inside the rar is build the same as test_rar_unpack_long_path
long_dir_name = "very_long_directory_name_" + "x" * 100 # 82 characters
nested_path_parts = [long_dir_name] * 4 # 4 levels of 82-char names = 328
expected_files = {os.path.join(*nested_path_parts, expected_file) for expected_file in expected_files}
error_code, extracted_files, complete_contents, download_contents, nzo, temp_complete_dir = (
self._run_rar_unpack(test_dir, rar_files)
)
self._assert_successful_extraction(
error_code,
extracted_files,
complete_contents,
download_contents,
temp_complete_dir,
expected_files,
should_delete_original=True,
original_files=rar_files,
)
def test_rar_unpack_multipart_unicode(self):
"""Test multi-part RAR unpacking with unicode filenames"""
# Test with unicode multi-part RAR files
test_dir = "tests/data/unicode_rar"
rar_files = [
"我喜欢编程.part1.rar",
"我喜欢编程.part2.rar",
"我喜欢编程.part3.rar",
"我喜欢编程.part4.rar",
"我喜欢编程.part5.rar",
"我喜欢编程.part6.rar",
]
expected_files = {"我喜欢编程_My_Test_Download.bin"}
error_code, extracted_files, complete_contents, download_contents, nzo, temp_complete_dir = (
self._run_rar_unpack(test_dir, rar_files)
)
self._assert_successful_extraction(
error_code,
extracted_files,
complete_contents,
download_contents,
temp_complete_dir,
expected_files,
should_delete_original=True,
original_files=rar_files,
)
def test_rar_unpack_passworded(self):
"""Test RAR unpacking with password-protected file"""
# Test with password-protected RAR file
test_dir = "tests/data/test_passworded{{secret}}"
rar_files = ["passworded-file.rar"]
expected_files = {"testfile.bin", "My_Test_Download.bin"}
# Set NZO with the correct password
custom_nzo_settings = {
"password": "secret", # The password is "secret"
"nzo_info": {"password": "secret"}, # Also set in nzo_info
"meta": {"password": ["secret"]}, # And in meta for get_all_passwords
}
error_code, extracted_files, complete_contents, download_contents, nzo, temp_complete_dir = (
self._run_rar_unpack(test_dir, rar_files, custom_nzo_settings=custom_nzo_settings)
)
self._assert_successful_extraction(
error_code,
extracted_files,
complete_contents,
download_contents,
temp_complete_dir,
expected_files,
should_delete_original=True,
original_files=rar_files,
)
def test_rar_unpack_wrong_password(self):
"""Test RAR unpacking with wrong password fails appropriately"""
# Test with password-protected RAR file but wrong password
test_dir = "tests/data/test_passworded{{secret}}"
rar_files = ["passworded-file.rar"]
# Set NZO with the wrong password
custom_nzo_settings = {
"password": "wrongpassword", # Wrong password
"nzo_info": {"password": "wrongpassword"},
"meta": {"password": ["wrongpassword"]},
}
error_code, extracted_files, complete_contents, download_contents, nzo, temp_complete_dir = (
self._run_rar_unpack(test_dir, rar_files, custom_nzo_settings=custom_nzo_settings)
)
# Check that extraction failed with wrong password (error_code 2 = wrong password)
assert error_code == 2, "Password-protected RAR extraction should fail with wrong password (error_code 2)"
assert len(extracted_files) == 0, "Should have no extracted files with wrong password"
assert len(complete_contents) == 0, "Should have no files in complete directory with wrong password"
# Verify that the original RAR file still exists (extraction failed)
rar_still_exists = any("passworded-file.rar" in f for f in download_contents)
assert rar_still_exists, "Original RAR file should still exist when extraction fails"
def test_rar_unpack_invalid_windows_filenames(self):
"""Test RAR unpacking with Windows-invalid filenames (allowed to fail on Windows)
This test contains a RAR file with filenames that are invalid on Windows
(e.g., files named CON, AUX, PRN, etc. or containing invalid characters).
On Windows, this extraction may fail, which is acceptable behavior.
"""
# Test with RAR containing Windows-invalid filenames
test_dir = "tests/data/rar_invalid_windows"
rar_files = ["rar_invalid_on_windows.rar"]
# Check for expected corrected filenames, Unrar corrects it on Windows
if sabnzbd.WINDOWS:
expected_files = {"blabla __ bla _ bla __ __ bla ___ CON.bin"}
else:
expected_files = {'blabla :: bla " bla << || bla ??? CON.bin'}
error_code, extracted_files, complete_contents, download_contents, nzo, temp_complete_dir = (
self._run_rar_unpack(test_dir, rar_files)
)
self._assert_successful_extraction(
error_code,
extracted_files,
complete_contents,
download_contents,
temp_complete_dir,
expected_files,
should_delete_original=True,
original_files=rar_files,
)

View File

@@ -18,15 +18,19 @@
"""
tests.test_newswrapper - Tests of various functions in newswrapper
"""
import errno
import ipaddress
import logging
import os.path
import socket
import sys
import tempfile
import threading
import ssl
import time
import warnings
from typing import Optional
from enum import Enum
from typing import Optional, Tuple
import portend
from flaky import flaky
@@ -40,6 +44,11 @@ TEST_PORT = portend.find_available_local_port()
TEST_DATA = b"connection_test"
class IPProtocolVersion(Enum):
IPV4 = 4
IPV6 = 6
def socket_test_server(ssl_context: ssl.SSLContext):
"""Support function that starts a mini-server"""
# Allow reuse of the address, because our CI is too fast for the socket closing
@@ -61,6 +70,42 @@ def socket_test_server(ssl_context: ssl.SSLContext):
server_socket.close()
def get_local_ip(protocol_version: IPProtocolVersion) -> Optional[str]:
"""
Find the ip address that would be used to send traffic towards internet. Uses the UDP Socket trick: connect is not
sending any traffic but already prefills what would be the sender ip address.
"""
s: Optional[socket.socket] = None
address_to_connect_to: Optional[Tuple[str, int]] = None
if protocol_version == IPProtocolVersion.IPV4:
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
# Google DNS IPv4
address_to_connect_to = ("8.8.8.8", 80)
elif protocol_version == IPProtocolVersion.IPV6:
s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
# Google DNS IPv6
address_to_connect_to = ("2001:4860:4860::8888", 80)
else:
raise ValueError(f"Unknown protocol version: {protocol_version}")
assert s is not None, "Socket has not been assigned!"
assert address_to_connect_to is not None, "Address to connect to has not been assigned!"
try:
s.connect(address_to_connect_to)
local_ip = s.getsockname()[0]
except OSError as e:
# If the network is unreachable, it's probably that we don't have an IP for this Protocol
# On Linux, we would get ENETUNREACH where on Mac OS we would get EHOSTUNREACH
if e.errno == errno.ENETUNREACH or e.errno == errno.EHOSTUNREACH:
return None
else:
raise
finally:
s.close()
return local_ip
@flaky
class TestNewsWrapper:
cert_file = os.path.join(tempfile.mkdtemp(), "test.cert")
@@ -139,3 +184,63 @@ class TestNewsWrapper:
if server_thread.is_alive():
raise RuntimeError("Test server was not stopped")
time.sleep(1.0)
@pytest.mark.parametrize(
"local_ip, ip_protocol",
[
(get_local_ip(protocol_version=IPProtocolVersion.IPV4), IPProtocolVersion.IPV4),
(get_local_ip(protocol_version=IPProtocolVersion.IPV6), IPProtocolVersion.IPV6),
("", None),
],
)
def test_socket_binding_outgoing_ip(
self, local_ip: Optional[str], ip_protocol: Optional[IPProtocolVersion], monkeypatch
):
"""Test to make sure that the binding of outgoing interface works as expected."""
if local_ip is None and ip_protocol is not None:
pytest.skip(f"No available ip for this protocol: {ip_protocol}")
elif ip_protocol is not None:
# We want to make sure the local ip is matching the version of the expected IP Protocol
assert ipaddress.ip_address(local_ip).version == ip_protocol.value
nw = mock.Mock()
nw.blocking = True
nw.thrdnum = 1
nw.server = mock.Mock()
nw.server.host = TEST_HOST
nw.server.port = TEST_PORT
nw.server.info = AddrInfo(*socket.getaddrinfo(TEST_HOST, TEST_PORT, 0, socket.SOCK_STREAM)[0])
nw.server.timeout = 10
nw.server.ssl = True
nw.server.ssl_context = None
nw.server.ssl_verify = 0
nw.server.ssl_ciphers = None
sabnzbd.cfg.outgoing_nntp_ip.set(local_ip)
# We mock the connect as it's being called in the Init, we want to have a "functional" newswrapper.NNTP instance
def mock_connect(self):
pass
monkeypatch.setattr("sabnzbd.newswrapper.NNTP.connect", mock_connect)
nntp = newswrapper.NNTP(nw, nw.server.info)
monkeypatch.undo()
# The connection has crashed but the socket should have been bound to the provided ip in the configuration
with pytest.raises(OSError) as excinfo:
nntp.connect()
if sys.platform == "win32":
# On Windows, the error code for this is WSAECONNREFUSED (10061)
assert excinfo.value.errno == errno.WSAECONNREFUSED
else:
# On Linux and macOS, the error code is ECONNREFUSED
assert excinfo.value.errno == errno.ECONNREFUSED
current_ip, _ = nntp.sock.getsockname()
if local_ip != "":
assert current_ip == local_ip
else:
assert current_ip is not None
nntp.close(send_quit=False)

View File

@@ -34,84 +34,92 @@ from tests.testhelper import *
@pytest.mark.usefixtures("clean_cache_dir")
class TestPostProc:
# Tests of rar_renamer() (=deobfuscate) against various input directories
def test_rar_renamer(self):
# Function to deobfuscate one directory with rar_renamer()
def deobfuscate_dir(sourcedir, expected_filename_matches):
# We create a workingdir inside the sourcedir, because the filenames are really changed
workingdir = os.path.join(sourcedir, "workingdir")
# Helper function for rar_renamer tests
def _deobfuscate_dir(self, sourcedir, expected_filename_matches):
"""Function to deobfuscate one directory with rar_renamer()"""
# We create a workingdir inside the sourcedir, because the filenames are really changed
workingdir = os.path.join(SAB_CACHE_DIR, "workingdir_test_rar_renamer")
# if workingdir is still there from previous run, remove it:
if os.path.isdir(workingdir):
try:
shutil.rmtree(workingdir)
except PermissionError:
pytest.fail("Could not remove existing workingdir %s for rar_renamer" % workingdir)
# create a fresh copy
try:
shutil.copytree(sourcedir, workingdir)
except Exception:
pytest.fail("Could not create copy of files for rar_renamer")
# And now let the magic happen:
nzo = mock.Mock()
nzo.final_name = "somedownloadname"
nzo.download_path = workingdir
number_renamed_files = postproc.rar_renamer(nzo)
# run check on the resulting files
if expected_filename_matches:
for filename_match in expected_filename_matches:
if len(globber_full(workingdir, filename_match)) != expected_filename_matches[filename_match]:
pytest.fail("Failed filename_match %s in %s" % (filename_match, workingdir))
# Remove workingdir again
# if workingdir is still there from previous run, remove it:
if os.path.isdir(workingdir):
try:
shutil.rmtree(workingdir)
except Exception:
except PermissionError:
pytest.fail("Could not remove existing workingdir %s for rar_renamer" % workingdir)
return number_renamed_files
# create a fresh copy
try:
shutil.copytree(sourcedir, workingdir)
except Exception:
pytest.fail("Could not create copy of files for rar_renamer")
# obfuscated, single rar set
# And now let the magic happen:
nzo = mock.Mock()
nzo.final_name = "somedownloadname"
nzo.download_path = workingdir
number_renamed_files = postproc.rar_renamer(nzo)
# run check on the resulting files
if expected_filename_matches:
for filename_match in expected_filename_matches:
if len(globber_full(workingdir, filename_match)) != expected_filename_matches[filename_match]:
pytest.fail("Failed filename_match %s in %s" % (filename_match, workingdir))
# Remove workingdir again
try:
shutil.rmtree(workingdir)
except Exception:
pytest.fail("Could not remove existing workingdir %s for rar_renamer" % workingdir)
return number_renamed_files
def test_rar_renamer_obfuscated_single_rar_set(self):
"""Test rar_renamer with obfuscated single rar set"""
sourcedir = os.path.join(SAB_DATA_DIR, "obfuscated_single_rar_set")
# Now define the filematches we want to see, in which amount ("*-*-*-*-*" are the input files):
expected_filename_matches = {"*part007.rar": 1, "*-*-*-*-*": 0}
assert deobfuscate_dir(sourcedir, expected_filename_matches) == 7
assert self._deobfuscate_dir(sourcedir, expected_filename_matches) == 7
# obfuscated, two rar sets
def test_rar_renamer_obfuscated_two_rar_sets(self):
"""Test rar_renamer with obfuscated two rar sets"""
sourcedir = os.path.join(SAB_DATA_DIR, "obfuscated_two_rar_sets")
expected_filename_matches = {"*part007.rar": 2, "*part009.rar": 1, "*-*-*-*-*": 0}
assert deobfuscate_dir(sourcedir, expected_filename_matches) == 16
assert self._deobfuscate_dir(sourcedir, expected_filename_matches) == 16
# obfuscated, but not a rar set
def test_rar_renamer_obfuscated_but_no_rar(self):
"""Test rar_renamer with obfuscated files that are not rar sets"""
sourcedir = os.path.join(SAB_DATA_DIR, "obfuscated_but_no_rar")
expected_filename_matches = {"*.rar": 0, "*-*-*-*-*": 6}
assert deobfuscate_dir(sourcedir, expected_filename_matches) == 0
assert self._deobfuscate_dir(sourcedir, expected_filename_matches) == 0
def test_rar_renamer_single_rar_set_missing_first_rar(self):
"""Test rar_renamer with single rar set missing first rar"""
# One obfuscated rar set, but first rar (.part1.rar) is missing
sourcedir = os.path.join(SAB_DATA_DIR, "obfuscated_single_rar_set_missing_first_rar")
# single rar set (of 6 obfuscated rar files), so we expect renaming
# thus result must 6 rar files, and 0 obfuscated files
expected_filename_matches = {"*.rar": 6, "*-*-*-*-*": 0}
# 6 files should have been renamed
assert deobfuscate_dir(sourcedir, expected_filename_matches) == 6
assert self._deobfuscate_dir(sourcedir, expected_filename_matches) == 6
def test_rar_renamer_double_rar_set_missing_rar(self):
"""Test rar_renamer with two rar sets where some rars are missing"""
# Two obfuscated rar sets, but some rars are missing
sourcedir = os.path.join(SAB_DATA_DIR, "obfuscated_double_rar_set_missing_rar")
# Two sets, missing rar, so we expect no renaming
# thus result should be 0 rar files, and still 8 obfuscated files
expected_filename_matches = {"*.rar": 0, "*-*-*-*-*": 8}
# 0 files should have been renamed
assert deobfuscate_dir(sourcedir, expected_filename_matches) == 0
assert self._deobfuscate_dir(sourcedir, expected_filename_matches) == 0
def test_rar_renamer_fully_encrypted_and_obfuscated(self):
"""Test rar_renamer with fully encrypted and obfuscated rar set"""
# fully encrypted rar-set, and obfuscated rar names
sourcedir = os.path.join(SAB_DATA_DIR, "fully_encrypted_and_obfuscated_rars")
# SABnzbd cannot do anything with this, so we expect no renaming
expected_filename_matches = {"*.rar": 0, "*-*-*-*-*": 6}
# 0 files should have been renamed
assert deobfuscate_dir(sourcedir, expected_filename_matches) == 0
assert self._deobfuscate_dir(sourcedir, expected_filename_matches) == 0
@pytest.mark.parametrize("category", ["testcat", "Default", None])
@pytest.mark.parametrize("has_jobdir", [True, False]) # With or without a job dir

View File

@@ -326,7 +326,7 @@ class DownloadFlowBasics(SABnzbdBaseTest):
self.selenium_wrapper(self.driver.find_element, By.ID, "next-button").click()
self.no_page_crash()
check_result = self.selenium_wrapper(self.driver.find_element, By.CLASS_NAME, "quoteBlock").text
assert "http://%s:%s/" % (SAB_HOST, SAB_PORT) in check_result
assert "http://%s:%s" % (SAB_HOST, SAB_PORT) in check_result
# Go to SAB!
self.selenium_wrapper(self.driver.find_element, By.CSS_SELECTOR, ".btn.btn-success").click()