inc: more logic to remove code from Makefile. news/index.hmtl.j2: syntax.

6 files changed, 59 insertions, 17 deletions

diff --git a/inc/fileproc.py b/inc/fileproc.py
index 435078bc..bf6cc8df 100644
--- a/inc/fileproc.py
+++ b/inc/fileproc.py
@@ -1,4 +1,17 @@
 from pathlib import Path
+import os
+import shutil
+
+def copy_tree(source, destination):
+    destination.mkdir(parents=True, exist_ok=True)
+    for _ in os.listdir(source):
+        i = source / _
+        o = destination / _
+        if i.is_dir():
+            copy_tree(i, o)
+        else:
+            shutil.copy2(str(i), str(o))
+
 
 def copy_files(kind, conf, locale, inlist, ptarget):
     o = Path(ptarget)
diff --git a/inc/i18nfix.py b/inc/i18nfix.py
index 7f326ba6..69fe177d 100644
--- a/inc/i18nfix.py
+++ b/inc/i18nfix.py
@@ -6,7 +6,6 @@
 # are permitted in any medium without royalty provided the copyright
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
-
 """
 Extract translations from a Jinja2 template, stripping leading newlines.
 
@@ -38,4 +37,5 @@ def wrap_gettext(f):
     def wrapper(message):
         message = normalize(message)
         return f(message)
+
     return wrapper
diff --git a/inc/site.py b/inc/site.py
index 67e5afa8..9fd9ac87 100644
--- a/inc/site.py
+++ b/inc/site.py
@@ -6,29 +6,51 @@ import gettext
 import glob
 import codecs
 import jinja2
-import hashlib
-from pathlib import Path, PurePosixPath
+from pathlib import Path, PurePosixPath, PurePath
 from ruamel.yaml import YAML
-import inc.i18nfix
+import inc.i18nfix as i18nfix
 from inc.textproc import cut_news_text
-from inc.fileproc import copy_files
+from inc.fileproc import copy_files, copy_tree
 
 
 class gen_site:
+    def __init__(self, debug):
+        self.debug = debug
+
     def load_config(self, name="www.yml"):
         yaml = YAML(typ='safe')
         site_configfile = Path(name)
         return yaml.load(site_configfile)
 
+    def copy_trees(self, directory):
+        """ Take a directory name (string) and pass it to copy_tree() as Path object. """
+        i = Path(directory)
+        o = Path("rendered/" + directory)
+        copy_tree(i, o)
+
     def gen_abstract(self, conf, name, member, pages, length):
+        if self.debug:
+            print("generating abstracts...")
         for item in conf[name]:
             item[member] = cut_news_text(item[pages], length)
+        if self.debug:
+            print("cwd: " + str(Path.cwd()))
+        if self.debug > 1:
+            print(conf["newsposts"])
+        if self.debug:
+            print("[done] generating abstracts")
 
     def run(self, root, conf, env):
-        # os.chdir("..")
-        print(os.getcwd())
-        root = "../" + root
-        for in_file in glob.glob(root + "/*.j2"):
+        # root = "../" + root
+        if self.debug:
+            _ = Path(".")
+            q = list(_.glob("**/*.j2"))
+            print(q)
+        # for in_file in glob.glob(root + "/*.j2"):
+        for in_file in Path(".").glob(root + "/*.j2"):
+            in_file = str(in_file)
+            if self.debug:
+                print(in_file)
             name, ext = re.match(r"(.*)\.([^.]+)$",
                                  in_file.rstrip(".j2")).groups()
             tmpl = env.get_template(in_file)
@@ -74,8 +96,14 @@ class gen_site:
                 #    return "../" + x
                 return "../" + x
 
-            for l in glob.glob("locale/*/"):
-                locale = os.path.basename(l[:-1])
+            # for l in glob.glob("locale/*/"):
+            # https://bugs.python.org/issue22276
+            for l in list(x for x in Path(".").glob("locale/*/") if x.is_dir()):
+                l = str(PurePath(l).name)
+                if self.debug:
+                    print(l)
+                # locale = os.path.basename(l[:-1])
+                locale = l
 
                 tr = gettext.translation("messages",
                                          localedir="locale",
@@ -106,8 +134,6 @@ class gen_site:
                         root + '/', '').rstrip(".j2")
 
                 outdir = Path("rendered")
-                if outdir.exists() is False:
-                    sys.exit(1)
 
                 if root == "news":
                     langdir = outdir / locale / root
diff --git a/inc/sitemap.py b/inc/sitemap.py
index e050c77d..5ccf7447 100644
--- a/inc/sitemap.py
+++ b/inc/sitemap.py
@@ -1,6 +1,7 @@
 import os
 from pathlib import Path, PurePosixPath
 
+
 def sitemap_tree(path):
     tree = dict(name=PurePosixPath(path).name, children=[])
     try:
diff --git a/inc/sum.py b/inc/sum.py
index 9addf78f..fff7a814 100644
--- a/inc/sum.py
+++ b/inc/sum.py
@@ -31,5 +31,3 @@ def walksum(_):
         traceback.print_exc()
         return -2
     return sha256.hexdigest()
-
-
diff --git a/inc/textproc.py b/inc/textproc.py
index 228518b2..f3b97d3d 100644
--- a/inc/textproc.py
+++ b/inc/textproc.py
@@ -1,12 +1,15 @@
 import html.parser
 from bs4 import BeautifulSoup
 
+
 class extractText(html.parser.HTMLParser):
     def __init__(self):
         super(extractText, self).__init__()
         self.result = []
+
     def handle_data(self, data):
         self.result.append(data)
+
     def text_in(self):
         return ''.join(self.result)
 
@@ -27,8 +30,9 @@ def cut_text(filename, count):
             k.append(i)
         b = ''.join(str(e) for e in k)
         text = html2text(b.replace("\n", ""))
-        textreduced = (text[:count] + '...') if len(text) > count else (text + '..')
-        return(textreduced)
+        textreduced = (text[:count] + '...') if len(text) > count else (text +
+                                                                        '..')
+        return (textreduced)
 
 
 def cut_news_text(filename, count):