Compare commits

...

4 Commits

Author SHA1 Message Date
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
6 changed files with 15 additions and 31 deletions

View File

@@ -1,4 +1,4 @@
Release Notes - SABnzbd 4.2.3 Release Candidate 2
Release Notes - SABnzbd 4.2.3 Release Candidate 3
=========================================================
This is the third bug-fix release of SABnzbd 4.2.0.
@@ -6,7 +6,8 @@ This is the third bug-fix release of SABnzbd 4.2.0.
## Bug-fixes and changes since 4.2.2:
* **Bug-fixes:**
* Handle new status code for missing articles, which could result in timeouts.
* Handle new status code for missing articles, which would result in timeouts.
This specifically affects Giganews and its resellers.
* Retry of failed job would not use the password provided.
* Optimize database handling in order to prevent locking errors.
* macOS: System standby after finishing the queue would not always work.

View File

@@ -288,18 +288,9 @@ col2 h3 a,
fill: #555555;
}
/* Placeholders - Will not work if grouped! */
::-webkit-input-placeholder {
color: #EBEBEB !important;
}
::-moz-placeholder {
color: #EBEBEB !important;
opacity: 1 !important;
}
:-ms-input-placeholder {
::placeholder {
color: #EBEBEB !important;
opacity: 0.5;
}
.tooltip-inner {

View File

@@ -272,16 +272,7 @@ button:focus {
outline: initial;
}
/* Placeholders - Will not work if grouped! */
::-webkit-input-placeholder {
color: #EBEBEB !important;
}
::-moz-placeholder {
color: #EBEBEB !important;
opacity: 1 !important;
}
:-ms-input-placeholder {
color: #EBEBEB !important;
::placeholder {
color: #EBEBEB !important;
opacity: 0.5 !important;
}

View File

@@ -209,7 +209,7 @@ def decode_uu(article: Article, raw_data: bytes) -> bytes:
"""Try to uu-decode an article. The raw_data may or may not contain headers.
If there are headers, they will be separated from the body by at least one
empty line. In case of no headers, the first line seems to always be the nntp
response code (222) directly followed by the msg body."""
response code (220/222) directly followed by the msg body."""
if not raw_data:
logging.debug("No data to decode")
raise BadUu
@@ -232,7 +232,7 @@ def decode_uu(article: Article, raw_data: bytes) -> bytes:
uu_start = raw_data[:limit].index(b"") + 1
except ValueError:
# No empty line, look for a response code instead
if raw_data[0].startswith(b"222 "):
if raw_data[0].startswith(b"220 ") or raw_data[0].startswith(b"222 "):
uu_start = 1
else:
# Invalid data?

View File

@@ -729,7 +729,9 @@ class Downloader(Thread):
time.sleep(0.01)
sabnzbd.BPSMeter.update()
if nw.status_code != 222 and not done:
# Response code depends on request command:
# # 220 = ARTICLE, 222 = BODY
if nw.status_code not in (220, 222) and not done:
if not nw.connected or nw.status_code == 480:
if not self.__finish_connect_nw(nw):
return
@@ -766,12 +768,11 @@ class Downloader(Thread):
else:
logging.warning(
T("%s@%s: Received unknown status code %s for article %s: %s"),
T("%s@%s: Received unknown status code %s for article %s"),
nw.thrdnum,
nw.server.host,
nw.status_code,
article.article,
nw.nntp_msg.splitlines()[0],
)
done = True
nw.reset_data_buffer()

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.2.3RC2"
__version__ = "4.2.3RC3"
__baseline__ = "unknown"