Publishing can now talk to server, but server does not like our names.

Author: anders-ahlberg

fusesoc/config.py

@@ -56,6 +56,8 @@ def __init__(self, path=None):
         logger.debug("cache_root=" + self.cache_root)
         logger.debug("library_root=" + self.library_root)
         logger.debug("ssh-trustfile=" + (self.ssh_trustfile or "none"))
+        logger.debug("publish-uri=" + (self.publish_uri or "none"))
+        logger.debug("publish-uri-pem=" + (self.publish_uri_pem or "none"))
 
     def _parse_library(self):
         # Parse library sections
@@ -199,6 +201,22 @@ def ssh_trustfile(self):
     def ssh_trustfile(self, val):
         self._set_default_section("ssh-trustfile", val)
 
+    @property
+    def publish_uri(self):
+        return self._cp.get(Config.default_section, "publish-uri", fallback=None)
+
+    @publish_uri.setter
+    def publish_uri(self, val):
+        self._set_default_section("publish-uri", val)
+
+    @property
+    def publish_uri_pem(self):
+        return self._cp.get(Config.default_section, "publish-uri-pem", fallback=None)
+
+    @publish_uri_pem.setter
+    def publish_uri_pem(self, val):
+        self._set_default_section("publish-uri-pem", val)
+
     @property
     def library_root(self):
         return self._get_library_root()

fusesoc/main.py

@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 import argparse
+import json
 import os
 import pathlib
 import shutil
@@ -301,29 +302,42 @@ def core_sign(fs, args):
 
 def core_publish(fs, args):
     core = _get_core(fs, args.core)
-    logger.info("publish core file: " + core.core_file)
-    logger.info("to api at: " + args.url)
-    if args.sigfile:
-        logger.info("including sigfile: " + args.sigfile)
+    uri = fs.config.publish_uri
+    pem = fs.config.publish_uri_pem
+    sigfile = core.core_file + ".sig"
+    print("Publish core file: " + core.core_file)
+    fob_core = open(core.core_file, "rb")
+    body = {"core_file": fob_core}
+    fob_sig = None
+    if os.path.exists(sigfile):
+        print("and signature file: " + sigfile)
+        fob_sig = open(sigfile, "rb")
+        body["signature_file"] = fob_sig
     else:
-        logger.info("no sigfile")
-
-    file = open(core.core_file)
-    cf_data = file.read()
-    file.close()
-    body = {"core_file": cf_data}
-    if args.sigfile:
-        file = open(args.sigfile)
-        sf_data = file.read()
-        file.close()
-        body["signature_file"] = sf_data
-    res = requests.post(
-        args.url + "/api/fusesoc-packages/publish/", json=body, allow_redirects=True
-    )
-    logger.info("Got: " + str(res))
+        print("(without signature file)")
+        sf_data = None
+    if pem:
+        print("with certificate from: " + pem)
+    print("to api at: " + uri)
+    if args.yes:
+        print("without confirmation")
+    else:
+        c = input("Confirm by typing 'yes': ")
+        if c != "yes":
+            print("Aborted.")
+            return False
+
+    target = uri + "/v1/publish/"
+    logger.debug("POST to " + target)
+    res = requests.post(target, files=body, allow_redirects=True, verify=pem)
     if not res.ok:
         print("Request returned http result", res.status_code, res.reason)
+        err = json.loads(res.content)
+        print(str(err))
     res.close()
+    fob_core.close()
+    if fob_sig:
+        fob_sig.close()
 
 
 def gen_clean(fs, args):