From 33bff45270bd54673092b65f71fde3710a3a9f16 Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Fri, 29 Nov 2024 09:50:25 -0700
Subject: [PATCH] Change spoolnews to count articles that exist before going
 back to start a new fetch.

---
 Rocksolid_Light/rslight/scripts/spool-lib.php | 64 +++++++++++++++----
 1 file changed, 52 insertions(+), 12 deletions(-)

diff --git a/Rocksolid_Light/rslight/scripts/spool-lib.php b/Rocksolid_Light/rslight/scripts/spool-lib.php
index 48ed3e1..2abb9c8 100644
--- a/Rocksolid_Light/rslight/scripts/spool-lib.php
+++ b/Rocksolid_Light/rslight/scripts/spool-lib.php
@@ -11,7 +11,7 @@ function get_articles($ns, $group, $refill_start = false)
         exit();
     }
 
-    if($refill_start != false) {
+    if ($refill_start != false) {
         $maxfirstrequest = $refill_start;
         $maxarticles_per_run = $refill_start;
     }
@@ -45,7 +45,7 @@ function get_articles($ns, $group, $refill_start = false)
     if (isset($remote_groups_array[$group])) {
         $article = $remote_groups_array[$group];
     } else {
-        $article = 1;
+        $article = false;
     }
 
     if (isset($CONFIG['enable_nntp']) && $CONFIG['enable_nntp'] == true) {
@@ -59,24 +59,27 @@ function get_articles($ns, $group, $refill_start = false)
         file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " " . $remote_disp . " contains no articles for " . $group . " Skipping", FILE_APPEND);
         return false;
     }
-    $latest_remote_article = $detail[3];
-    if (! isset($article)) {
-        $article = $detail[2];
-    }
-    if ($article < $detail[3] - $maxfirstrequest) {
+
+    if (! isset($article) || $article == false || $article < 2) {
         $article = $detail[3] - $maxfirstrequest;
+        if ($article < $detail[2]) {
+            $article = $detail[2];
+        }
+        $refill_start = true;
     }
-    if ($article < $detail[2]) {
-        $article = $detail[2];
+
+    // Get only articles that exist on server
+    if ($refill_start != false) {
+        $article = get_first_article_number_from_remote($ns, $group, $maxfirstrequest);
+        file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " Starting " . $group . " at article number " . $article, FILE_APPEND);
     }
+
     if ($article > $detail[3]) {
         file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " " . $remote_disp . " for " . $group . " We are up to date", FILE_APPEND);
         // Just in case we have an error and $article is too large:
         $article = $detail[3] + 1;
     } else {
         // Get overview from server
-        $server_overview = array();
-        $re = false;
         if (($detail[3] - $article) > $maxarticles_per_run) {
             $getlast = $article + $maxarticles_per_run;
         } else {
@@ -112,6 +115,13 @@ function get_articles($ns, $group, $refill_start = false)
                 file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " DEBUG This should show server group:article number: " . $CONFIG['remote_server'] . " " . $group . ":" . $article, FILE_APPEND);
                 break;
             }
+            fputs($ns, "stat " . $article . "\r\n");
+            $response = line_read($ns);
+            if (strcmp(substr($response, 0, 3), "223") != 0) {
+                file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " No such article: " . $group . ":" . $article . " " . $overview_msgid[$article], FILE_APPEND);
+                $article++;
+                continue;
+            }
             // Create array for article, then send to insert_article_from_array()
             if (isset($current_article)) {
                 unset($current_article);
@@ -468,4 +478,34 @@ function get_articles($ns, $group, $refill_start = false)
     $remote_groups_array[$group] = $article;
     file_put_contents($remote_groups_array_file, serialize($remote_groups_array));
     return true;
-}
\ No newline at end of file
+}
+
+function get_first_article_number_from_remote($ns, $group, $maxfirstrequest)
+{
+    global $logfile, $config_name;
+    fputs($ns, "group " . $group . "\r\n");
+    $response = line_read($ns);
+    if (substr($response, 0, 3) != "211") {
+        file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " Cannot enter " . $group . " on " . $CONFIG['remote_server'] . ":" . $CONFIG['remote_port'], FILE_APPEND);
+        return false;
+    }
+    fputs($ns, "listgroup\r\n");
+    $response = line_read($ns);
+    if (substr($response, 0, 3) != "211") {
+        file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " Cannot listgroup " . $group . " on " . $CONFIG['remote_server'] . ":" . $CONFIG['remote_port'], FILE_APPEND);
+        return false;
+    }
+    $exists_array = array();
+    while ($line = line_read($ns)) {
+        if (trim($line) == '.') {
+            break;
+        }
+        $exists_array[] = trim($line);
+    }
+    $exists_array = array_reverse($exists_array);
+    if ($maxfirstrequest > count($exists_array)) {
+        return $exists_array[1];
+    } else {
+        return $exists_array[$maxfirstrequest];
+    }
+}