From 0958273a71dd19c2a90471a182ccc5b90b14e5b4 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sat, 7 Jan 2017 14:00:46 +0100
Subject: Renaming 'schematic' to 'project'. Renaming 'kicad-bom-to-ttl' to
 'kicad-import-project'. Renaming 'digikey-download-for-schematic' to
 'digikey-download-for-project'. Splitting out the Export xml file code into
 its own module. init: putting project.url and project.file in config.ini.
 init: putting db.update-url in config.ini if given on the command line.
 kicad-import-project: by default, assume that the user want to update local
 database, optionally write the ttl file to disk. cli.write_graph: create any
 missing parent directories.

---
 trygvis/eda/cli/eda_rdf.py | 64 +++++++---------------------------------------
 1 file changed, 9 insertions(+), 55 deletions(-)

(limited to 'trygvis/eda/cli/eda_rdf.py')

diff --git a/trygvis/eda/cli/eda_rdf.py b/trygvis/eda/cli/eda_rdf.py
index ee4b0dd..0df66ac 100644
--- a/trygvis/eda/cli/eda_rdf.py
+++ b/trygvis/eda/cli/eda_rdf.py
@@ -1,12 +1,7 @@
-import argparse
-import sys
-import trygvis.eda.cli as cli
-
-
-class CliCommand(object):
-    def __init__(self, key, description):
-        self.key = key
-        self.description = description
+from trygvis.eda.cli.digikey_download_for_project import DigikeyDownloadForProjectCommand
+from trygvis.eda.cli.init import InitCommand
+from trygvis.eda.cli.kicad_import_project import KicadImportProjectCommand
+from . import *
 
 
 # TODO: move all of the command classes to the file they delegate to.
@@ -33,35 +28,7 @@ class DbStats(CliCommand):
         args = p.parse_args(argv)
 
         from trygvis.eda.cli import db_stats
-        db_stats.run()
-
-
-class KicadBomToTtl(CliCommand):
-    def __init__(self):
-        super().__init__("kicad-bom-to-ttl", "Create RDF triples from a KiCAD BOM.xml file")
-
-    def run(self, argv):
-        p = argparse.ArgumentParser(prog=self.key, description=self.description)
-        p.add_argument("-o", "--output", required=False)
-        p.add_argument("-i", "--input", required=False)
-        args = p.parse_args(argv)
-
-        from trygvis.eda.cli import kicad_bom_to_ttl
-        kicad_bom_to_ttl.run(args)
-
-
-class DigikeyDownloadForSchematic(CliCommand):
-    def __init__(self):
-        super().__init__("digikey-download-for-schematic", "Download missing data from digikey.com")
-
-    def run(self, argv):
-        p = argparse.ArgumentParser(prog=self.key, description=self.description)
-        p.add_argument("--schematic", required=True)
-        p.add_argument("-f", "--force", default=False, action='store_true')
-        args = p.parse_args(argv)
-
-        from trygvis.eda.cli import digikey_download_for_schematic
-        digikey_download_for_schematic.run(args.schematic, args)
+        db_stats.run(args)
 
 
 class DigikeyDownloadMetadata(CliCommand):
@@ -107,29 +74,16 @@ class MakeBom(CliCommand):
         make_bom.run(args.schematic)
 
 
-class Init(CliCommand):
-    def __init__(self):
-        super().__init__("init", "Initialize a EDA-RFD database")
-
-    def run(self, argv):
-        p = argparse.ArgumentParser(prog=self.key, description=self.description)
-        p.add_argument("--database-url", dest="database_url")
-        args = p.parse_args(argv)
-
-        from trygvis.eda.cli import init
-        init.run(args)
-
-
 def main():
-    cli.initialize()
+    initialize()
 
     commands = [
         AddToDb(),
-        Init(),
+        InitCommand(),
         DbStats(),
         MakeBom(),
-        KicadBomToTtl(),
-        DigikeyDownloadForSchematic(),
+        KicadImportProjectCommand(),
+        DigikeyDownloadForProjectCommand(),
         DigikeyDownloadAttributeTypesForCategory(),
         DigikeyDownloadMetadata()
     ]
-- 
cgit v1.2.3