Compare commits

...

3 Commits

Author SHA1 Message Date
e64e1a038f Completed basic CLI program
All checks were successful
ydeng/csvbyname/pipeline/head This commit looks good
2023-04-21 11:08:46 -05:00
2f170e1088 Began implementing the file collection function 2023-04-20 23:40:39 -05:00
f09e0d27fd Added some CLI arguments and program structure 2023-04-20 16:28:54 -05:00
16 changed files with 266 additions and 0 deletions

26
.vscode/launch.json vendored Normal file
View File

@ -0,0 +1,26 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Use Test Resources",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/csvbyname/csvbyname.py",
"console": "integratedTerminal",
"args": [
"${workspaceFolder}/tests/resources",
"${workspaceFolder}/output.csv",
"-r",
"-p",
"group_num:group(\\d)-\\w-\\d+\\.txt",
"group(\\d)-(?P<sect>\\w)-(?P<patid>\\d+)\\.txt",
"-V",
"DEBUG"
],
"justMyCode": true
}
]
}

36
Jenkinsfile vendored Normal file
View File

@ -0,0 +1,36 @@
pipeline {
agent any
stages {
stage("clean") {
steps {
sh 'rm -rf ./dist/*'
}
}
stage("install") {
steps {
sh 'mamba env update --file environment.yml'
sh 'echo "mamba activate csvbyname" >> ~/.bashrc'
}
}
stage("build") {
steps {
sh "python -m build"
}
}
stage("test") {
steps {
sh "pip install dist/*.whl"
}
}
stage("publish") {
when {
branch '**/master'
}
steps {
withCredentials([usernamePassword(credentialsId: 'rs-git-package-registry-ydeng', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
sh "python -m twine upload --repository-url https://git.reslate.systems/api/packages/${USER}/pypi -u ${USER} -p ${PASS} --non-interactive --disable-progress-bar --verbose dist/*"
}
}
}
}
}

0
csvbyname/__init__.py Normal file
View File

170
csvbyname/csvbyname.py Normal file
View File

@ -0,0 +1,170 @@
import argparse
import csv
import os
import re
from typing import Iterable
import exceptions
import logging
def matcher(full_path: str, use_full_path: bool, regex_groups: list[str]):
captured_properties = {}
for regex_and_group in regex_groups:
match_assume_named = re.match(
regex_and_group, full_path if use_full_path else os.path.basename(full_path)
)
if match_assume_named and len(match_assume_named.groupdict()) > 0:
for group, val in match_assume_named.groupdict().items():
if group not in captured_properties:
captured_properties[group] = val
else:
raise exceptions.InvalidPropertiesException(
f'Duplicate capture group names found: "{group}"'
)
else:
unnamed_split = regex_and_group.split(":", 1)
if len(unnamed_split) < 2:
logger.debug(
'File at "%s" could not be matched by regex "%s" '
"and will be skipped",
full_path,
regex_and_group,
)
continue
group, regex = unnamed_split
unnamed_match = re.match(
regex, full_path if use_full_path else os.path.basename(full_path)
)
if unnamed_match:
if group not in captured_properties:
captured_properties[group] = unnamed_match.group(1)
else:
raise exceptions.InvalidPropertiesException(
f'Duplicate capture group names found: "{group}"'
)
return captured_properties
def collect_files(
dir_path: str,
include_folders: bool,
entire_path: bool,
recursive: bool,
regex_groups: list[str],
):
collected = {}
pkeys = set()
for item in os.listdir(dir_path):
full_path = os.path.join(dir_path, item)
if os.path.isdir(full_path):
if include_folders:
collected[full_path] = matcher(full_path, entire_path, regex_groups)
pkeys.update(collected[full_path])
if recursive:
collected = collected | collect_files(
full_path, include_folders, entire_path, recursive, regex_groups
)
elif os.path.isfile(full_path):
collected[full_path] = matcher(full_path, entire_path, regex_groups)
pkeys.update(collected[full_path])
return collected, pkeys
def write_collected_to_csv(
output_path: str, collected: dict[str, dict[str, str]], property_keys: Iterable[str]
):
with open(output_path, "w") as output_fd:
s_property_keys = sorted(property_keys)
header = ["path", *s_property_keys]
writer = csv.writer(output_fd)
writer.writerow(header)
for full_path, properties in collected.items():
writer.writerow(
[
full_path,
*(
properties[k] if k in properties else "N/A"
for k in s_property_keys
),
]
)
def run(args):
logger.info('Collecting files from "%s"', args.directory)
collected, pkeys = collect_files(
args.directory,
args.include_folders,
args.entire_path,
args.recursive,
args.add_re_property,
)
write_collected_to_csv(args.output, collected, pkeys)
def main():
argparser = argparse.ArgumentParser(
"csvbyname",
description="Catalogue a directory of files by patterns in their names into a "
"CSV.",
)
argparser.add_argument(
"directory",
type=str,
help="The directory containing the files to obtain catalogue names of",
metavar="i",
)
argparser.add_argument(
"output", type=str, help="The path to the catalogued CSVs.", metavar="o"
)
argparser.add_argument(
"-l",
"--include-folders",
help="Include folders in the cataloguing process",
action="store_true",
required=False,
default=False,
)
argparser.add_argument(
"-e",
"--entire-path",
help="Include the full path when applying the groupings to find properties",
action="store_true",
required=False,
default=False,
)
argparser.add_argument(
"-r",
"--recursive",
help="Catalogue recursively",
action="store_true",
required=False,
default=False,
)
argparser.add_argument(
"-p",
"--add-re-property",
help="Add a property in the resulting CSV obtained from the first capture "
"group of the given REGEX in the following format:\n property-name:regex.\n"
"Alternatively, use named REGEX groups.",
nargs="+",
type=str,
)
argparser.add_argument(
"-V",
"--verbosity",
help="Set the verbosity of the logging",
type=str,
required=False,
default="INFO",
)
args = argparser.parse_args()
logging.basicConfig(level=args.verbosity.upper())
global logger
logger = logging.getLogger(__name__)
run(args)
if __name__ == "__main__":
main()

2
csvbyname/exceptions.py Normal file
View File

@ -0,0 +1,2 @@
class InvalidPropertiesException(Exception):
pass

8
environment.yml Normal file
View File

@ -0,0 +1,8 @@
name: csvbyname
channels:
- conda-forge
dependencies:
- build=0.7.0
- pytest=7.2.2
- twine=4.0.2
- python=3.9

3
pyproject.toml Normal file
View File

@ -0,0 +1,3 @@
[build-system]
build-backend = "setuptools.build_meta"
requires = ["setuptools", "wheel"]

10
setup.cfg Normal file
View File

@ -0,0 +1,10 @@
[metadata]
name = csvbyname
version = 0.0.1
[options]
packages = csvbyname
[options.entry_points]
console_scripts =
csvbyname = csvbyname.csvbyname:main

3
setup.py Normal file
View File

@ -0,0 +1,3 @@
from setuptools import setup
setup()

1
tests/resources/foo.txt Normal file
View File

@ -0,0 +1 @@
Text

View File

@ -0,0 +1 @@
Text

View File

@ -0,0 +1,2 @@
Text

View File

@ -0,0 +1 @@
Text

View File

@ -0,0 +1 @@
Text

View File

@ -0,0 +1 @@
Text

View File

@ -0,0 +1 @@
Text