Compare commits
8
Commits
29f3ad9576
...
v1.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7c5736b935 | ||
|
|
8f36d4e824 | ||
|
|
f2a7505378 | ||
|
|
7b68c66725 | ||
|
|
0df89bdff0 | ||
|
|
83d6ad5134 | ||
|
|
2355d32766 | ||
|
|
28ca583073 |
No files matched your search
+2
-2
@@ -1,4 +1,4 @@
|
||||
FROM golang:1.22-alpine AS builder
|
||||
FROM golang:1.25-alpine AS builder
|
||||
|
||||
WORKDIR /src
|
||||
COPY go.mod go.sum ./
|
||||
@@ -10,7 +10,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags="-s -w" \
|
||||
|
||||
FROM alpine:3.19
|
||||
|
||||
RUN apk add --no-cache tzdata ca-certificates
|
||||
RUN apk add --no-cache tzdata ca-certificates rsync
|
||||
|
||||
WORKDIR /app
|
||||
COPY --from=builder /out/jukebox .
|
||||
|
||||
@@ -137,6 +137,7 @@ func triggerAutoCopy(cp *copier.Copier, cfg *config.Config, info disk.DiskInfo,
|
||||
DiskID: info.DiskID,
|
||||
MountPath: info.MountPath,
|
||||
MediaPath: mediaPath,
|
||||
DestFolder: cfg.DestFolder,
|
||||
EnabledSources: sources,
|
||||
ReserveFreeGB: cfg.ReserveFreeGB,
|
||||
OverwriteMode: cfg.OverwriteMode,
|
||||
|
||||
@@ -31,6 +31,7 @@ func (s *Server) handleCopyStart(w http.ResponseWriter, r *http.Request) {
|
||||
DiskID: diskInfo.DiskID,
|
||||
MountPath: diskInfo.MountPath,
|
||||
MediaPath: s.deps.MediaPath,
|
||||
DestFolder: cfg.DestFolder,
|
||||
EnabledSources: enabledSources,
|
||||
ReserveFreeGB: cfg.ReserveFreeGB,
|
||||
OverwriteMode: cfg.OverwriteMode,
|
||||
|
||||
@@ -25,6 +25,7 @@ type SourceFolder struct {
|
||||
|
||||
type Config struct {
|
||||
ReserveFreeGB float64 `json:"reserve_free_gb"`
|
||||
DestFolder string `json:"dest_folder"`
|
||||
Sources []SourceFolder `json:"sources"`
|
||||
OverwriteMode OverwriteMode `json:"overwrite_mode"`
|
||||
FileSelectMode FileSelectMode `json:"file_select_mode"`
|
||||
@@ -34,6 +35,7 @@ type Config struct {
|
||||
func defaults() Config {
|
||||
return Config{
|
||||
ReserveFreeGB: 2.0,
|
||||
DestFolder: "media",
|
||||
OverwriteMode: OverwriteSkip,
|
||||
FileSelectMode: SelectNew,
|
||||
AutoCopy: false,
|
||||
|
||||
+38
-60
@@ -4,8 +4,9 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"math/rand/v2"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
|
||||
@@ -19,6 +20,7 @@ type Options struct {
|
||||
DiskID string
|
||||
MountPath string
|
||||
MediaPath string
|
||||
DestFolder string // subfolder on disk, default "media"
|
||||
EnabledSources []string
|
||||
ReserveFreeGB float64
|
||||
OverwriteMode config.OverwriteMode
|
||||
@@ -39,7 +41,6 @@ func New(tasks *task.Store) *Copier {
|
||||
return &Copier{tasks: tasks}
|
||||
}
|
||||
|
||||
// SetDB replaces the active disk database (called when a disk connects or disconnects).
|
||||
func (c *Copier) SetDB(d *db.DB) {
|
||||
c.dbMu.Lock()
|
||||
c.db = d
|
||||
@@ -65,6 +66,10 @@ func (c *Copier) Start(ctx context.Context, opts Options) (string, error) {
|
||||
return "", errors.New("no disk database available")
|
||||
}
|
||||
|
||||
if opts.DestFolder == "" {
|
||||
opts.DestFolder = "media"
|
||||
}
|
||||
|
||||
t := c.tasks.Create("copy")
|
||||
copyCtx, cancel := context.WithCancel(ctx)
|
||||
c.cancel = cancel
|
||||
@@ -98,9 +103,11 @@ func (c *Copier) run(ctx context.Context, taskID string, opts Options, database
|
||||
|
||||
setStatus(task.StatusRunning, "Подготовка…", 0)
|
||||
|
||||
destRoot := filepath.Join(opts.MountPath, opts.DestFolder)
|
||||
|
||||
if opts.OverwriteMode == config.OverwriteDelete {
|
||||
setStatus(task.StatusRunning, "Удаление данных с диска…", 0)
|
||||
if err := deleteOurData(opts.MountPath); err != nil {
|
||||
if err := os.RemoveAll(destRoot); err != nil {
|
||||
fail(err)
|
||||
return
|
||||
}
|
||||
@@ -128,6 +135,9 @@ func (c *Copier) run(ctx context.Context, taskID string, opts Options, database
|
||||
return
|
||||
}
|
||||
|
||||
// случайный порядок — выбираем что копировать до начала копирования
|
||||
rand.Shuffle(len(files), func(i, j int) { files[i], files[j] = files[j], files[i] })
|
||||
|
||||
_, free, err := disk.DiskUsage(opts.MountPath)
|
||||
if err != nil {
|
||||
fail(err)
|
||||
@@ -154,15 +164,18 @@ func (c *Copier) run(ctx context.Context, taskID string, opts Options, database
|
||||
}
|
||||
|
||||
if f.size > available {
|
||||
// файл не влезает — пробуем следующий
|
||||
continue
|
||||
}
|
||||
|
||||
msg := fmt.Sprintf("Копирование %s (%d/%d)", filepath.Base(f.srcAbs), i+1, total)
|
||||
prog := int(float64(i+1) / float64(total) * 100)
|
||||
msg := fmt.Sprintf("Копирование %s (%d/%d)", filepath.Base(f.srcAbs), i+1, total)
|
||||
setStatus(task.StatusRunning, msg, prog)
|
||||
|
||||
dstAbs := filepath.Join(opts.MountPath, f.relPath)
|
||||
if err := copyFile(ctx, f.srcAbs, dstAbs); err != nil {
|
||||
// destination mirrors source structure under destRoot
|
||||
dstAbs := filepath.Join(destRoot, f.relPath)
|
||||
|
||||
if err := rsyncFile(ctx, f.srcAbs, dstAbs); err != nil {
|
||||
if errors.Is(err, context.Canceled) {
|
||||
c.tasks.Update(taskID, func(t *task.Task) {
|
||||
t.Status = task.StatusCanceled
|
||||
@@ -187,7 +200,7 @@ func (c *Copier) run(ctx context.Context, taskID string, opts Options, database
|
||||
|
||||
type fileEntry struct {
|
||||
srcAbs string
|
||||
relPath string
|
||||
relPath string // relative to /media
|
||||
size int64
|
||||
}
|
||||
|
||||
@@ -217,64 +230,29 @@ func buildFileList(mediaPath string, sources []string, skip map[string]struct{})
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func deleteOurData(mountPath string) error {
|
||||
entries, err := os.ReadDir(mountPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, e := range entries {
|
||||
if e.Name() == ".jukebox" {
|
||||
continue
|
||||
}
|
||||
if err := os.RemoveAll(filepath.Join(mountPath, e.Name())); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func copyFile(ctx context.Context, src, dst string) error {
|
||||
// rsyncFile copies src to dst using rsync with resume support.
|
||||
// --partial keeps partial files on interruption.
|
||||
// --append-verify resumes partial transfers and verifies checksums.
|
||||
func rsyncFile(ctx context.Context, src, dst string) error {
|
||||
if err := os.MkdirAll(filepath.Dir(dst), 0o755); err != nil {
|
||||
return err
|
||||
}
|
||||
in, err := os.Open(src)
|
||||
cmd := exec.CommandContext(ctx, "rsync",
|
||||
"--partial",
|
||||
"--append-verify",
|
||||
"--times",
|
||||
"--no-perms",
|
||||
"--no-owner",
|
||||
"--no-group",
|
||||
"--chmod=ugo=rwx",
|
||||
src, dst,
|
||||
)
|
||||
out, err := cmd.CombinedOutput()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer in.Close()
|
||||
|
||||
tmp := dst + ".juketmp"
|
||||
out, err := os.Create(tmp)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
buf := make([]byte, 512*1024)
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
out.Close()
|
||||
os.Remove(tmp)
|
||||
if ctx.Err() != nil {
|
||||
return ctx.Err()
|
||||
default:
|
||||
}
|
||||
n, readErr := in.Read(buf)
|
||||
if n > 0 {
|
||||
if _, werr := out.Write(buf[:n]); werr != nil {
|
||||
out.Close()
|
||||
os.Remove(tmp)
|
||||
return werr
|
||||
}
|
||||
}
|
||||
if errors.Is(readErr, io.EOF) {
|
||||
break
|
||||
}
|
||||
if readErr != nil {
|
||||
out.Close()
|
||||
os.Remove(tmp)
|
||||
return readErr
|
||||
}
|
||||
return fmt.Errorf("rsync: %w: %s", err, out)
|
||||
}
|
||||
out.Close()
|
||||
return os.Rename(tmp, dst)
|
||||
return nil
|
||||
}
|
||||
+83
-12
@@ -1,20 +1,91 @@
|
||||
#!/bin/sh
|
||||
# Build a Docker image. If an image name is provided, builds multi-arch and pushes to registry.
|
||||
# Otherwise builds locally for the current platform only.
|
||||
#
|
||||
# Usage (interactive):
|
||||
# ./ops/build-image.sh
|
||||
#
|
||||
# Usage (non-interactive):
|
||||
# ./ops/build-image.sh <tag> [image]
|
||||
#
|
||||
# Examples:
|
||||
# ./ops/build-image.sh # prompts for tag and image
|
||||
# ./ops/build-image.sh v1.0 # prompts for image
|
||||
# ./ops/build-image.sh v1.0 registry.example.com/org/myapp # local only (no push)
|
||||
# ./ops/build-image.sh v1.0 "" # local build, no push
|
||||
|
||||
set -eu
|
||||
|
||||
ROOT_DIR=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
|
||||
|
||||
if ! command -v docker >/dev/null 2>&1; then
|
||||
echo "docker not found in PATH" >&2
|
||||
exit 1
|
||||
die() { echo "error: $*" >&2; exit 1; }
|
||||
|
||||
command -v docker >/dev/null 2>&1 || die "docker not found in PATH"
|
||||
|
||||
DEFAULT_TAG=$(git -C "${ROOT_DIR}" rev-parse --short HEAD 2>/dev/null || echo dev)
|
||||
|
||||
ask() {
|
||||
# $1=varname $2=prompt $3=default
|
||||
if [ -n "$3" ]; then
|
||||
printf "%s [%s]: " "$2" "$3" >&2
|
||||
else
|
||||
printf "%s (leave empty to build locally only): " "$2" >&2
|
||||
fi
|
||||
read -r _val
|
||||
eval "$1=\"\${_val:-$3}\""
|
||||
}
|
||||
|
||||
if [ $# -ge 2 ]; then
|
||||
IMAGE_TAG="$1"
|
||||
IMAGE="$2"
|
||||
elif [ $# -ge 1 ]; then
|
||||
IMAGE_TAG="$1"
|
||||
ask IMAGE "Image" ""
|
||||
else
|
||||
ask IMAGE_TAG "Tag" "${DEFAULT_TAG}"
|
||||
ask IMAGE "Image" ""
|
||||
fi
|
||||
|
||||
IMAGE_NAME=${IMAGE_NAME:-jukebox-maker}
|
||||
DEFAULT_TAG=$(git -C "${ROOT_DIR}" rev-parse --short HEAD 2>/dev/null || echo dev)
|
||||
IMAGE_TAG=${1:-${IMAGE_TAG:-${DEFAULT_TAG}}}
|
||||
if [ -n "${IMAGE}" ]; then
|
||||
# multi-arch build + push
|
||||
docker buildx version >/dev/null 2>&1 || die "docker buildx not available"
|
||||
|
||||
echo "building ${IMAGE_NAME}:${IMAGE_TAG}"
|
||||
docker build \
|
||||
-f "${ROOT_DIR}/Dockerfile" \
|
||||
-t "${IMAGE_NAME}:${IMAGE_TAG}" \
|
||||
-t "${IMAGE_NAME}:latest" \
|
||||
"${ROOT_DIR}"
|
||||
PLATFORMS="${PLATFORMS:-linux/amd64,linux/arm64}"
|
||||
BUILDER_NAME="jukebox-multiarch"
|
||||
|
||||
if ! docker buildx inspect "${BUILDER_NAME}" >/dev/null 2>&1; then
|
||||
echo "creating buildx builder: ${BUILDER_NAME}"
|
||||
docker buildx create \
|
||||
--name "${BUILDER_NAME}" \
|
||||
--driver docker-container \
|
||||
--bootstrap
|
||||
fi
|
||||
docker buildx use "${BUILDER_NAME}"
|
||||
|
||||
echo "building and pushing ${IMAGE}:${IMAGE_TAG} (${PLATFORMS})"
|
||||
docker buildx build \
|
||||
--platform "${PLATFORMS}" \
|
||||
--file "${ROOT_DIR}/Dockerfile" \
|
||||
-t "${IMAGE}:${IMAGE_TAG}" \
|
||||
-t "${IMAGE}:latest" \
|
||||
--push \
|
||||
"${ROOT_DIR}"
|
||||
|
||||
echo ""
|
||||
echo "pushed:"
|
||||
echo " ${IMAGE}:${IMAGE_TAG}"
|
||||
echo " ${IMAGE}:latest"
|
||||
else
|
||||
# local build only
|
||||
echo "building locally (no push)"
|
||||
docker build \
|
||||
--file "${ROOT_DIR}/Dockerfile" \
|
||||
-t "jukebox-maker:${IMAGE_TAG}" \
|
||||
-t "jukebox-maker:latest" \
|
||||
"${ROOT_DIR}"
|
||||
|
||||
echo ""
|
||||
echo "built:"
|
||||
echo " jukebox-maker:${IMAGE_TAG}"
|
||||
echo " jukebox-maker:latest"
|
||||
fi
|
||||
@@ -30,13 +30,19 @@
|
||||
<span class="form-hint">«Только новые» — пропускает файлы, уже скопированные на данный диск, даже если они были удалены с него (считаются просмотренными).</span>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="destFolder">Папка назначения на диске</label>
|
||||
<input class="form-input" type="text" id="destFolder" placeholder="media" style="width:200px">
|
||||
<span class="form-hint">Подпапка на диске куда копировать файлы. Структура источника воспроизводится внутри неё. По умолчанию: <code>media</code>.</span>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="overwriteMode">Режим записи</label>
|
||||
<select class="form-select" id="overwriteMode" style="width:auto;max-width:420px">
|
||||
<option value="skip">Пропустить существующие файлы</option>
|
||||
<option value="delete">Удалить наши данные с диска и перезаписать заново</option>
|
||||
<option value="delete">Удалить папку назначения и перезаписать заново</option>
|
||||
</select>
|
||||
<span class="form-hint">«Удалить и перезаписать» — удаляет с диска всё кроме папки .jukebox, затем копирует заново.</span>
|
||||
<span class="form-hint">«Удалить и перезаписать» — удаляет папку назначения на диске, затем копирует заново.</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -98,6 +104,7 @@ async function loadSettings() {
|
||||
if (!r.ok) return;
|
||||
const cfg = await r.json();
|
||||
document.getElementById('reserveGB').value = cfg.reserve_free_gb ?? 2;
|
||||
document.getElementById('destFolder').value = cfg.dest_folder || 'media';
|
||||
document.getElementById('fileSelectMode').value = cfg.file_select_mode || 'new';
|
||||
document.getElementById('overwriteMode').value = cfg.overwrite_mode || 'skip';
|
||||
document.getElementById('autoCopy').checked = !!cfg.auto_copy;
|
||||
@@ -116,6 +123,7 @@ async function saveSettings(e) {
|
||||
});
|
||||
const body = {
|
||||
reserve_free_gb: parseFloat(document.getElementById('reserveGB').value) || 2,
|
||||
dest_folder: document.getElementById('destFolder').value.trim() || 'media',
|
||||
file_select_mode: document.getElementById('fileSelectMode').value,
|
||||
overwrite_mode: document.getElementById('overwriteMode').value,
|
||||
auto_copy: document.getElementById('autoCopy').checked,
|
||||
|
||||
Reference in new issue
Block a user