diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index acb70ee..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - // 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": "DebugPy: Run pytest module (manually select venv of poetry)", - "type": "debugpy", - "request": "launch", - // "pythonPath": "${workspaceFolder}/.venv/Scripts/python.exe", // need to set venv of poetry via vscode - "cwd": "${workspaceFolder}", - "module": "pytest", - "args": [ - ], - "console": "integratedTerminal", - "justMyCode": true, - }, - // run pytests with poetry - // { - // "name": "DebugPy: poetry run pytest", - // "type": "debugpy", - // "request": "launch", - // "program": "poetry", - // "args": [ - // "run pytest" - // ], - // // "env": { - // // "PYTHONPATH": "${workspaceFolder}" - // // }, - // "console": "integratedTerminal" - // }, - { - "name": "[Deprecated] Python: Run pytest module (manually select venv of poetry)", - "type": "python", - "request": "launch", - // "pythonPath": "${workspaceFolder}/.venv/Scripts/python.exe", - "cwd": "${workspaceFolder}", - "module": "pytest", - "args": [ - ], - "console": "integratedTerminal", - "justMyCode": false, - } - ] -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 9b38853..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "python.testing.pytestArgs": [ - "tests" - ], - "python.testing.unittestEnabled": false, - "python.testing.pytestEnabled": true -} \ No newline at end of file diff --git a/BACKLOG.md b/BACKLOG.md deleted file mode 100644 index 9bc06cb..0000000 --- a/BACKLOG.md +++ /dev/null @@ -1,55 +0,0 @@ -# BACKLOG - -* gen preview for files -* add shell completion script - - -## Current Problems - -### Redeploy - -Currently there are problems handling multiple `key,value` pairs of content variants, its only working by excluding the multiple ones in the query. - -``` -PREFIX rdfs: -PREFIX databus: -PREFIX dataid: -PREFIX dataid-cv: -PREFIX dct: -PREFIX dcat: -PREFIX xsd: - -SELECT DISTINCT ?group ?art ?version ?title ?publisher ?comment ?description ?license ?file ?extension ?type ?bytes ?shasum WHERE { - ?dataset dataid:account databus:ontologies . - ?dataset dataid:group ?group . - ?dataset dataid:artifact ?art. - ?dataset dcat:distribution ?distribution . - ?dataset dct:license ?license . - ?dataset dct:publisher ?publisher . - ?dataset rdfs:comment ?comment . - ?dataset dct:description ?description . - ?dataset dct:title ?title . - ?distribution dcat:downloadURL ?file . - ?distribution dataid:formatExtension ?extension . - ?distribution dataid-cv:type ?type . - ?distribution dcat:byteSize ?bytes . - ?distribution dataid:sha256sum ?shasum . - ?dataset dct:hasVersion ?version . - # Excludes dev versions - FILTER (!regex(?art, "--DEV")) - # exclude some stuff since content variants are hard - MINUS { ?distribution dataid:contentVariant 'sorted'^^xsd:string . } - MINUS { ?distribution dataid:contentVariant 'NONE'^^xsd:string} - MINUS { ?distribution dataid:contentVariant 'goodLicense'^^xsd:string} - MINUS { ?distribution dataid:contentVariant 'lodeMetadata'^^xsd:string} - MINUS { ?distribution dataid:contentVariant 'old'^^xsd:string} -} ORDER BY ?version -``` - -## CLI Problems - -Currently there is no syntax for submitting format extensions or content variants etc to the CLI for Databus Versions. A Sntax needs to be set, for example: -``` -python3 -m databusclient [...] "http://akswnc7.informatik.uni-leipzig.de/dstreitmatter/archivo/advene.org/ns--cinelab--ld/2020.06.10-175249/ns--cinelab--ld_type=generatedDocu.html|key1=value1|value2|.format|..compression" -``` -Something like this, idk. \ No newline at end of file diff --git a/databusclient/cli.py b/databusclient/cli.py index 0e57db3..4e97470 100644 --- a/databusclient/cli.py +++ b/databusclient/cli.py @@ -6,7 +6,7 @@ from typing import List from databusclient import client -from nextcloudclient import upload +from databusclient.rclone_wrapper import upload @click.group() def app(): diff --git a/nextcloudclient/upload.py b/databusclient/rclone_wrapper/upload.py similarity index 100% rename from nextcloudclient/upload.py rename to databusclient/rclone_wrapper/upload.py diff --git a/nextcloudclient/__init__.py b/nextcloudclient/__init__.py deleted file mode 100644 index e69de29..0000000