From a50b56d7e40c827404be1f73471f2954ff8c8031 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Mon, 11 Apr 2022 19:57:04 +1000 Subject: [PATCH] oops got corrupted --- .envrc | 1 - basant/grab/kitaab.py | 10 +++++++--- basant/main.py | 18 ++++++++---------- basant/shared/config.py | 2 +- flake.nix | 42 +++++++++++++++++++++++++++++++++++++++++ package.nix | 0 setup.py | 1 + 7 files changed, 59 insertions(+), 15 deletions(-) delete mode 100644 .envrc create mode 100644 package.nix diff --git a/.envrc b/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/basant/grab/kitaab.py b/basant/grab/kitaab.py index 50c2cd5..ddf8ece 100644 --- a/basant/grab/kitaab.py +++ b/basant/grab/kitaab.py @@ -84,14 +84,18 @@ def deleteOldRaw(): shutil.rmtree(config.raw_folder) -if __name__ == '__main__': - # network = loadNetwork() - # network = censorNetwork(network) +def grabFiles(): deleteOldRaw() AllFiles = TagHelper.getAllFiles() FilteredFiles = filterFiles(AllFiles) copyFiles(FilteredFiles) print("Censoring files...") censorFiles() + + +if __name__ == '__main__': + # network = loadNetwork() + # network = censorNetwork(network) # print("Converting files...") # convertFiles() + grabFiles() diff --git a/basant/main.py b/basant/main.py index 837ed9c..0968fad 100644 --- a/basant/main.py +++ b/basant/main.py @@ -1,25 +1,23 @@ -import basant.grab.kitaab as grab -from basant.shared import TagHelper +#! /usr/bin/env python + +# import basant.grab.kitaab as grab import basant.build.kitaab as build def get_raw_files(): - all_files = TagHelper.getAllFiles() - filtered_files = grab.kitaab.filterFiles(all_files) - grab.kitaab.copyFiles(filtered_files) - print("Censoring files...") - grab.kitaab.censorFiles() + print('grabbing files') + # grab.kitaab.grabFiles() def build_website(): print('building websites') - build.kitaab.generate_website() + build.generate_website() def main(): - # get_raw_files() + get_raw_files() build_website() if __name__ == '__main__': - main() + build_website() diff --git a/basant/shared/config.py b/basant/shared/config.py index 2b6f7d9..f7e1206 100644 --- a/basant/shared/config.py +++ b/basant/shared/config.py @@ -3,7 +3,7 @@ nav_tags = ['dev', 'way', 'recipe', 'ops', 'blog', 'rock', 'phil', 'story', 'blog', 'untagged'] relative_build_url = "" absolute_build_url = "https://anish.lakhwara.com/" -files_folder = '/home/anish/vimwiki' +files_folder = '/home/anish/vimwiki2' build_folder = "output/" assets_folder = "./basant/assets/" medias_folder = "./basant/media/" diff --git a/flake.nix b/flake.nix index 39a2fb5..dec15ff 100644 --- a/flake.nix +++ b/flake.nix @@ -41,5 +41,47 @@ propagatedBuildInputs = [ python-with-my-packages ]; doCheck = false; }; + packages.site = pkgs.stdenv.mkDerivation { + name = "anish-lakhwara-site"; + src = ./.; + buildInputs = [ pkgs.python3 ]; + buildPhase = '' + ${self.defaultPackage.${system}}/bin/main.py + ''; + installPhase = '' + mkdir -p $out + cp -R output/* $out/ + ''; + }; + #nixosModule = { options, lib, config, pkgs, ... }: + # let + # serverName = "anish.lakhwara.com"; + # webRoot = "/var/www/${serverName}"; + + # serviceConfig = config.services."${serverName}"; + # options = { + # enable = lib.mkEnableOption "${serverName} service"; + # }; + # in + # { + # options.services.${serverName} = options; + # config = lib.mkIf serviceConfig.enable { + # systemd.services."source-${serverName}" = { + # description = '' + # https://${serverName} source + # ''; + # serviceConfig = { + # Type = "oneshot"; + # }; + # startAt = "*00:00:00"; + # path = with pkgs; [ nix gnutar gzip curl jq ]; + # script = '' + # set -ex + + # ln -sfT ${flake.packages.system.site} ${webRoot} + # ''; + # }; + # }; + # }; }); } diff --git a/package.nix b/package.nix new file mode 100644 index 0000000..e69de29 diff --git a/setup.py b/setup.py index 5f9d8b8..5b3ae3e 100644 --- a/setup.py +++ b/setup.py @@ -7,6 +7,7 @@ setup( # TODO: broken because of import stuff, need to refactor app somehow project_urls={"Source code": "https://git.sealight.xyz/aynish/basant"}, url="https://git.sealight.xyz/aynish/basant", + scripts=['basant/main.py'], packages=find_packages(), setup_requires=["setuptools"], )