fix
This commit is contained in:
@@ -4,70 +4,28 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/descrybe/descrybe-v2/apps/api/internal/processing"
|
||||
"github.com/google/uuid"
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
)
|
||||
|
||||
// resolveMySQLDumpPath picks an explicit path, else the first readable candidate
|
||||
// under common local locations documented in scripts/seed/README.txt.
|
||||
// resolveMySQLDumpPath delegates to processing (shared with admin Sync A1).
|
||||
func resolveMySQLDumpPath(explicit string) string {
|
||||
if p := strings.TrimSpace(explicit); p != "" {
|
||||
if st, err := os.Stat(p); err == nil && !st.IsDir() {
|
||||
return p
|
||||
}
|
||||
log.Printf("warning: mysql dump not found at %q — trying auto-detect", p)
|
||||
}
|
||||
for _, c := range mysqlDumpCandidates() {
|
||||
if strings.TrimSpace(explicit) != "" && filepath.Clean(c) == filepath.Clean(strings.TrimSpace(explicit)) {
|
||||
continue
|
||||
}
|
||||
if st, err := os.Stat(c); err == nil && !st.IsDir() {
|
||||
return c
|
||||
}
|
||||
}
|
||||
return ""
|
||||
return processing.ResolveMySQLDumpPath(explicit)
|
||||
}
|
||||
|
||||
func mysqlDumpCandidates() []string {
|
||||
var out []string
|
||||
if v := strings.TrimSpace(os.Getenv("SEED_A1_MYSQL_DUMP")); v != "" {
|
||||
out = append(out, v)
|
||||
}
|
||||
home, _ := os.UserHomeDir()
|
||||
names := []string{
|
||||
"descrybe_new (1).sql",
|
||||
"descrybe_new.sql",
|
||||
"descrybe_new(1).sql",
|
||||
}
|
||||
if home != "" {
|
||||
for _, n := range names {
|
||||
out = append(out, filepath.Join(home, "Downloads", n))
|
||||
out = append(out, filepath.Join(home, "downloads", n))
|
||||
}
|
||||
}
|
||||
// Repo-relative guesses (cwd may be apps/api or repo root).
|
||||
for _, n := range names {
|
||||
out = append(out,
|
||||
n,
|
||||
filepath.Join("..", "..", n),
|
||||
filepath.Join("scripts", "seed", n),
|
||||
filepath.Join("..", "..", "scripts", "seed", n),
|
||||
)
|
||||
}
|
||||
return out
|
||||
return processing.MySQLDumpCandidates()
|
||||
}
|
||||
|
||||
type mappedCoverage struct {
|
||||
Total int
|
||||
WithDesc int
|
||||
WithCat int
|
||||
WithAttrs int
|
||||
Processed int
|
||||
Jobs int
|
||||
Total int
|
||||
WithDesc int
|
||||
WithCat int
|
||||
WithAttrs int
|
||||
Processed int
|
||||
Jobs int
|
||||
}
|
||||
|
||||
func (c mappedCoverage) pct(n int) float64 {
|
||||
|
||||
Reference in New Issue
Block a user