From 7ef59b51d5d5c84978668a439eab0a6fd3eca3a2 Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Fri, 10 Sep 2021 09:44:45 +0200
Subject: [PATCH] move translator cli to src/apps

---
 src/apps/default.nix                               | 14 +++++++++-----
 .../cli.py => apps/translators-cli.py}             |  0
 src/default.nix                                    |  2 +-
 src/translators/default.nix                        | 12 +++++-------
 4 files changed, 15 insertions(+), 13 deletions(-)
 rename src/{translators/cli.py => apps/translators-cli.py} (100%)

diff --git a/src/apps/default.nix b/src/apps/default.nix
index 764e8a2c..d5e2cc5d 100644
--- a/src/apps/default.nix
+++ b/src/apps/default.nix
@@ -1,18 +1,22 @@
 {
   pkgs,
   location,
+  translators,
 }:
 let
   callPackage = pkgs.callPackage;
 in
 {
-  # translate cli
-  translate = callPackage ({ writeScript, }:
-    writeScript
-      "translate"
-      ''${import ../translators { inherit pkgs; }}/bin/cli "$@"''
+
+  # the unified translator cli
+  translate = callPackage ({ python3, writeScript, ... }:
+    writeScript "cli" ''
+      translatorsJsonFile=${translators.translatorsJsonFile} \
+        ${python3}/bin/python ${./translators-cli.py} "$@"
+    ''
   ) {};
 
+  # install the framework to a specified location by copying the code
   install = callPackage ({ writeScript, }:
     writeScript
       "install"
diff --git a/src/translators/cli.py b/src/apps/translators-cli.py
similarity index 100%
rename from src/translators/cli.py
rename to src/apps/translators-cli.py
diff --git a/src/default.nix b/src/default.nix
index 1e218dfe..1f90df74 100644
--- a/src/default.nix
+++ b/src/default.nix
@@ -8,7 +8,7 @@ in
 
 rec {
 
-  apps = callPackage ./apps { inherit location; };
+  apps = callPackage ./apps { inherit location translators; };
 
   builders = callPackage ./builders {};
 
diff --git a/src/translators/default.nix b/src/translators/default.nix
index 747247d0..a18b19dd 100644
--- a/src/translators/default.nix
+++ b/src/translators/default.nix
@@ -26,6 +26,8 @@ let
   # Put all translator executables in a json file.
   # This will allow the cli to call the translators of different build systems
   # in a standardised way
+  # TODO: This doesn't scale as it requires all translators being built.
+  #       Redesign this, to call the individual translators using nix run ... 
   translatorsJsonFile = callPackage ({ bash, lib, runCommand, ... }:
     runCommand
       "translators.json"
@@ -47,10 +49,6 @@ let
   ) {};
 
 in
-
-# the unified translator cli
-callPackage ({ python3, writeScriptBin, ... }:
-  writeScriptBin "cli" ''
-    translatorsJsonFile=${translatorsJsonFile} ${python3}/bin/python ${./cli.py} "$@"
-  ''
-) {}
+{
+  inherit translators translatorsJsonFile;
+}