Skip to content

Commit

Permalink
Include friendly repo name in cache dir name (#88)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jackenmen authored May 17, 2023
1 parent 5aa54b8 commit 82488ce
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
5 changes: 4 additions & 1 deletion indexer.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import json
import yaml
import re
import sys
from gzip import GzipFile
from pathlib import Path
Expand Down Expand Up @@ -67,7 +68,9 @@ def folder_check_and_get_info(self):
if self._error:
return

base_path = CACHE / Path(sha1_digest(self._url))
safe_name = re.sub(r"[^a-zA-Z0-9_\-\.]", "", self.name).strip(".")
prefix = f"{safe_name}_" if safe_name else ""
base_path = CACHE / Path(f"{prefix}{sha1_digest(self._url)}")
if not base_path.is_dir():
self._error = "Repo path does not exist. Cloning failed?"
return
Expand Down
16 changes: 14 additions & 2 deletions parser.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import re
import sys
from hashlib import sha1
from pathlib import Path
Expand All @@ -13,6 +14,14 @@ def executable_opener(path, flags):
def sha1_digest(url):
return sha1(url.encode('utf-8')).hexdigest()

def get_name(url):
name = url.split("/")[4]
if "@" in name:
name, _ = name.split("@")
if name.endswith("/"):
name = name[:-1]
return name

def get_clean_url(url):
branch = ""
if "@" in url:
Expand All @@ -38,14 +47,17 @@ def get_clean_url(url):
repos.extend(data["unapproved"])

for r in repos:
name = get_name(r)
url, branch = get_clean_url(r)
safe_name = re.sub(r"[^a-zA-Z0-9_\-\.]", "", name).strip(".")
prefix = f"{safe_name}_" if safe_name else ""
if branch:
sha = sha1_digest(f"{url}@{branch}")
dest = CACHE / Path(sha)
dest = CACHE / Path(f"{prefix}{sha}")
sh += f"./git-retry.sh clone --depth=1 {url} --branch {branch} --single-branch {dest}\n"
else:
sha = sha1_digest(url)
dest = CACHE / Path(sha)
dest = CACHE / Path(f"{prefix}{sha}")
sh += f"./git-retry.sh clone --depth=1 {url} {dest}\n"

with open(outfile, "w", opener=executable_opener) as f:
Expand Down

0 comments on commit 82488ce

Please sign in to comment.