JOJ/JOJ3-config-generator
27
1
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

WIP: dev #6

Closed
李衍志523370910113 wants to merge 131 commits from dev into master
pull from: dev
merge into: JOJ:master
Conversation 4 Commits 131 Files Changed 34 +5 -1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ecfeece62 - Show all commits

6
joj3_config_generator/lib/repo.py
View File

@ -1,6 +1,7 @@
import hashlib
import shlex
import socket
from pathlib import Path
from joj3_config_generator.models import joj1, repo, result, task
@ -80,7 +81,10 @@ def calc_sha256sum(file_path: str) -> str:
def get_hash(immutable_files: list[str]) -> str: # input should be a list
file_path = "../immutable_file/" # TODO: change this when things are on the server
# FIXME: should be finalized when get into the server
current_file_path = Path(__file__).resolve()
project_root = current_file_path.parents[2]
file_path = f"{project_root}/tests/immutable_file/"
张泊明518370910136 commented 2024-11-10 08:13:13 +08:00
Outdated
Review
Copy Link

hard coded path not acceptable

hard coded path not acceptable
李衍志523370910113 commented 2024-11-12 12:31:41 +08:00
Outdated
Review
Copy Link

thats what I wanted to discuss, in what form would be better? @manuel @bomingzh
my suggestions is to add more fields related to this in repo.toml or task.toml, I think store it globally in some *.py file is still hardcoded

thats what I wanted to discuss, in what form would be better? @manuel @bomingzh my suggestions is to add more fields related to this in `repo.toml` or `task.toml`, I think store it globally in some `*.py` file is still hardcoded
张泊明518370910136 commented 2024-11-12 12:44:07 +08:00
Outdated
Review
Copy Link

just let them enter path relative to project root for immutable files

just let them enter path relative to project root for immutable files
李衍志523370910113 commented 2024-11-12 13:00:03 +08:00
Outdated
Review
Copy Link

giving prompt? Wouldn't it be better to export field in *.toml file? they may accidnetally input wrong things I guess

giving prompt? Wouldn't it be better to export field in `*.toml` file? they may accidnetally input wrong things I guess
张泊明518370910136 commented 2024-11-12 13:01:50 +08:00
Outdated
Review
Copy Link

just throw error on wrong input

just throw error on wrong input
李衍志523370910113 commented 2024-11-12 13:37:08 +08:00
Outdated
Review
Copy Link

I mean, they input \home\tt\.config\ instead of \home\tt\.config\joj such things may happen, but will cost time to figure out what happened? So I think better put them in *.toml.

I mean, they input `\home\tt\.config\` instead of `\home\tt\.config\joj` such things may happen, but will cost time to figure out what happened? So I think better put them in `*.toml`.
张泊明518370910136 commented 2024-11-12 13:40:21 +08:00
Outdated
Review
Copy Link

just make the dir relative to git repo root, if the file does not exist, throw error

just make the dir relative to git repo root, if the file does not exist, throw error
manuel commented 2024-11-12 14:01:12 +08:00
Outdated
Review
Copy Link

any path in toml should probably be defined relative to /home/tt/.config/joj and be in a subdirectory. this is where all config must be.
then they can specify projects/p2/.cang-tidy or tool/compile

using project_root as too tricky as it could mean going up (../../) which is hard to read/figure out quickly.

as all JOJ config files must be in $HOME/.config/joj taking it as root makes sense, is general, and consistent with the approach we have used so far

any path in toml should probably be defined relative to `/home/tt/.config/joj` and be in a subdirectory. this is where all config must be. then they can specify `projects/p2/.cang-tidy` or `tool/compile` using `project_root` as too tricky as it could mean going up (`../../`) which is hard to read/figure out quickly. as all JOJ config files must be in `$HOME/.config/joj` taking it as root makes sense, is general, and consistent with the approach we have used so far
李衍志523370910113 commented 2024-11-12 14:32:53 +08:00
Outdated
Review
Copy Link

bit mixed here, if fixed, can I hardcode it?

bit mixed here, if fixed, can I hardcode it?
immutable_hash = []
for i, file in enumerate(immutable_files):
immutable_files[i] = file_path + file.rsplit("/", 1)[-1]