Merge create and generate in commands to address import issues

Author: yaph

logya/__init__.py

@@ -1,3 +1,3 @@
 __author__ = 'Ramiro Gómez'
 __email__ = 'code@ramiro.org'
-__version__ = '5.2.2'
+__version__ = '5.3.0'

logya/generate.py logya/commands.pylogya/generate.py renamed to logya/commands.py

@@ -1,11 +1,31 @@
 import shutil
-from shutil import copytree
+import sys
+from importlib import resources
 
 from logya.content import write_collection, write_page
 from logya.core import Logya
+from logya.util import paths
+
+
+def create(dir_site: str, name: str, site: str, **_kwargs) -> None:
+    """Create a new site in the specified directory."""
+
+    target = paths(dir_site=dir_site).root.joinpath(name)
+    if target.exists():
+        sys.exit(f'Error: "{target}" already exists. Please remove it or specify another location.')
+
+    source = resources.files(__name__).joinpath(f'sites/{site}')
+    if source.is_dir():
+        shutil.copytree(source, target)  # type: ignore
+    else:
+        sys.exit(f'The site "{site}" is not installed.')
+
+    print(f'Site created in "{target}".')
 
 
 def generate(dir_site: str, verbose: bool, keep: bool, **_kwargs):
+    """Generate a site in the public directory."""
+
     L = Logya(dir_site=dir_site, verbose=verbose)
     L.build()
 
@@ -16,7 +36,7 @@ def generate(dir_site: str, verbose: bool, keep: bool, **_kwargs):
     print(f'Generate site in directory: {L.paths.public.as_posix()}')
     if L.paths.static.exists():
         print('Copy static files.')
-        copytree(L.paths.static, L.paths.public, dirs_exist_ok=True)
+        shutil.copytree(L.paths.static, L.paths.public, dirs_exist_ok=True)
 
     print('Write pages.')
     for url, content in L.doc_index.items():

logya/create.py

@@ -2,8 +2,7 @@
 import argparse
 
 from logya import __version__
-from logya.create import create
-from logya.generate import generate
+from logya.commands import create, generate
 from logya.server import serve