mirror of
https://github.com/httprunner/httprunner.git
synced 2026-05-12 02:21:29 +08:00
f5f6d177ab
- Implement lazy loading for directory creation in config.go - Add logFile parameter to InitLogger for better control - Use dynamic directory existence check instead of flags - Report command now uses console-only logging to prevent directory creation - Support both JSON and colorized console output formats - Maintain backward compatibility for all other commands Changes: - config.go: Convert directory paths to getter methods with lazy creation - logger.go: Add logFile parameter and improve logging control - cmd/root.go: Detect report command and disable file logging - uixt/*: Update all references to use new getter methods Fixes the issue where 'hrp report results/' would create unwanted timestamp directories
107 lines
2.9 KiB
Go
107 lines
2.9 KiB
Go
package config
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/rs/zerolog/log"
|
|
|
|
"github.com/httprunner/httprunner/v5/internal/builtin"
|
|
)
|
|
|
|
const (
|
|
ResultsDirName = "results"
|
|
DownloadsDirName = "downloads"
|
|
ScreenshotsDirName = "screenshots"
|
|
ActionLogDirName = "action_log"
|
|
)
|
|
|
|
type Config struct {
|
|
RootDir string
|
|
ResultsDir string
|
|
resultsPath string
|
|
downloadsPath string
|
|
screenShotsPath string
|
|
StartTime time.Time
|
|
ActionLogFilePath string
|
|
DeviceActionLogFilePath string
|
|
mu sync.Mutex
|
|
}
|
|
|
|
var (
|
|
globalConfig *Config
|
|
getConfigOnce sync.Once
|
|
)
|
|
|
|
func GetConfig() *Config {
|
|
getConfigOnce.Do(func() {
|
|
cfg := &Config{
|
|
StartTime: time.Now(),
|
|
}
|
|
|
|
var err error
|
|
cfg.RootDir, err = os.Getwd()
|
|
if err != nil {
|
|
log.Fatal().Err(err).Msg("get current working directory failed")
|
|
}
|
|
|
|
startTimeStr := cfg.StartTime.Format("20060102150405")
|
|
cfg.ResultsDir = filepath.Join(ResultsDirName, startTimeStr)
|
|
cfg.resultsPath = filepath.Join(cfg.RootDir, cfg.ResultsDir)
|
|
cfg.downloadsPath = filepath.Join(cfg.RootDir, filepath.Join(DownloadsDirName, startTimeStr))
|
|
cfg.screenShotsPath = filepath.Join(cfg.resultsPath, ScreenshotsDirName)
|
|
cfg.ActionLogFilePath = filepath.Join(cfg.ResultsDir, ActionLogDirName)
|
|
cfg.DeviceActionLogFilePath = "/sdcard/Android/data/io.appium.uiautomator2.server/files/hodor"
|
|
|
|
globalConfig = cfg
|
|
})
|
|
|
|
return globalConfig
|
|
}
|
|
|
|
// ResultsPath returns the results path and creates the directory if it doesn't exist
|
|
func (c *Config) ResultsPath() string {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
|
|
// Check if directory exists, create if it doesn't
|
|
if _, err := os.Stat(c.resultsPath); os.IsNotExist(err) {
|
|
if err := builtin.EnsureFolderExists(c.resultsPath); err != nil {
|
|
log.Error().Err(err).Str("path", c.resultsPath).Msg("failed to create results directory")
|
|
} else {
|
|
log.Info().Str("path", c.resultsPath).Msg("create folder")
|
|
}
|
|
}
|
|
return c.resultsPath
|
|
}
|
|
|
|
// DownloadsPath returns the downloads path and creates the directory if it doesn't exist
|
|
func (c *Config) DownloadsPath() string {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
|
|
// Check if directory exists, create if it doesn't
|
|
if _, err := os.Stat(c.downloadsPath); os.IsNotExist(err) {
|
|
if err := builtin.EnsureFolderExists(c.downloadsPath); err != nil {
|
|
log.Error().Err(err).Str("path", c.downloadsPath).Msg("failed to create downloads directory")
|
|
}
|
|
}
|
|
return c.downloadsPath
|
|
}
|
|
|
|
// ScreenShotsPath returns the screenshots path and creates the directory if it doesn't exist
|
|
func (c *Config) ScreenShotsPath() string {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
|
|
// Check if directory exists, create if it doesn't
|
|
if _, err := os.Stat(c.screenShotsPath); os.IsNotExist(err) {
|
|
if err := builtin.EnsureFolderExists(c.screenShotsPath); err != nil {
|
|
log.Error().Err(err).Str("path", c.screenShotsPath).Msg("failed to create screenshots directory")
|
|
}
|
|
}
|
|
return c.screenShotsPath
|
|
}
|