libbot 52__tar.gz → 53__tar.gz

{libbot-52 → libbot-53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libbot
-Version: 52
+Version: 53
 Summary: the python3 bot namespace
 Author-email: libbot <libbotx@gmail.com>
 License: Public Domain
@@ -160,7 +160,7 @@ here is a list of the most basic commands::
 SYSTEMD
 =======
 
-save the following it in /etc/systems/system/libbot.service and
+save the following it in /etc/systems/system/botd.service and
 replace "<user>" with the user running pipx::
 
  [Unit]
@@ -173,7 +173,7 @@ replace "<user>" with the user running pipx::
  User=<user>
  Group=<user>
  WorkingDirectory=/home/<user>/.bot
- ExecStart=/home/<user>/.local/pipx/venvs/libbot/bin/bot -d
+ ExecStart=/home/<user>/.local/pipx/venvs/libbot/bin/botd
  RemainAfterExit=yes
 
  [Install]
@@ -181,7 +181,7 @@ replace "<user>" with the user running pipx::
 
 then run this::
 
- sudo systemctl enable libbot --now
+ sudo systemctl enable botd --now
 
 
 FILES
@@ -191,6 +191,7 @@ FILES
 
  ~/.bot
  ~/.local/bin/bot
+ ~/.local/bin/botd
  ~/.local/pipx/venvs/libbot/
 
 

{libbot-52 → libbot-53}/README.rst

@@ -144,7 +144,7 @@ here is a list of the most basic commands::
 SYSTEMD
 =======
 
-save the following it in /etc/systems/system/libbot.service and
+save the following it in /etc/systems/system/botd.service and
 replace "<user>" with the user running pipx::
 
  [Unit]
@@ -157,7 +157,7 @@ replace "<user>" with the user running pipx::
  User=<user>
  Group=<user>
  WorkingDirectory=/home/<user>/.bot
- ExecStart=/home/<user>/.local/pipx/venvs/libbot/bin/bot -d
+ ExecStart=/home/<user>/.local/pipx/venvs/libbot/bin/botd
  RemainAfterExit=yes
 
  [Install]
@@ -165,7 +165,7 @@ replace "<user>" with the user running pipx::
 
 then run this::
 
- sudo systemctl enable libbot --now
+ sudo systemctl enable botd --now
 
 
 FILES
@@ -175,6 +175,7 @@ FILES
 
  ~/.bot
  ~/.local/bin/bot
+ ~/.local/bin/botd
  ~/.local/pipx/venvs/libbot/
 
 

{libbot-52 → libbot-53}/bin/bot

@@ -64,20 +64,18 @@ def main():
     if "v" in Cfg.opts:
         dte = time.ctime(time.time()).replace("  ", " ")
         print(f"{Cfg.name.upper()} started {Cfg.opts.upper()} started {dte}")
-    if not Cfg.mod:
-        Cfg.mod = ",".join((lsmod(modules.__path__[0])))
+    Cfg.mod = ",".join((lsmod(modules.__path__[0])))
     if 'c' in Cfg.opts:
-        scan(modules, Cfg.mod, "x" not in Cfg.opts)
+        scan(modules, Cfg.mod, True)
         csl = Console()
         csl.start()
         forever()
-        return
     scan(modules, Cfg.mod)
     cli = CLI()
     command(Cfg.otxt, cli)
+    Errors.show()
 
 
 if __name__ == "__main__":
     wrap(main)
-    Errors.show()
         

libbot-53/bin/botd

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+# This file is placed in the Public Domain.
+#
+# pylint: disable=C0115,C0116,C0209,C0413,W0201,R0903,W0212,W0105,W0613
+
+
+"daemon"
+
+
+import getpass
+import os
+import pwd
+import sys
+
+
+from bot import Default, Storage, modules, cdir, forever, lsmod, scan
+
+
+Cfg = Default()
+Cfg.mod = ",".join((lsmod(modules.__path__[0])))
+Cfg.name    = "bot"
+Storage.wd  = os.path.expanduser(f"~/.{Cfg.name}")
+Cfg.pidfile = os.path.join(Storage.wd, f"{Cfg.name}.pid")
+Cfg.user    = getpass.getuser()
+
+
+def daemon(pidfile, verbose=False):
+    pid = os.fork()
+    if pid != 0:
+        os._exit(0)
+    os.setsid()
+    pid2 = os.fork()
+    if pid2 != 0:
+        os._exit(0)
+    if not verbose:
+        with open('/dev/null', 'r', encoding="utf-8") as sis:
+            os.dup2(sis.fileno(), sys.stdin.fileno())
+        with open('/dev/null', 'a+', encoding="utf-8") as sos:
+            os.dup2(sos.fileno(), sys.stdout.fileno())
+        with open('/dev/null', 'a+', encoding="utf-8") as ses:
+            os.dup2(ses.fileno(), sys.stderr.fileno())
+    os.umask(0)
+    os.chdir("/")
+    if os.path.exists(pidfile):
+        os.unlink(pidfile)
+    cdir(os.path.dirname(pidfile))
+    with open(pidfile, "w", encoding="utf-8") as fds:
+        fds.write(str(os.getpid()))
+
+
+def privileges(username):
+    pwnam = pwd.getpwnam(username)
+    os.setgid(pwnam.pw_gid)
+    os.setuid(pwnam.pw_uid)
+
+
+def main():
+    if "v" in Cfg.opts:
+        dte = time.ctime(time.time()).replace("  ", " ")
+        print(f"{Cfg.name.upper()} started {dte} {Cfg.opts.upper()} {Cfg.mod.upper()}")
+        print(Cfg)
+    daemon(Cfg.pidfile, "v" in Cfg.opts)
+    privileges(Cfg.user)
+    scan(modules, Cfg.mod, True)
+    forever()
+
+
+main()

{libbot-52 → libbot-53}/bot/modules/irc.py

@@ -26,7 +26,7 @@ from bot.run    import Broker, Commands, Event, Reactor
 from bot.thread import launch
 
 
-NAME = sys.argv[0].rsplit(os.sep, maxsplit=1)[-1]
+NAME = "bot"
 
 
 Censor.words = ["PING", "PONG", "PRIVMSG"]

{libbot-52 → libbot-53}/libbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libbot
-Version: 52
+Version: 53
 Summary: the python3 bot namespace
 Author-email: libbot <libbotx@gmail.com>
 License: Public Domain
@@ -160,7 +160,7 @@ here is a list of the most basic commands::
 SYSTEMD
 =======
 
-save the following it in /etc/systems/system/libbot.service and
+save the following it in /etc/systems/system/botd.service and
 replace "<user>" with the user running pipx::
 
  [Unit]
@@ -173,7 +173,7 @@ replace "<user>" with the user running pipx::
  User=<user>
  Group=<user>
  WorkingDirectory=/home/<user>/.bot
- ExecStart=/home/<user>/.local/pipx/venvs/libbot/bin/bot -d
+ ExecStart=/home/<user>/.local/pipx/venvs/libbot/bin/botd
  RemainAfterExit=yes
 
  [Install]
@@ -181,7 +181,7 @@ replace "<user>" with the user running pipx::
 
 then run this::
 
- sudo systemctl enable libbot --now
+ sudo systemctl enable botd --now
 
 
 FILES
@@ -191,6 +191,7 @@ FILES
 
  ~/.bot
  ~/.local/bin/bot
+ ~/.local/bin/botd
  ~/.local/pipx/venvs/libbot/
 
 

{libbot-52 → libbot-53}/libbot.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ README.rst
 pyproject.toml
 setup.py
 bin/bot
+bin/botd
 bot/__init__.py
 bot/disk.py
 bot/error.py

{libbot-52 → libbot-53}/pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "libbot"
 description = "the python3 bot namespace"
-version = "52"
+version = "53"
 authors = [
     {name = "libbot",email = "libbotx@gmail.com"},
 ]
@@ -37,7 +37,8 @@ packages = [
 ]
 zip-safe=true
 script-files = [
-    "bin/bot",
+    'bin/bot',
+    'bin/botd'
 ]