Use blocking writes instead of buffering

context/Download-flow.md

@@ -16,7 +16,8 @@
 
 5. **Request scheduling & pipelining**  
    - `write()` chooses the next article command (`STAT/HEAD` for precheck, `BODY` or `ARTICLE` otherwise).  
-   - Concurrency is limited by `server.pipelining_requests`; commands are queued and sent; partial writes are buffered.
+   - Concurrency is limited by `server.pipelining_requests`; commands are queued and sent with `sock.sendall`, so there is no local send buffer. A `BlockingIOError/SSLWantWriteError` simply requeues the same request for the next selector cycle.
+   - Sockets stay registered for `EVENT_WRITE`: without write readiness events, a temporarily full kernel send buffer could stall queued commands when there is nothing to read, so WRITE interest is needed to resume sending promptly.
 
 6. **Receiving data**  
    - Selector events route to `process_nw_read`; `NewsWrapper.read` pulls bytes (SSL optimized via sabctools), parses NNTP responses, and calls `on_response`.  

po/main/SABnzbd.pot

@@ -1558,14 +1558,6 @@ msgstr ""
 msgid "Received a DBus exception %s"
 msgstr ""
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr ""
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr ""
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1592,6 +1584,14 @@ msgstr ""
 msgid "RSS Feed %s was empty"
 msgstr ""
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr ""
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr ""
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr ""

po/main/cs.po

@@ -1649,14 +1649,6 @@ msgstr ""
 msgid "Received a DBus exception %s"
 msgstr ""
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Prázdný RSS záznam nalezen (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Nekompatibilní kanál"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1683,6 +1675,14 @@ msgstr ""
 msgid "RSS Feed %s was empty"
 msgstr "RSS kanál %s byl prázdný"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Nekompatibilní kanál"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Prázdný RSS záznam nalezen (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Zobrazit rozhraní"

po/main/da.po

@@ -1723,14 +1723,6 @@ msgstr "Fejl ved lukning af system"
 msgid "Received a DBus exception %s"
 msgstr "Modtog en DBus-undtagelse %s"
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Tom RSS post blev fundet (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Inkompatibel feed"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1757,6 +1749,14 @@ msgstr "Server %s bruger et upålideligt HTTPS-certifikat"
 msgid "RSS Feed %s was empty"
 msgstr "RSS Feed %s er tom"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Inkompatibel feed"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Tom RSS post blev fundet (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Vis grænseflade"

po/main/de.po

@@ -1779,14 +1779,6 @@ msgstr "Fehler beim Herunterfahren des Systems"
 msgid "Received a DBus exception %s"
 msgstr "DBus-Ausnahmefehler empfangen %s "
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Leerer RSS-Feed gefunden: %s"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Inkompatibeler RSS-Feed"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1813,6 +1805,14 @@ msgstr "Der Server %s nutzt ein nicht vertrauenswürdiges HTTPS-Zertifikat"
 msgid "RSS Feed %s was empty"
 msgstr "RSS-Feed %s war leer"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Inkompatibeler RSS-Feed"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Leerer RSS-Feed gefunden: %s"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Interface anzeigen"

po/main/es.po

@@ -1767,14 +1767,6 @@ msgstr "Error al apagarel sistema"
 msgid "Received a DBus exception %s"
 msgstr "Se ha recibido una excepción DBus %s"
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Entrada RSS vacía (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Canal Incorrecto"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1803,6 +1795,14 @@ msgstr "El servidor %s utiliza un certificado HTTPS no fiable"
 msgid "RSS Feed %s was empty"
 msgstr "El canal RSS %s estaba vacío"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Canal Incorrecto"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Entrada RSS vacía (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Mostrar interfaz"

po/main/fi.po

@@ -1676,14 +1676,6 @@ msgstr "Virhe sammutettaessa järjestelmää"
 msgid "Received a DBus exception %s"
 msgstr ""
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Tyhjä RSS kohde löytyi (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Puutteellinen syöte"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1710,6 +1702,14 @@ msgstr "Palvelin %s käyttää epäluotettavaa HTTPS sertifikaattia"
 msgid "RSS Feed %s was empty"
 msgstr "RSS syöte %s oli tyhjä"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Puutteellinen syöte"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Tyhjä RSS kohde löytyi (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Näytä käyttöliittymä"

po/main/fr.po

@@ -1765,14 +1765,6 @@ msgstr "Erreur lors de l'arrêt du système"
 msgid "Received a DBus exception %s"
 msgstr "Exception DBus reçue %s"
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Entrée vide de flux RSS trouvée (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Flux incompatible"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1800,6 +1792,14 @@ msgstr "Le serveur %s utilise un certificat de sécurité HTTPS non authentifié
 msgid "RSS Feed %s was empty"
 msgstr "Le flux RSS %s était vide"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Flux incompatible"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Entrée vide de flux RSS trouvée (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Afficher l’interface"

po/main/he.po

@@ -1695,14 +1695,6 @@ msgstr "שגיאה בזמן כיבוי מערכת"
 msgid "Received a DBus exception %s"
 msgstr "חריגת DBus התקבלה %s"
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "כניסת RSS ריקה נמצאה (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "הזנה בלתי תואמת"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1729,6 +1721,14 @@ msgstr "השרת %s משתמש בתעודת HTTPS בלתי מהימנה"
 msgid "RSS Feed %s was empty"
 msgstr "הזנת RSS %s הייתה ריקה"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "הזנה בלתי תואמת"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "כניסת RSS ריקה נמצאה (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "הראה ממשק"

po/main/it.po

@@ -1746,14 +1746,6 @@ msgstr "Errore durante lo spegnimento del sistema"
 msgid "Received a DBus exception %s"
 msgstr "Ricevuta un'eccezione DBus %s"
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Trovata voce RSS vuota (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Feed incompatibile"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1780,6 +1772,14 @@ msgstr "Il server %s utilizza un certificato HTTPS non attendibile"
 msgid "RSS Feed %s was empty"
 msgstr "Il feed RSS %s era vuoto"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Feed incompatibile"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Trovata voce RSS vuota (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Mostra interfaccia"

po/main/nb.po

@@ -1674,14 +1674,6 @@ msgstr "Feil under avslutting av systemet"
 msgid "Received a DBus exception %s"
 msgstr ""
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Tom RSS post funnet (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Ukompatibel nyhetsstrøm"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1708,6 +1700,14 @@ msgstr "Server %s bruker et usikkert HTTP sertifikat"
 msgid "RSS Feed %s was empty"
 msgstr "RSS-kilde %s var tom"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Ukompatibel nyhetsstrøm"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Tom RSS post funnet (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Vis grensesnitt"

po/main/nl.po

@@ -1749,14 +1749,6 @@ msgstr "Fout bij het afsluiten van het systeem"
 msgid "Received a DBus exception %s"
 msgstr "DBus foutmelding %s "
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Lege RSS-feed gevonden (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Ongeschikte RSS-feed"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1783,6 +1775,14 @@ msgstr "Server %s gebruikt een onbetrouwbaar HTTPS-certificaat"
 msgid "RSS Feed %s was empty"
 msgstr "RSS-feed %s is leeg"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Ongeschikte RSS-feed"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Lege RSS-feed gevonden (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Toon webinterface"

po/main/pl.po

@@ -1683,14 +1683,6 @@ msgstr "Wyłączenie systemu nie powiodło się"
 msgid "Received a DBus exception %s"
 msgstr ""
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Znaleziono pusty wpis RSS (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Niekompatybilny kanał"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1717,6 +1709,14 @@ msgstr "Serwer %s używa niezaufanego certyfikatu HTTPS"
 msgid "RSS Feed %s was empty"
 msgstr "Kanał RSS %s był pusty"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Niekompatybilny kanał"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Znaleziono pusty wpis RSS (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Pokaż interfejs"

po/main/pt_BR.po

@@ -1693,14 +1693,6 @@ msgstr "Erro ao desligar o sistema"
 msgid "Received a DBus exception %s"
 msgstr ""
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Entrada RSS vazia encontrada (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Feed incompatível"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1728,6 +1720,14 @@ msgstr "Servidor %s usa um certificado HTTPS não confiável"
 msgid "RSS Feed %s was empty"
 msgstr "O feed RSS %s estava vazio"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Feed incompatível"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Entrada RSS vazia encontrada (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Exibir interface"

po/main/ro.po

@@ -1712,14 +1712,6 @@ msgstr "Eroare la oprirea sistemului"
 msgid "Received a DBus exception %s"
 msgstr ""
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Valoare RSS gasită a fost goală (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Fulx RSS incompatibil"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1746,6 +1738,14 @@ msgstr "Serverul %s utilizează un certificat HTTPS nesigur"
 msgid "RSS Feed %s was empty"
 msgstr "Fluxul RSS %s a fost gol"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Fulx RSS incompatibil"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Valoare RSS gasită a fost goală (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Arată interfața"

po/main/ru.po

@@ -1676,14 +1676,6 @@ msgstr "Не удалось завершить работу системы"
 msgid "Received a DBus exception %s"
 msgstr ""
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Обнаружена пустая запись RSS (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Несовместимая лента"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1710,6 +1702,14 @@ msgstr ""
 msgid "RSS Feed %s was empty"
 msgstr "RSS-лента %s была пустой"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Несовместимая лента"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Обнаружена пустая запись RSS (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Показать интерфейс"

po/main/sr.po

@@ -1669,14 +1669,6 @@ msgstr "Greška pri gašenju sistema"
 msgid "Received a DBus exception %s"
 msgstr ""
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Nađen prazan RSS unos (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Некомпатибилан Фид"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1703,6 +1695,14 @@ msgstr "Server %s koristi nepouzdan HTTPS sertifikat"
 msgid "RSS Feed %s was empty"
 msgstr "RSS фид %s је празан"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Некомпатибилан Фид"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Nađen prazan RSS unos (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Pokaži interfejs"

po/main/sv.po

@@ -1675,14 +1675,6 @@ msgstr "Fel uppstod då systemet skulle stängas"
 msgid "Received a DBus exception %s"
 msgstr ""
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Tom RSS post hittades (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Inkompatibel feed"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1709,6 +1701,14 @@ msgstr "Server %s använder ett otillförlitlig HTTPS-certifikat"
 msgid "RSS Feed %s was empty"
 msgstr "RSS-flödet %s var tomt"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Inkompatibel feed"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Tom RSS post hittades (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Visa gränssnitt"

po/main/tr.po

@@ -1738,14 +1738,6 @@ msgstr "Sistemin kapatılması esnasında hata"
 msgid "Received a DBus exception %s"
 msgstr "Bir DBUS istisnası alındı %s"
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "Boş RSS girdisi bulundu (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "Uyumsuz besleme"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1772,6 +1764,14 @@ msgstr "%s sunucusu güvenilmez bir HTTPS sertifikası kullanıyor"
 msgid "RSS Feed %s was empty"
 msgstr "%s RSS Beselemesi boştu"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "Uyumsuz besleme"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "Boş RSS girdisi bulundu (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "Arayüzü göster"

po/main/zh_CN.po

@@ -1665,14 +1665,6 @@ msgstr "关闭系统时出错"
 msgid "Received a DBus exception %s"
 msgstr "收到 DBus 异常 %s"
 
-#: sabnzbd/rss.py
-msgid "Empty RSS entry found (%s)"
-msgstr "发现空的 RSS 条目 (%s)"
-
-#: sabnzbd/rss.py
-msgid "Incompatible feed"
-msgstr "feed 不兼容"
-
 #. Error message
 #: sabnzbd/rss.py
 msgid "Incorrect RSS feed description \"%s\""
@@ -1699,6 +1691,14 @@ msgstr "服务器 %s 使用的 HTTPS 证书不受信任"
 msgid "RSS Feed %s was empty"
 msgstr "RSS Feed %s 为空"
 
+#: sabnzbd/rss.py
+msgid "Incompatible feed"
+msgstr "feed 不兼容"
+
+#: sabnzbd/rss.py
+msgid "Empty RSS entry found (%s)"
+msgstr "发现空的 RSS 条目 (%s)"
+
 #: sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
 msgid "Show interface"
 msgstr "显示界面"

sabnzbd/interface.py

@@ -1269,7 +1269,7 @@ class ConfigRss:
                     active_feed,
                     download=self.__refresh_download,
                     force=self.__refresh_force,
-                    ignore_first=self.__refresh_ignore,
+                    ignoreFirst=self.__refresh_ignore,
                     readout=readout,
                 )
             else:

sabnzbd/newswrapper.py

@@ -60,7 +60,6 @@ class NewsWrapper:
         "blocking",
         "timeout",
         "decoder",
-        "send_buffer",
         "nntp",
         "connected",
         "user_sent",
@@ -86,7 +85,6 @@ class NewsWrapper:
         self.timeout: Optional[float] = None
 
         self.decoder: Optional[sabctools.Decoder] = None
-        self.send_buffer = b""
 
         self.nntp: Optional[NNTP] = None
 
@@ -338,13 +336,6 @@ class NewsWrapper:
         server = self.server
 
         try:
-            # First, try to flush any remaining data
-            if self.send_buffer:
-                sent = self.nntp.sock.send(self.send_buffer)
-                self.send_buffer = self.send_buffer[sent:]
-                if self.send_buffer:
-                    # Still unsent data, wait for next EVENT_WRITE
-                    return
 
             if self.connected:
                 if (
@@ -365,7 +356,7 @@ class NewsWrapper:
                     self.next_request = None
 
             # If no pending buffer, try to send new command
-            if not self.send_buffer and self.next_request:
+            if self.next_request:
                 if self.concurrent_requests.acquire(blocking=False):
                     command, article = self.next_request
                     self.next_request = None
@@ -375,25 +366,24 @@ class NewsWrapper:
                             self.discard(article, count_article_try=False, retry_article=True)
                             self.concurrent_requests.release()
                             return
-                    self._response_queue.append(article)
+
                     if sabnzbd.LOG_ALL:
                         logging.debug("Thread %s@%s: %s", self.thrdnum, server.host, command)
                     try:
-                        sent = self.nntp.sock.send(command)
-                        if sent < len(command):
-                            # Partial send, store remainder
-                            self.send_buffer = command[sent:]
+                        self.nntp.sock.sendall(command)
+                        self._response_queue.append(article)
                     except (BlockingIOError, ssl.SSLWantWriteError):
-                        # Can't send now, store full command
-                        self.send_buffer = command
+                        # Couldn't send now, try again later
+                        self.concurrent_requests.release()
+                        self.next_request = (command, article)
+                        return
                 else:
                     # Concurrency limit reached
                     sabnzbd.Downloader.modify_socket(self, EVENT_READ)
             else:
                 # Is it safe to shut down this socket?
                 if (
-                    not self.send_buffer
-                    and not self.next_request
+                    not self.next_request
                     and not self._response_queue
                     and (not server.active or server.restart or not self.timeout or time.time() > self.timeout)
                 ):

tests/test_rss.py

@@ -29,7 +29,7 @@ from pytest_httpserver import HTTPServer
 import sabnzbd.rss as rss
 import sabnzbd.config
 from sabnzbd.constants import DEFAULT_PRIORITY, LOW_PRIORITY, HIGH_PRIORITY, FORCE_PRIORITY
-from sabnzbd.rss import FeedEvaluation, FeedConfig
+from sabnzbd.rss import FeedMatch, FeedConfig
 from tests.testhelper import httpserver_handler_data_dir
 
 
@@ -203,7 +203,7 @@ class TestRSS:
                 1000,
                 0,
                 0,
-                FeedEvaluation(matched=True, rule_index=0, season=0, episode=0),
+                FeedMatch(matched=True, rule_index=0, season=0, episode=0),
             ),
             (
                 (None, None, None, None),
@@ -213,7 +213,7 @@ class TestRSS:
                 1000,
                 0,
                 0,
-                FeedEvaluation(matched=True, rule_index=1, season=0, episode=0),
+                FeedMatch(matched=True, rule_index=1, season=0, episode=0),
             ),
             (
                 (None, None, None, None),
@@ -223,7 +223,7 @@ class TestRSS:
                 1000,
                 0,
                 0,
-                FeedEvaluation(matched=True, rule_index=1, season=5, episode=2),
+                FeedMatch(matched=True, rule_index=1, season=5, episode=2),
             ),
             (
                 (None, None, None, None),
@@ -233,7 +233,7 @@ class TestRSS:
                 1000,
                 0,
                 0,
-                FeedEvaluation(matched=False, rule_index=0, season=1, episode=2),
+                FeedMatch(matched=False, rule_index=0, season=1, episode=2),
             ),
             (
                 (None, None, None, LOW_PRIORITY),
@@ -243,7 +243,7 @@ class TestRSS:
                 1000,
                 0,
                 0,
-                FeedEvaluation(matched=True, rule_index=0, season=0, episode=0, priority=LOW_PRIORITY),
+                FeedMatch(matched=True, rule_index=0, season=0, episode=0, priority=LOW_PRIORITY),
             ),
             (
                 (None, None, None, LOW_PRIORITY),
@@ -253,7 +253,7 @@ class TestRSS:
                 1000,
                 0,
                 0,
-                FeedEvaluation(matched=True, rule_index=0, season=0, episode=0, priority=HIGH_PRIORITY),
+                FeedMatch(matched=True, rule_index=0, season=0, episode=0, priority=HIGH_PRIORITY),
             ),
             (
                 (None, 1, None, None),
@@ -263,7 +263,7 @@ class TestRSS:
                 1000,
                 0,
                 0,
-                FeedEvaluation(matched=True, rule_index=0, season=0, episode=0, pp=1),
+                FeedMatch(matched=True, rule_index=0, season=0, episode=0, pp=1),
             ),
             (
                 (None, 1, None, None),
@@ -273,7 +273,7 @@ class TestRSS:
                 1000,
                 0,
                 0,
-                FeedEvaluation(matched=True, rule_index=0, season=0, episode=0, pp=3),
+                FeedMatch(matched=True, rule_index=0, season=0, episode=0, pp=3),
             ),
             (  # category overrides
                 ("tv", 1, DEFAULT_PRIORITY, ""),
@@ -283,7 +283,7 @@ class TestRSS:
                 1000,
                 0,
                 0,
-                FeedEvaluation(
+                FeedMatch(
                     matched=True,
                     rule_index=0,
                     season=0,
@@ -302,7 +302,7 @@ class TestRSS:
                 1000,
                 0,
                 0,
-                FeedEvaluation(
+                FeedMatch(
                     matched=True,
                     rule_index=0,
                     season=0,
@@ -325,7 +325,7 @@ class TestRSS:
         size: int,
         season: int,
         episode: int,
-        expected_match: FeedEvaluation,
+        expected_match: FeedMatch,
     ):
         default_category, default_pp, default_script, default_priority = defaults
         feed_name = "Evaluator"