bin/xenu-nntp-server

@@ -1,5 +1,6 @@
 #! /usr/bin/env python3
 
+import os
 import argparse
 
 from xenu_nntp.config import Config

lib/xenu_nntp/session.py

@@ -16,7 +16,7 @@ from xenu_nntp.response  import Response, ResponseCode
 from xenu_nntp.newsgroup import Newsgroup
 from xenu_nntp.user      import User, UserPermission
 from xenu_nntp.message   import (
-    Message, MessageRange, MessagePart
+    Message, MessageRange, MessagePart, each_line
 )
 
 class SessionMode(enum.Enum):
@@ -339,7 +339,7 @@ class Session(Connection):
 
         for newsgroup in self.each_newsgroup():
             self.print("%s %d %s" % (
-                newsgroup.name,
+                name,
                 newsgroup.created_on.timestamp(),
                 newsgroup.created_by
             ))
@@ -439,8 +439,12 @@ class Session(Connection):
         return datetime.datetime(yyyy, mm, dd, hh, MM, ss)
 
     def _cmd_newnews(self, wildmat, datestr, timestr, *args):
+        gmt = False
+
         if len(args) == 1:
-            if args[0] != "GMT":
+            if args[0] == "GMT":
+                gmt = True
+            else:
                 return self.send_response(ResponseCode.NNTP_SYNTAX_ERROR, "Only optional 'GMT' allowed")
         elif len(args) > 1:
             return self.send_response(ResponseCode.NNTP_SYNTAX_ERROR, "Too many arguments")
@@ -479,8 +483,12 @@ class Session(Connection):
         return self.end()
 
     def _cmd_newgroups(self, datestr, timestr, *args):
+        gmt = False
+
         if len(args) == 1:
-            if args[0] != "GMT":
+            if args[0] == "GMT":
+                gmt = True
+            else:
                 return self.respond(ResponseCode.NNTP_SYNTAX_ERROR, "Only optional 'GMT' allowed")
         elif len(args) > 1:
             return self.respond(ResponseCode.NNTP_SYNTAX_ERROR, "Too many arguments")
@@ -715,7 +723,7 @@ class Session(Connection):
                 ) values (%s, %s)
             """
 
-            self.db.execute(sql, (newsgroup.id, message.id))
+            cr = self.db.execute(sql, (newsgroup.id, message.id))
 
         self.db.commit()