genocide 231__tar.gz → 232__tar.gz

{genocide-231 → genocide-232}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: genocide
-Version: 231
-Summary: Since 4 march 2019
+Version: 232
+Summary: Since 4 march 2019.
 Author-email: Bart Thate <bthate@dds.nl>
 License-Expression: Unlicense
 Project-URL: home, https://pypi.org/project/genocide

{genocide-231 → genocide-232}/genocide/modules/pth.py

@@ -12,5 +12,5 @@ d = os.path.dirname
 
 def pth(event):
     path = d(d(__file__))
-    path = os.path.join(path, "nucleus", "index.html")
+    path = os.path.join(path, "network", "index.html")
     event.reply(f"file://{path}")

{genocide-231 → genocide-232}/genocide/modules/rss.py

@@ -32,8 +32,13 @@ from genocide.threads import Repeater, Thread
 from genocide.utility import Time, Utils
 
 
+class Config(Configuration):
+
+    polltime = 300
+
+
 def init():
-    RunnerPool.init(1, Runner)
+    Runners.init(1, Runner)
     Run.fetcher.start()
     logging.warning("%s feeds", Locate.count("rss"))
 
@@ -42,9 +47,39 @@ def shutdown():
     Run.fetcher.stop()
 
 
-class Config(Configuration):
+class Feed(Data):
 
-    polltime = 300
+    pass
+
+
+class Modified(Data):
+
+    pass
+
+
+class Urls(Data):
+
+    pass
+
+
+class Rss(Data):
+
+    def __init__(self):
+        super().__init__()
+        self.display_list = "title,link,author"
+        self.insertid = None
+        self.name = ""
+        self.rss = ""
+
+
+class State:
+
+    configfn = ""
+    modified = Modified()
+    modifiedfn = ""
+    seenfn = ""
+    seen = Urls()
+    skipped = []
 
 
 class Fetcher:
@@ -60,7 +95,7 @@ class Fetcher:
         for fnm, feed in Locate.find(Methods.fqn(Rss)):
             if feed.skip:
                 continue
-            RunnerPool.put((fnm, feed, silent))
+            Runners.put((fnm, feed, silent))
             nrs += 1
         return nrs
 
@@ -73,7 +108,8 @@ class Fetcher:
 
     def stop(self):
         logging.debug("stopped fetcher")
-        Disk.write(State.modified, State.modifiedfn)
+        if State.modified:
+            Disk.write(State.modified, State.modifiedfn)
         self.stopped.set()
 
 
@@ -157,7 +193,7 @@ class Runner:
         self.stopped.set()
 
 
-class RunnerPool:
+class Runners:
 
     runners = []
     lock = threading.RLock()
@@ -166,26 +202,26 @@ class RunnerPool:
 
     @staticmethod
     def add(client):
-        RunnerPool.runners.append(client)
+        Runners.runners.append(client)
 
     @staticmethod
     def init(nrcpu, cls):
-        RunnerPool.nrcpu = nrcpu
-        for _x in range(RunnerPool.nrcpu):
+        Runners.nrcpu = nrcpu
+        for _x in range(Runners.nrcpu):
             clt = cls()
             clt.start()
-            RunnerPool.add(clt)
+            Runners.add(clt)
 
     @staticmethod
     def put(*args):
-        if not RunnerPool.runners:
-            RunnerPool.init(RunnerPool.nrcpu, Runner)
-        with RunnerPool.lock:
-            if RunnerPool.nrlast >= RunnerPool.nrcpu-1:
-                RunnerPool.nrlast = 0
-            clt = RunnerPool.runners[RunnerPool.nrlast]
+        if not Runners.runners:
+            Runners.init(Runners.nrcpu, Runner)
+        with Runners.lock:
+            if Runners.nrlast >= Runners.nrcpu-1:
+                Runners.nrlast = 0
+            clt = Runners.runners[Runners.nrlast]
             clt.put(*args)
-            RunnerPool.nrlast += 1
+            Runners.nrlast += 1
 
 
 class Parser:
@@ -420,31 +456,6 @@ class Helpers:
         return "Mozilla/5.0 (X11; Linux x86_64) " + txt
 
 
-class Feed(Data):
-
-    pass
-
-
-class Modified:
-
-    pass
-
-
-class Rss(Data):
-
-    def __init__(self):
-        super().__init__()
-        self.display_list = "title,link,author"
-        self.insertid = None
-        self.name = ""
-        self.rss = ""
-
-
-class Urls:
-
-    pass
-
-
 class Run:
 
     fetcher = Fetcher()
@@ -452,16 +463,6 @@ class Run:
     importlock = _thread.allocate_lock()
 
 
-class State:
-
-    configfn = ""
-    modified = Modified()
-    modifiedfn = ""
-    seenfn = ""
-    seen = Urls()
-    skipped = []
-
-
 def atr(event):
     if not event.rest:
         event.reply("atr <stringinurl>")
@@ -647,9 +648,6 @@ def rss(event):
     event.reply("ok")
 
 
-rss.flood = True
-
-
 def syn(event):
     if Main.debug:
         return

{genocide-231 → genocide-232}/genocide/modules/web.py

@@ -21,7 +21,7 @@ from genocide.utility import Utils
 
 
 def init():
-    Config.path = os.path.join(Utils.where(Object), "nucleus")
+    Config.path = os.path.join(Utils.where(Object), "network")
     if not os.path.exists(os.path.join(Config.path, 'index.html')):
         logging.warning("no index.html")
         return

{genocide-231 → genocide-232}/genocide/modules/wsd.py

@@ -60,7 +60,8 @@ def wsd(event):
         state.seen = []
         txt = "* reset"
     state.dump()
-    Broker.announce(txt.strip()[2:])
+    for bot in Broker.objs("announce"):
+        bot.announce(txt.strip()[2:])
 
 
 TXT = """| wijsheid, wijs !

{genocide-231 → genocide-232}/genocide/persist.py

@@ -47,6 +47,8 @@ class Disk:
     @staticmethod
     def cdir(path):
         "create directory."
+        if os.path.exists(path):
+            return
         pth = pathlib.Path(path)
         if not os.path.exists(pth.parent):
             pth.parent.mkdir(parents=True, exist_ok=True)
@@ -99,7 +101,7 @@ class Locate:
         nrs = 0
         for pth in Locate.fns(Workdir.long(kind)):
             obj = Cache.get(pth)
-            if not obj:
+            if obj is None:
                 obj = Data()
                 Disk.read(obj, pth)
                 Cache.add(pth, obj)
@@ -167,7 +169,7 @@ class Workdir:
     def setwd(path):
         "enable writing to disk."
         if not path:
-            return
+            Disk.cdir(path)
         Workdir.wdr = path
         Workdir.skel()
 

{genocide-231 → genocide-232}/genocide/runtime.py

@@ -26,10 +26,10 @@ from genocide.utility import SYSTEMD
 from genocide import modules as MODS
 
 
-Main.default = "mdl,irc,rss,thr,wsd"
-Main.ignore = "man,rst,web,udp"
+Main.default = "irc,mdl,rss,thr,wsd"
+Main.ignore = "mbx,rst,udp,web"
 Main.level = "info"
-Main.version = 455
+Main.version = 232
 Main.wdr = os.path.expanduser(f"~/.{Main.name}")
 
 
@@ -64,6 +64,8 @@ class CSL(Line):
 
 class Runtime:
 
+    inits = []
+
     @staticmethod
     def banner():
         "hello."
@@ -172,6 +174,7 @@ class Runtime:
         for name, mod in Mods.iter(cfg.mods or defs, cfg.ignore):
             if "init" in dir(mod):
                 thrs.append((name, Thread.launch(mod.init)))
+                Runtime.inits.append(name)
         if cfg.wait:
             for name, thr in thrs:
                 thr.join()
@@ -207,7 +210,8 @@ class Runtime:
     @staticmethod
     def shutdown():
         "call shutdown on modules."
-        for mod in Dict.values(Mods.modules):
+        for name in Runtime.inits:
+            mod = Mods.get(name)
             if "shutdown" in dir(mod):
                 try:
                     mod.shutdown()

{genocide-231 → genocide-232}/genocide.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: genocide
-Version: 231
-Summary: Since 4 march 2019
+Version: 232
+Summary: Since 4 march 2019.
 Author-email: Bart Thate <bthate@dds.nl>
 License-Expression: Unlicense
 Project-URL: home, https://pypi.org/project/genocide

genocide-232/genocide.egg-info/SOURCES.txt

@@ -0,0 +1,95 @@
+README.rst
+pyproject.toml
+genocide/brokers.py
+genocide/command.py
+genocide/defines.py
+genocide/encoder.py
+genocide/handler.py
+genocide/loggers.py
+genocide/objects.py
+genocide/package.py
+genocide/persist.py
+genocide/runtime.py
+genocide/threads.py
+genocide/utility.py
+genocide.egg-info/PKG-INFO
+genocide.egg-info/SOURCES.txt
+genocide.egg-info/dependency_links.txt
+genocide.egg-info/entry_points.txt
+genocide.egg-info/top_level.txt
+genocide/modules/__init__.py
+genocide/modules/atr.py
+genocide/modules/flt.py
+genocide/modules/fnd.py
+genocide/modules/irc.py
+genocide/modules/log.py
+genocide/modules/man.py
+genocide/modules/mbx.py
+genocide/modules/mdl.py
+genocide/modules/pth.py
+genocide/modules/req.py
+genocide/modules/rss.py
+genocide/modules/rst.py
+genocide/modules/sil.py
+genocide/modules/slg.py
+genocide/modules/tdo.py
+genocide/modules/thr.py
+genocide/modules/tmr.py
+genocide/modules/udp.py
+genocide/modules/upt.py
+genocide/modules/wdr.py
+genocide/modules/web.py
+genocide/modules/wsd.py
+genocide/network/about.html
+genocide/network/evidence.html
+genocide/network/genindex-all.html
+genocide/network/genindex.html
+genocide/network/guilty.html
+genocide/network/index.html
+genocide/network/manual.html
+genocide/network/objects.inv
+genocide/network/pubchem.html
+genocide/network/reconsider.html
+genocide/network/request.html
+genocide/network/robots.txt
+genocide/network/search.html
+genocide/network/searchindex.js
+genocide/network/writings.html
+genocide/network/_images/ECHAabilify.png
+genocide/network/_images/ECHAclozapine.png
+genocide/network/_images/ECHAhaldol.png
+genocide/network/_images/ECHAzyprexa.png
+genocide/network/_images/OTP111.png
+genocide/network/_images/OTP222.png
+genocide/network/_images/abilifypubchem.png
+genocide/network/_images/ack3.png
+genocide/network/_images/bevestigd.jpg
+genocide/network/_images/clozapinepubchem.png
+genocide/network/_images/genocide.png
+genocide/network/_images/haldolpubchem.png
+genocide/network/_images/informed.jpg
+genocide/network/_images/kamer2.png
+genocide/network/_images/skull3.png
+genocide/network/_images/zyprexapubchem.png
+genocide/network/_static/alabaster.css
+genocide/network/_static/basic.css
+genocide/network/_static/custom.css
+genocide/network/_static/doctools.js
+genocide/network/_static/documentation_options.js
+genocide/network/_static/file.png
+genocide/network/_static/genocide.css
+genocide/network/_static/language_data.js
+genocide/network/_static/minus.png
+genocide/network/_static/opensearch.xml
+genocide/network/_static/plus.png
+genocide/network/_static/pygments.css
+genocide/network/_static/searchtools.js
+genocide/network/_static/sitemap.xml
+genocide/network/_static/skull3.png
+genocide/network/_static/sphinx_highlight.js
+genocide/network/pdf/EM_Ack_OTP-CR-117_19.pdf
+genocide/network/pdf/EM_T04_OTP-CR-117_19.pdf
+genocide/network/pdf/EM_T07_OTP-CR-117_19_001.pdf
+genocide/network/pdf/Kamer.pdf
+genocide/network/pdf/Rome-Statute.pdf
+genocide/network/pdf/bevestigd.pdf

{genocide-231 → genocide-232}/pyproject.toml

@@ -8,8 +8,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "genocide"
-description = "Since 4 march 2019"
-version = "231"
+description = "Since 4 march 2019."
+version = "232"
 authors = [
     {name = "Bart Thate", email = "bthate@dds.nl" },
 ]
@@ -37,16 +37,16 @@ classifiers = [
 packages = [
     'genocide',
     'genocide.modules',
-    'genocide.nucleus',
-    'genocide.nucleus.pdf',
-    'genocide.nucleus._static',
-    'genocide.nucleus._images'
+    'genocide.network',
+    'genocide.network.pdf',
+    'genocide.network._static',
+    'genocide.network._images'
 ]
 include-package-data = true
 
 
 [tool.setuptools.package-data]
-"genocide.nucleus"         = ["*"]
-"genocide.nucleus.pdf"     = ["*"]
-"genocide.nucleus._images" = ["*"]
-"genocide.nucleus._static" = ["*"]
+"genocide.network"         = ["*"]
+"genocide.network.pdf"     = ["*"]
+"genocide.network._images" = ["*"]
+"genocide.network._static" = ["*"]

genocide-231/genocide.egg-info/SOURCES.txt

@@ -1,95 +0,0 @@
-README.rst
-pyproject.toml
-genocide/brokers.py
-genocide/command.py
-genocide/defines.py
-genocide/encoder.py
-genocide/handler.py
-genocide/loggers.py
-genocide/objects.py
-genocide/package.py
-genocide/persist.py
-genocide/runtime.py
-genocide/threads.py
-genocide/utility.py
-genocide.egg-info/PKG-INFO
-genocide.egg-info/SOURCES.txt
-genocide.egg-info/dependency_links.txt
-genocide.egg-info/entry_points.txt
-genocide.egg-info/top_level.txt
-genocide/modules/__init__.py
-genocide/modules/atr.py
-genocide/modules/flt.py
-genocide/modules/fnd.py
-genocide/modules/irc.py
-genocide/modules/log.py
-genocide/modules/man.py
-genocide/modules/mbx.py
-genocide/modules/mdl.py
-genocide/modules/pth.py
-genocide/modules/req.py
-genocide/modules/rss.py
-genocide/modules/rst.py
-genocide/modules/sil.py
-genocide/modules/slg.py
-genocide/modules/tdo.py
-genocide/modules/thr.py
-genocide/modules/tmr.py
-genocide/modules/udp.py
-genocide/modules/upt.py
-genocide/modules/wdr.py
-genocide/modules/web.py
-genocide/modules/wsd.py
-genocide/nucleus/about.html
-genocide/nucleus/evidence.html
-genocide/nucleus/genindex-all.html
-genocide/nucleus/genindex.html
-genocide/nucleus/guilty.html
-genocide/nucleus/index.html
-genocide/nucleus/manual.html
-genocide/nucleus/objects.inv
-genocide/nucleus/pubchem.html
-genocide/nucleus/reconsider.html
-genocide/nucleus/request.html
-genocide/nucleus/robots.txt
-genocide/nucleus/search.html
-genocide/nucleus/searchindex.js
-genocide/nucleus/writings.html
-genocide/nucleus/_images/ECHAabilify.png
-genocide/nucleus/_images/ECHAclozapine.png
-genocide/nucleus/_images/ECHAhaldol.png
-genocide/nucleus/_images/ECHAzyprexa.png
-genocide/nucleus/_images/OTP111.png
-genocide/nucleus/_images/OTP222.png
-genocide/nucleus/_images/abilifypubchem.png
-genocide/nucleus/_images/ack3.png
-genocide/nucleus/_images/bevestigd.jpg
-genocide/nucleus/_images/clozapinepubchem.png
-genocide/nucleus/_images/genocide.png
-genocide/nucleus/_images/haldolpubchem.png
-genocide/nucleus/_images/informed.jpg
-genocide/nucleus/_images/kamer2.png
-genocide/nucleus/_images/skull3.png
-genocide/nucleus/_images/zyprexapubchem.png
-genocide/nucleus/_static/alabaster.css
-genocide/nucleus/_static/basic.css
-genocide/nucleus/_static/custom.css
-genocide/nucleus/_static/doctools.js
-genocide/nucleus/_static/documentation_options.js
-genocide/nucleus/_static/file.png
-genocide/nucleus/_static/genocide.css
-genocide/nucleus/_static/language_data.js
-genocide/nucleus/_static/minus.png
-genocide/nucleus/_static/opensearch.xml
-genocide/nucleus/_static/plus.png
-genocide/nucleus/_static/pygments.css
-genocide/nucleus/_static/searchtools.js
-genocide/nucleus/_static/sitemap.xml
-genocide/nucleus/_static/skull3.png
-genocide/nucleus/_static/sphinx_highlight.js
-genocide/nucleus/pdf/EM_Ack_OTP-CR-117_19.pdf
-genocide/nucleus/pdf/EM_T04_OTP-CR-117_19.pdf
-genocide/nucleus/pdf/EM_T07_OTP-CR-117_19_001.pdf
-genocide/nucleus/pdf/Kamer.pdf
-genocide/nucleus/pdf/Rome-Statute.pdf
-genocide/nucleus/pdf/bevestigd.pdf