From 2e0f11c79a10d1573e3d4e936befe881a515bd0c Mon Sep 17 00:00:00 2001 From: Joshua Ramon Enslin Date: Thu, 20 Feb 2025 23:07:50 +0100 Subject: [PATCH] Extend and structure --- go.mod | 2 +- src/main.go => main.go | 4 ++++ src/{ => configLoader}/configLoader.go | 2 +- src/setup.go | 15 --------------- src/setup/setup.go | 24 ++++++++++++++++++++++++ 5 files changed, 30 insertions(+), 17 deletions(-) rename src/main.go => main.go (82%) rename src/{ => configLoader}/configLoader.go (99%) delete mode 100644 src/setup.go create mode 100644 src/setup/setup.go diff --git a/go.mod b/go.mod index 36564e6..8037ee2 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ -module MDWebDavUploader +module gitea.armuli.eu/museum-digital/museum-digital-webdav-uploader go 1.24.0 diff --git a/src/main.go b/main.go similarity index 82% rename from src/main.go rename to main.go index bcc32a6..89a2458 100644 --- a/src/main.go +++ b/main.go @@ -1,6 +1,10 @@ package main import "fmt" +import ( + "gitea.armuli.eu/museum-digital/museum-digital-webdav-uploader/src/configLoader" + "gitea.armuli.eu/museum-digital/museum-digital-webdav-uploader/src/setup" +) // Attempts to connect to WebDAV server, verifying that the authentication data // works and that the server is one for uploads with museum-digital. diff --git a/src/configLoader.go b/src/configLoader/configLoader.go similarity index 99% rename from src/configLoader.go rename to src/configLoader/configLoader.go index e70358c..ea59a3b 100644 --- a/src/configLoader.go +++ b/src/configLoader/configLoader.go @@ -1,4 +1,4 @@ -package main +package configLoader type MDWebDavUploaderConfig struct { InstanceLink string `json:"instance"` diff --git a/src/setup.go b/src/setup.go deleted file mode 100644 index 0b6c84e..0000000 --- a/src/setup.go +++ /dev/null @@ -1,15 +0,0 @@ -package main - -// Fetches user information from the relevant musdb API: -// https://demo.museum-digital.org/musdb/swagger/#/user/userReadOwnData -func getUserInformation(instanceUrl string, username string, password string) { - -} - -// Uses musdb's API to generate an access token: -// https://demo.museum-digital.org/musdb/swagger/#/user/userGenerateWebdavAccessToken -// Returns either the token or an error. -func getWebDavAccessToken(instanceUrl string) (string, error) { - -} - diff --git a/src/setup/setup.go b/src/setup/setup.go new file mode 100644 index 0000000..f44e450 --- /dev/null +++ b/src/setup/setup.go @@ -0,0 +1,24 @@ +package setup + +import "gitea.armuli.eu/museum-digital/museum-digital-webdav-uploader/src/configLoader" + +// Fetches user information from the relevant musdb API: +// https://demo.museum-digital.org/musdb/swagger/#/user/userReadOwnData +func getUserInformationFromApi(instanceUrl string, username string, password string) { + +} + +// Uses musdb's API to generate an access token: +// https://demo.museum-digital.org/musdb/swagger/#/user/userGenerateWebdavAccessToken +// Returns either the token or an error. +func getWebDavAccessTokenFromApi(instanceUrl string) (string, error) { + +} + +func setup() error { + + // Request input data + + validateInstanceLink() + +}