Centralized defaults into internal/config/defaults.go

internal/artifacts/paths.go

@@ -2,6 +2,8 @@ package artifacts
 
 import (
 	"path/filepath"
+
+	"gitea.maximumdirect.net/eric/narratio/internal/config"
 )
 
 // SessionPaths contains canonical local paths for one session work directory.
@@ -22,34 +24,33 @@ type SessionPaths struct {
 
 // SessionWorkDir returns the work directory for one session.
 func SessionWorkDir(rootDir, sessionID string) string {
-	return filepath.Join(rootDir, "work", sessionID)
+	return filepath.Join(rootDir, config.PathWorkDirSegment, sessionID)
 }
 
 // SessionRunWorkDir returns the campaign/session/run scoped local work directory.
 func SessionRunWorkDir(rootDir, campaign, sessionID, runID string) string {
-	return filepath.Join(rootDir, "work", campaign, sessionID, runID)
+	return filepath.Join(rootDir, config.PathWorkDirSegment, campaign, sessionID, runID)
 }
 
 // SessionSpoolAudioDir returns the campaign/session/run scoped local spool audio path.
 func SessionSpoolAudioDir(spoolRoot, campaign, sessionID, runID string) string {
-	return filepath.Join(spoolRoot, campaign, sessionID, runID, "audio")
+	return filepath.Join(spoolRoot, campaign, sessionID, runID, config.PathAudioDirSegment)
 }
 
 func buildSessionPaths(workspaceRoot, sessionID string) SessionPaths {
 	root := SessionWorkDir(workspaceRoot, sessionID)
-	transcripts := filepath.Join(root, "transcripts")
 	return SessionPaths{
 		WorkspaceRoot:         workspaceRoot,
 		Root:                  root,
-		InputsDir:             filepath.Join(root, "inputs"),
-		AudioDir:              filepath.Join(root, "audio"),
-		TranscriptsDir:        transcripts,
-		TranscriptsRawDir:     filepath.Join(transcripts, "raw"),
-		TranscriptsTrimmedDir: filepath.Join(transcripts, "trimmed"),
-		ArtifactsDir:          filepath.Join(root, "artifacts"),
-		ConfigDir:             filepath.Join(root, "config"),
-		LogsDir:               filepath.Join(root, "logs"),
-		ManifestPath:          filepath.Join(root, "manifest.json"),
-		LockPath:              filepath.Join(root, ".lock"),
+		InputsDir:             filepath.Join(root, config.PathInputsDirSegment),
+		AudioDir:              filepath.Join(root, config.PathAudioDirSegment),
+		TranscriptsDir:        filepath.Join(root, config.PathTranscriptsSegment),
+		TranscriptsRawDir:     filepath.Join(root, filepath.FromSlash(config.PathTranscriptsRaw)),
+		TranscriptsTrimmedDir: filepath.Join(root, filepath.FromSlash(config.PathTranscriptsTrimmed)),
+		ArtifactsDir:          filepath.Join(root, config.PathArtifactsDirSegment),
+		ConfigDir:             filepath.Join(root, config.PathConfigDirSegment),
+		LogsDir:               filepath.Join(root, config.PathLogsDirSegment),
+		ManifestPath:          filepath.Join(root, config.PathManifestFile),
+		LockPath:              filepath.Join(root, config.PathLockFile),
 	}
 }

internal/artifacts/s3_keys.go

@@ -3,6 +3,8 @@ package artifacts
 import (
 	"path"
 	"strings"
+
+	"gitea.maximumdirect.net/eric/narratio/internal/config"
 )
 
 // S3SessionPrefix builds the canonical S3 session prefix.
@@ -10,9 +12,9 @@ import (
 func S3SessionPrefix(rootPrefix, campaign, sessionID string) string {
 	prefix := path.Join(
 		cleanS3PathPart(rootPrefix),
-		"campaigns",
+		config.S3CampaignsSegment,
 		cleanS3PathPart(campaign),
-		"sessions",
+		config.S3SessionsSegment,
 		cleanS3PathPart(sessionID),
 	)
 	return ensureS3TrailingSlash(prefix)
@@ -21,7 +23,7 @@ func S3SessionPrefix(rootPrefix, campaign, sessionID string) string {
 // S3RunPrefix builds the canonical S3 run prefix.
 // Format: {session_prefix}/runs/{run_id}/
 func S3RunPrefix(sessionPrefix, runID string) string {
-	prefix := path.Join(strings.TrimSuffix(cleanS3Key(sessionPrefix), "/"), "runs", cleanS3PathPart(runID))
+	prefix := path.Join(strings.TrimSuffix(cleanS3Key(sessionPrefix), "/"), config.S3RunsSegment, cleanS3PathPart(runID))
 	return ensureS3TrailingSlash(prefix)
 }
 
@@ -35,13 +37,13 @@ func S3AudioPrefix(sessionPrefix, audioPrefix string) string {
 // S3CurrentManifestKey returns the current manifest pointer key.
 // Format: {session_prefix}/current/manifest.json
 func S3CurrentManifestKey(sessionPrefix string) string {
-	return path.Join(strings.TrimSuffix(cleanS3Key(sessionPrefix), "/"), "current", "manifest.json")
+	return path.Join(strings.TrimSuffix(cleanS3Key(sessionPrefix), "/"), config.S3CurrentSegment, config.S3ManifestFile)
 }
 
 // S3CurrentRunPointerKey returns the current run pointer key.
 // Format: {session_prefix}/current/run_id.txt
 func S3CurrentRunPointerKey(sessionPrefix string) string {
-	return path.Join(strings.TrimSuffix(cleanS3Key(sessionPrefix), "/"), "current", "run_id.txt")
+	return path.Join(strings.TrimSuffix(cleanS3Key(sessionPrefix), "/"), config.S3CurrentSegment, config.S3RunIDFile)
 }
 
 // S3PromotedArtifactKey returns the destination key for one promoted artifact.