harnice 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

harnice/fileio.py

@@ -41,13 +41,15 @@ def path(target_value, structure_dict=None, base_directory=None):
 
     # returns the filepath/filename of a filekey.
     """
-    Recursively searches for a value in a nested JSON structure and returns the path to the element containing that value.
+Recursively searches for a value in a nested JSON structure and returns the path to the element containing that value.
 
-    Args:
-        target_value (str): The value to search for.
+It's complicated ... check out https://harnice.io/commands/fileio/ for more information.
+
+Args:
+    target_value (str): The value to search for.
 
-    Returns:
-        list: A list of container names leading to the element containing the target value, or None if not found.
+Returns:
+    list: A list of container names leading to the element containing the target value, or None if not found.
     """
 
     # FILES NOT DEPENDENT ON PRODUCT TYPE
@@ -65,7 +67,20 @@ def path(target_value, structure_dict=None, base_directory=None):
         harnice_root = os.path.dirname(
             os.path.dirname(os.path.dirname(harnice.__file__))
         )
-        return os.path.join(harnice_root, "library_locations.csv")
+
+        library_locations_path = os.path.join(harnice_root, "library_locations.csv")
+
+        if not os.path.exists(library_locations_path):
+            from harnice import cli
+            answer = cli.prompt(f"Library locations file not found at {library_locations_path}. Create it?", default="y")
+            if answer.lower() not in ("y", "yes", ""):
+                exit()
+
+            with open(library_locations_path, "w") as f:
+                f.write("repo_url,local_path\n")
+                f.write(f"https://github.com/harnice/harnice,{os.path.join(harnice_root, 'library_public')}\n")
+
+        return library_locations_path
 
     if target_value == "project locations":
         import harnice
@@ -73,6 +88,17 @@ def path(target_value, structure_dict=None, base_directory=None):
         harnice_root = os.path.dirname(
             os.path.dirname(os.path.dirname(harnice.__file__))
         )
+        project_locations_path = os.path.join(harnice_root, "project_locations.csv")
+        if not os.path.exists(project_locations_path):
+            from harnice import cli
+            answer = cli.prompt(f"Project locations file not found at {project_locations_path}. Create it?", default="y")
+            if answer.lower() not in ("y", "yes", ""):
+                exit()
+
+            with open(project_locations_path, "w") as f:
+                f.write("traceable_key,local_path\n")
+                f.write("your project part number,local path to your project\n")
+
         return os.path.join(harnice_root, "project_locations.csv")
 
     if target_value == "drawnby":
@@ -81,7 +107,24 @@ def path(target_value, structure_dict=None, base_directory=None):
         harnice_root = os.path.dirname(
             os.path.dirname(os.path.dirname(harnice.__file__))
         )
-        return os.path.join(harnice_root, "drawnby.json")
+
+        drawnby_path = os.path.join(harnice_root, "drawnby.json")
+        if not os.path.exists(drawnby_path):
+            from harnice import cli
+            answer = cli.prompt(f"Drawnby file not found at {drawnby_path}. Create it?", default="y")
+            if answer.lower() not in ("y", "yes", ""):
+                exit()
+
+            name = cli.prompt("Enter your name: (recommended: first inital, last name, all caps: K SHUTT)")
+
+            while not name:
+                print("Name cannot be empty. Please try again.")
+                name = cli.prompt("Enter your name")
+
+            with open(drawnby_path, "w") as f:
+                f.write(f"{name}\n")
+
+        return drawnby_path
 
     # FILES INSIDE OF A STRUCURE DEFINED BY FILEIO
     # look up from default structure state if not provided

harnice/lists/rev_history.py

@@ -32,32 +32,32 @@ Overwrite a revision history entry.
 
 **Arguments:**
 
- - `content_dict` (dict): The content to overwrite the revision history entry with.
-    - This should be a dictionary with the keys and values to overwrite.
-    - The keys should be the column names, and the values should be the new values.
-    - Some keys are protected and cannot be overwritten:
-        - `"product"`
-        - `"mfg"`
-        - `"pn"`
-        - `"rev"`
-        - `"releaseticket"`
-        - `"library_repo"`
-        - `"library_subpath"`
-        - `"datestarted"`
+- `content_dict` (dict): The content to overwrite the revision history entry with.
+- This should be a dictionary with the keys and values to overwrite.
+- The keys should be the column names, and the values should be the new values.
+- Some keys are protected and cannot be overwritten:
+    - `"product"`
+    - `"mfg"`
+    - `"pn"`
+    - `"rev"`
+    - `"releaseticket"`
+    - `"library_repo"`
+    - `"library_subpath"`
+    - `"datestarted"`
 
 The function will update the revision history file as referenced by the current product file structure.
 
 **Returns:**
 
- - `None`
+- `None`
 
 **Raises:**
 
- - `KeyError`: If a key is provided that is not in the COLUMNS list.
- - `KeyError`: If a protected key is provided.
- - `ValueError`: If the revision history file is not found.
- - `ValueError`: If the revision is not found in the revision history file.
- - `RuntimeError`: If `state.rev` is not set.
+- `KeyError`: If a key is provided that is not in the COLUMNS list.
+- `KeyError`: If a protected key is provided.
+- `ValueError`: If the revision history file is not found.
+- `ValueError`: If the revision is not found in the revision history file.
+- `RuntimeError`: If `state.rev` is not set.
     """
     PROTECTED_KEYS = [
         "product",
@@ -417,17 +417,24 @@ def append(next_rev=None):
     # add lib_repo if filepath is found in library locations
     library_repo = ""
     library_subpath = ""
-    cwd = str(os.getcwd()).lower().strip("~")
+    # Normalize path separators for comparison (handle both forward and backslashes)
+    cwd = str(os.getcwd()).lower().replace("\\", "/").strip("~")
 
     for row in fileio.read_tsv("library locations", delimiter=","):
-        lib_local_path = str(row.get("local_path", "")).lower().strip("~")
+        # Normalize path separators and expand user home directory if needed
+        lib_local_path_raw = str(row.get("local_path", "")).strip()
+        lib_local_path = (
+            os.path.expanduser(lib_local_path_raw).lower().replace("\\", "/").strip("~")
+        )
         if lib_local_path in cwd:
             library_repo = row.get("repo_url")
 
             # keep only the portion AFTER local_path
             idx = cwd.find(lib_local_path)
-            remainder = cwd[idx + len(lib_local_path) :].lstrip("/")
-            parts = remainder.split("/")
+            remainder = cwd[idx + len(lib_local_path) :]
+            # Normalize path separators - handle both forward and backslashes
+            remainder = remainder.replace("\\", "/").lstrip("/")
+            parts = remainder.split("/") if remainder else []
 
             # find the part number in the path
             pn = str(state.partnumber("pn")).lower()
@@ -438,6 +445,7 @@ def append(next_rev=None):
                 core_parts = parts
 
             # build library_subpath and product
+            # Use forward slashes for cross-platform compatibility (works in URLs and most contexts)
             if core_parts:
                 library_subpath = (
                     "/".join(core_parts[1:]) + "/" if len(core_parts) > 1 else ""
@@ -510,8 +518,6 @@ def part_family_append(content_dict, rev_history_path):
         fileio.get_git_hash_of_harnice_src()
     )
 
-    rev = content_dict.get("rev")
-
     if os.path.exists(rev_history_path):
         rows = fileio.read_tsv(rev_history_path)
     else:

harnice/utils/library_utils.py

@@ -303,7 +303,9 @@ def get_local_path(lib_repo):
         os.makedirs(os.path.dirname(csv_path), exist_ok=True)
 
         with open(csv_path, "w", encoding="utf-8") as f:
-            f.write(f"https://github.com/harnice/harnice,{default_local_path}\n")
+            # Normalize the default path to ensure correct separators
+            normalized_path = os.path.normpath(default_local_path)
+            f.write(f"https://github.com/harnice/harnice,{normalized_path}\n")
 
         print(f"[harnice] Created '{csv_path}'")
         print(f"[harnice] Default library-public location: {default_local_path}")
@@ -328,6 +330,10 @@ def get_local_path(lib_repo):
             if url.lower() == lib_repo.lower().strip():
                 if not local:
                     raise ValueError(f"No local path found for '{lib_repo}'")
-                return os.path.expanduser(local)
+                # Expand user directory (~) and normalize path separators for current platform
+                expanded_path = os.path.expanduser(local)
+                # Normalize separators - os.path.normpath() converts forward slashes to
+                # backslashes on Windows, ensuring proper path format
+                return os.path.normpath(expanded_path)
 
     raise ValueError(f"'{lib_repo}' not found in library locations")

{harnice-0.3.1.dist-info → harnice-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: harnice
-Version: 0.3.1
+Version: 0.3.2
 Summary: Electrical System CAD
 Author-email: Kenyon Shutt <harnice.io@gmail.com>
 Project-URL: Documentation, https://harnice.io/

{harnice-0.3.1.dist-info → harnice-0.3.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 harnice/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 harnice/__main__.py,sha256=6Ni-cHmuKYqm9WKNd5bgzHyMkpyJ80IzoUmBqldUanw,68
 harnice/cli.py,sha256=npYeqdywC8C4dStWzGnwy25hTapUEkCTFeNwo9aDmi8,6571
-harnice/fileio.py,sha256=MiBPo5Z6DfEDkuFs9purekJHxNW3w1spjs_AZONAzCc,9511
+harnice/fileio.py,sha256=DT0eqw5ATLwtIQ5KA825CvBY-kxN11KneImJH2TvSS8,11360
 harnice/state.py,sha256=V-HK1Jgh5sfEt9m3keYFdZGtvW2cA88gM8b_4Tx05-k,1248
 harnice/gui/launcher.py,sha256=R0T48RJkgFOJqFhgO7CvZa05zzHOu_q5tgV9U1iwreY,12993
 harnice/lists/channel_map.py,sha256=Q3cuBcYTQg7H25SFx8wb2Q0o4zNNCCS8WRBMPrwyGxg,6112
@@ -12,7 +12,7 @@ harnice/lists/instances_list.py,sha256=g28vHzarDpsRu3aPEPaX-gsRZ_knJW9fgWAn174qr
 harnice/lists/library_history.py,sha256=DhuRJWs1ziyfnhzEsmn3kVD5iaRELQ8OQ9UmDvmFjPU,1576
 harnice/lists/manifest.py,sha256=nCwibNehQ1VYDN9_Q7vqM8DfssQXO4IQ1n39AW9Bp8Y,3039
 harnice/lists/post_harness_instances_list.py,sha256=dxTwCLSRHX0J4YdEUx8GNMy9-UL8DK__4llGKTRrWSY,2490
-harnice/lists/rev_history.py,sha256=efIK8V3gAqk8gK3f2MnH1zI744JiNPub6-1E0PUM2to,18058
+harnice/lists/rev_history.py,sha256=GyxirEfFwmjSLXguo4g9yzK_atnBK7L4nwH5dyygklk,18525
 harnice/lists/signals_list.py,sha256=qqRAtxYsJeSVL0XDESFbBDrdcxhWKAq6oZAqPVVrSOE,6972
 harnice/products/__init__.py,sha256=LlsPf7uk1kyBdmaBuLhlGwcQau3uzEUdCW_eqtTs7TQ,29
 harnice/products/cable.py,sha256=I05__-WxJUR-teV-oYB1Qzi5ufWbbYCOfM8oqCSXWPs,5107
@@ -29,13 +29,13 @@ harnice/utils/appearance.py,sha256=ps_tMLdbURL-FCIv0Z3X19bTRFVRIuP0J5N9zvugUbs,1
 harnice/utils/circuit_utils.py,sha256=k5CfwYaL2flvilE5r_pZPy_puY9nyC093DO-H3s0VYU,13085
 harnice/utils/feature_tree_utils.py,sha256=dLcEUdvrA9p_EGWIqqBfRb5ZuxuXNp9OZcLh2W4N300,6973
 harnice/utils/formboard_utils.py,sha256=f7SXn8uFMysv5_Gq-84G-jOauSrbMeL8PBPquzkq8Sw,36861
-harnice/utils/library_utils.py,sha256=KgBHisCuB3IOuhCSwXUoLNalI8Mz_8vFS_jI4j-1d0M,12564
+harnice/utils/library_utils.py,sha256=Qp6UEtmcgQvK8Jxxt88GngQX_OBvhxumV_hCqcfwpFQ,13015
 harnice/utils/note_utils.py,sha256=flcWmaRNz03t-Xo6bbp8erF9FuuUuAG5hcW7ephx02M,15676
 harnice/utils/svg_utils.py,sha256=HZrEdTS1dHyrHxaYM35Va644bdrkwao5OkJPG_RPX2Y,33490
 harnice/utils/system_utils.py,sha256=nFIEaf_5rt0kVETvB7DX-RVCNLH7Q9ZAhPBtFpio__Q,25651
-harnice-0.3.1.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-harnice-0.3.1.dist-info/METADATA,sha256=lNIUXpgv-pLrrzm-bVi78XusXrYAzDsl5_ptKbZUej8,1072
-harnice-0.3.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-harnice-0.3.1.dist-info/entry_points.txt,sha256=AsINav6n93Jl0X-cF2nEQT2Mqj0FI-BJu2ieyUqddnE,85
-harnice-0.3.1.dist-info/top_level.txt,sha256=HF3Q2YiwIW9HIDhXjucyrtGy7dubDEcJUMpb5Ajb5pM,8
-harnice-0.3.1.dist-info/RECORD,,
+harnice-0.3.2.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+harnice-0.3.2.dist-info/METADATA,sha256=s32OUCTTvnt-fwrwMaIy07SRgUiv6i6FxFzYD6ji8EE,1072
+harnice-0.3.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+harnice-0.3.2.dist-info/entry_points.txt,sha256=AsINav6n93Jl0X-cF2nEQT2Mqj0FI-BJu2ieyUqddnE,85
+harnice-0.3.2.dist-info/top_level.txt,sha256=HF3Q2YiwIW9HIDhXjucyrtGy7dubDEcJUMpb5Ajb5pM,8
+harnice-0.3.2.dist-info/RECORD,,