Added more path gen code.

Author: jnbdz

location/location.go

@@ -1,10 +1,14 @@
 package location
 
 import (
+	"errors"
 	"fmt"
-	"github.com/adrg/xdg"
+	"os"
 	"path/filepath"
 	"runtime"
+
+	"github.com/AmadlaOrg/LibraryUtils/file"
+	"github.com/adrg/xdg"
 )
 
 type ILocation interface {
@@ -19,9 +23,10 @@ type ILocation interface {
 	MakePaths(paths AbsPaths) error*/
 }
 type SLocation struct {
-	appName    string
-	appVersion string
-	paths      *Paths
+	appName         AppName
+	appVersion      AppVersion
+	pluginTypeNames PluginTypeNames
+	paths           *Paths
 }
 
 //const perm os.FileMode = os.ModePerm
@@ -44,7 +49,11 @@ var (
 )
 
 // setSystemPaths
-func (service *SLocation) setSystemPaths() {
+func (service *SLocation) setSystemPaths() error {
+	service.paths.ThisApplicationPaths.Name = service.appName
+	//
+	// System
+	//
 	sysPaths := &SystemPaths{
 		Home:            xdg.Home,
 		DataHome:        xdg.DataHome,
@@ -65,49 +74,77 @@ func (service *SLocation) setSystemPaths() {
 		runtime.GOOS != "plan9" {
 		sysPaths.UserLocalHome = filepath.Join(xdg.DataHome, ".local")
 		sysPaths.UserApplicationsHome = filepath.Join(xdg.DataHome, "applications")
+
+		if !file.Exists(sysPaths.UserApplicationsHome) {
+			var existApplicationsPath string
+			for _, applicationsPath := range xdg.ApplicationDirs {
+				if file.Exists(applicationsPath) {
+					existApplicationsPath = applicationsPath
+					break
+				}
+			}
+			if existApplicationsPath != "" {
+				sysPaths.UserApplicationsHome = existApplicationsPath
+			} else {
+				return errors.New("applications directory not found")
+			}
+		}
 	}
 
 	service.paths.SystemPaths = sysPaths
 
-	relPath := fmt.Sprintf("%s/%s", service.appName, service.appName)
+	relFilePath := fmt.Sprintf("%s/%s", service.appName, service.appName)
 
-	filePath, err := xdgCacheFile(relPath + ".cache")
+	dataDir, err := xdgDataFile(string(service.appName))
 	if err != nil {
-		return
+		return errors.Join(fmt.Errorf(`xdg.DataFile was unable to set "%s" path`, dataDir), err)
 	}
+	service.paths.ThisApplicationPaths.Paths.DataHome = dataDir
 
-	file, err := xdgConfigFile(relPath + ".yaml")
+	configFile, err := xdgConfigFile(relFilePath + ".yaml")
 	if err != nil {
-		return
+		return errors.Join(fmt.Errorf(`xdg.ConfigFile was unable to set "%s" path`, configFile), err)
 	}
+	service.paths.ThisApplicationPaths.Paths.ConfigFile = filepath.Dir(configFile)
 
-	tmpSecrets, err := xdgRuntimeFile(relPath + "/secrets")
+	stateDir, err := xdg.StateFile(string(service.appName))
 	if err != nil {
-		return
+		return errors.Join(fmt.Errorf(`xdg.StateFile was unable to set "%s" path`, stateDir), err)
 	}
+	service.paths.ThisApplicationPaths.Paths.StateHome = stateDir
 
-	tmpSecretsMTls, err := xdgRuntimeFile(relPath + "/secrets/mTLS")
+	cacheFilePath, err := xdgCacheFile(relFilePath + ".cache")
 	if err != nil {
-		return
+		return errors.Join(fmt.Errorf(`xdg.CacheFile was unable to set "%s" path`, cacheFilePath), err)
 	}
+	service.paths.ThisApplicationPaths.Paths.CacheHome = filepath.Dir(cacheFilePath)
+	service.paths.ThisApplicationPaths.Paths.CacheFile = cacheFilePath
+
+	service.paths.ThisApplicationPaths.Paths.BinFile = fmt.Sprintf("%s/%s", xdg.BinHome, service.appName)
+
+	//for _, pluginTypeName := range service.
 
-	dataFile, err := xdgDataFile(relPath)
+	service.paths.ThisApplicationPaths.Paths.PluginsHome = xdg.DataHome + "/plugins"
+
+	//
+	// Secrets
+	//
+	secretsRelPath := fmt.Sprintf("%s/%s", service.appName, "/secrets")
+
+	tmpSecrets, err := xdgRuntimeFile(secretsRelPath)
 	if err != nil {
-		return
+		return errors.Join(fmt.Errorf(`xdg.RuntimeFile was unable to set "%s" path`, tmpSecrets), err)
 	}
+	service.paths.ThisApplicationPaths.Paths.RuntimeDir = filepath.Dir(tmpSecrets)
+	service.paths.ThisApplicationPaths.Paths.SecretsHome = tmpSecrets
 
-	service.paths.ThisApplicationPaths.Name = service.appName
-	service.paths.ThisApplicationPaths.Paths.SecretsPaths.SecretsHome = tmpSecrets
-	service.paths.ThisApplicationPaths.Paths.SecretsPaths.SecretsHome = tmpSecretsMTls
-	//service.paths.ThisApplicationPaths.Paths.
-
-	/*xdg.RuntimeFile(relPath + "socket")
+	tmpSecretsMTls, err := xdgRuntimeFile(secretsRelPath + "/mTLS")
+	if err != nil {
+		return errors.Join(fmt.Errorf(`xdg.RuntimeFile was unable to set "%s" path`, tmpSecrets), err)
+	}
+	service.paths.ThisApplicationPaths.Paths.MTLSHome = tmpSecretsMTls
 
-	xdg.SearchCacheFile()
-	xdg.SearchConfigFile()
-	xdg.SearchDataFile()
-	xdg.SearchRuntimeFile()
-	xdg.SearchStateFile()*/
+	return nil
 }
 
 // SystemPaths returns struct of all systems paths

location/service.go

@@ -1,25 +1,24 @@
 // Package location 📍
 package location
 
-import (
-	"fmt"
-	"path/filepath"
-)
-
 // NewLocationService to set up the location service.
 //
 // Params:
 // - 📇 appName - Is the of the application (normally all lowercase).
 // - ♻️ appVersion - The version of the application.
-// - 💊 pluginTypeName - The plugin type name (e.g.: HERY => entity, doorman => clerk).
-func NewLocationService(appName, appVersion, pluginTypeName string) ILocation {
+// - 💊 pluginTypeName - The plugin type names (e.g.: HERY => entity, doorman => clerk).
+func NewLocationService(appName AppName, appVersion AppVersion, pluginTypeNames PluginTypeNames) (ILocation, error) {
 	serviceLocation := &SLocation{
-		appName:    appName,
-		appVersion: appVersion,
+		appName:         appName,
+		appVersion:      appVersion,
+		pluginTypeNames: pluginTypeNames,
 	}
 
 	// Set
-	serviceLocation.setSystemPaths()
+	err := serviceLocation.setSystemPaths()
+	if err != nil {
+		return nil, err
+	}
 
 	sysPaths := serviceLocation.paths.SystemPaths
 
@@ -43,12 +42,12 @@ func NewLocationService(appName, appVersion, pluginTypeName string) ILocation {
 	if sysPaths.BinHome == "" {
 	}*/
 
-	appDataHome := filepath.Join(sysPaths.DataHome, appName)
+	/*appDataHome := filepath.Join(sysPaths.DataHome, appName)
 	appConfigHome := filepath.Join(sysPaths.ConfigHome, appName)
 	appStateHome := filepath.Join(sysPaths.StateHome, appName)
 	appCacheHome := filepath.Join(sysPaths.CacheHome, appName)
 	appRuntimeDir := filepath.Join(sysPaths.RuntimeDir, appName)
-	appBinHome := filepath.Join(sysPaths.BinHome, appName)
+	appBinHome := filepath.Join(sysPaths.BinHome, appName)*/
 
 	// TODO: Validate them
 
@@ -57,7 +56,7 @@ func NewLocationService(appName, appVersion, pluginTypeName string) ILocation {
 			SystemPaths: sysPaths,
 			ThisApplicationPaths: &Application{
 				Name: appName,
-				Paths: &ApplicationPaths{
+				/*Paths: &ApplicationPaths{
 					DataHome:   appDataHome,
 					ConfigHome: appConfigHome,
 					StateHome:  appStateHome,
@@ -79,8 +78,8 @@ func NewLocationService(appName, appVersion, pluginTypeName string) ILocation {
 						"applications",
 						fmt.Sprintf("%s.desktop", appName),
 					),
-				},
+				},*/
 			},
 		},
-	}
+	}, nil
 }

location/types.go

@@ -5,6 +5,12 @@ import (
 	"github.com/adrg/xdg"
 )
 
+// PluginTypeNames
+// TODO: Should be moved to the plugin package
+type PluginTypeNames []string
+type AppName string
+type AppVersion string
+
 // Paths 🛣️ contains all the paths
 type Paths struct {
 	// 🤖 SystemPaths contains the struct of the system paths
@@ -182,13 +188,13 @@ type AmadlaPaths struct {
 
 // Application contains the specific paths and name/title of an application
 type Application struct {
-	Name  string
-	Paths *ApplicationPaths
+	Name            AppName
+	PluginTypeNames PluginTypeNames
+	Paths           *ApplicationPaths
 }
 
 // ApplicationPaths contains all the path
 type ApplicationPaths struct {
-
 	//
 	// Section: Basic
 	//
@@ -248,14 +254,13 @@ type ApplicationPaths struct {
 	// - 🪟 Windows: C:\Users\Username\AppData\Roaming (%APPDATA%)
 	ConfigFile string
 
-	// TODO:
 	// PluginsHome
 	//
 	// E.g.:
-	// - 🐧 Linux: /home/username/.config/{appName}/plugins.d/
+	// - 🐧 Linux: /home/username/.local/share/{appName}/{pluginTypeName}.d/
 	// - 🍎 Mac OS X:
 	// - 🪟 Windows:
-	PluginsHome string
+	PluginsHome map[string]string
 
 	// CacheFile is a SQLite3 file
 	//
@@ -274,27 +279,10 @@ type ApplicationPaths struct {
 	ApplicationsDesktopFile string
 
 	//
-	// Section: Secrets
+	// Secrets
 	//
 
-	SecretsPaths *SecretsPaths
-
-	/*
-		chmod 600 ~/.config/amadla/private/*.key ~/.config/amadla/mTLS/*.key
-		chmod 644 ~/.config/amadla/certs/*.crt ~/.config/amadla/mTLS/*.crt
-	*/
-
-	//
-	// Temporary
-	//
-
-	// ln -s ~/.local/lib/amadla/amadla ~/.local/bin/amadla
-
-}
-
-// SecretsPaths
-type SecretsPaths struct {
-	// SecretsHome contains the directories and the files for all the secrets the application might need
+	// Home contains the directories and the files for all the secrets the application might need
 	// TODO: What about the tmp?
 	// TODO: Is this the best place what about run directory for tmp secrets?
 	// TODO: Is there other propositions for this?
@@ -306,50 +294,17 @@ type SecretsPaths struct {
 
 	// MTLSHome to be able to connect to `doorman` you need mTLS certification that are assigned temporally by `doorman`
 	//
+	// Note:
+	//
+	// chmod 600 ~/.config/amadla/private/*.key ~/.config/amadla/mTLS/*.key
+	// chmod 644 ~/.config/amadla/certs/*.crt ~/.config/amadla/mTLS/*.crt
+	//
 	// E.g.:
 	// - 🐧 Linux: /home/user/.config/{appName}/secrets/mTLS/
 	// - 🍎 Mac OS X:
 	// - 🪟 Windows:
 	MTLSHome string
-}
-
-type PathName string
-
-const (
-	Home                 PathName = "Home"
-	DataHome             PathName = "DataHome"
-	DataDirs             PathName = "DataDirs"
-	ConfigHome           PathName = "ConfigHome"
-	ConfigDirs           PathName = "ConfigDirs"
-	StateHome            PathName = "StateHome"
-	CacheHome            PathName = "CacheHome"
-	RuntimeDir           PathName = "RuntimeDir"
-	BinHome              PathName = "BinHome"
-	UserDirs             PathName = "UserDirs"
-	FontDirs             PathName = "FontDirs"
-	ApplicationDirs      PathName = "ApplicationDirs"
-	UserApplicationsHome PathName = "UserApplicationsHome"
-)
 
-type AppPathName string
-
-const (
-	AppDataHome                AppPathName = "AppDataHome"
-	AppConfigHome              AppPathName = "AppConfigHome"
-	AppStateHome               AppPathName = "AppStateHome"
-	AppCacheHome               AppPathName = "AppCacheHome"
-	AppRuntimeDir              AppPathName = "AppRuntimeDir"
-	AppBinFile                 AppPathName = "AppBinFile"
-	AppConfigFile              AppPathName = "AppConfigFile"
-	AppPluginsHome             AppPathName = "AppPluginsHome"
-	AppCacheFile               AppPathName = "AppCacheFile"
-	ApplicationsHome           AppPathName = "ApplicationsHome"
-	AppApplicationsDesktopFile AppPathName = "ApplicationsDesktopFile"
-)
-
-type AppSecretsPathName string
+	// ln -s ~/.local/lib/amadla/amadla ~/.local/bin/amadla
 
-const (
-	AppSecretsHome AppSecretsPathName = "AppSecretsHome"
-	MTLSHome       AppSecretsPathName = "MTLSHome"
-)
+}