From c96f3ea5da8f05539c1790a1a390711962083932 Mon Sep 17 00:00:00 2001 From: Brady McDonough Date: Wed, 13 Nov 2024 17:49:10 -0700 Subject: [PATCH] Finished libgit integration --- backend/main.scm | 5 +++++ backend/src/repo.scm | 5 ++--- backend/src/scheduler.scm | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/backend/main.scm b/backend/main.scm index 6077e5d..5a6124a 100644 --- a/backend/main.scm +++ b/backend/main.scm @@ -1,6 +1,10 @@ (use-modules (artanis artanis) (csv csv) + (git bindings) + (git clone) + (git repository) + (git remote) (ice-9 popen) (ice-9 regex) (ice-9 string-fun) @@ -18,6 +22,7 @@ (include "./src/debugging.scm") (include "./src/repo.scm") +(git:init) (include "./src/associations.scm") (include "./src/scheduler.scm") (include "./src/spawn_interaction.scm") diff --git a/backend/src/repo.scm b/backend/src/repo.scm index 4fb5f0b..f0a6569 100644 --- a/backend/src/repo.scm +++ b/backend/src/repo.scm @@ -1,6 +1,3 @@ -(use-modules (git clone) - (git repository) - (git remote)) (define %new-repo-url "https://github.com/ccodwg/CovidTimelineCanada") (define %repo-url "https://github.com/ccodwg/Covid19Canada.git") @@ -27,5 +24,7 @@ (init-repo))) (define (git:init) + (libgit2-init!) (if (not (repo-exists?)) (init-repo))) + diff --git a/backend/src/scheduler.scm b/backend/src/scheduler.scm index 6fb7ef7..60d9fca 100644 --- a/backend/src/scheduler.scm +++ b/backend/src/scheduler.scm @@ -91,7 +91,7 @@ (prov-terse . ,(assq-ref plist 'prov-code)) (last-7 . ,(sum-first-n 7 (assq-ref plist 'reports))) (last-14 . ,(sum-first-n 14 (assq-ref plist 'reports))))))) - (set-symbol-property! hr-sym 'json-string json-esc))) + (set-symbol-property! hr-sym 'json-string json))) hr-syms)) ;;Update Thread