fix LinkOrCopy

converter/pdf.go

@@ -6,6 +6,7 @@ package converter
 
 import (
 	"bytes"
+	"context"
 	"crypto/sha256"
 	"encoding/base64"
 	"encoding/gob"
@@ -21,10 +22,8 @@ import (
 	"sync"
 	"unicode/utf16"
 
-	"context"
-
+	"github.com/google/renameio/v2"
 	"github.com/tgulacsi/go/pdf"
-	"github.com/tgulacsi/go/temp"
 )
 
 var popplerOk = map[string]string{"pdfinfo": "", "pdfseparate": "", "pdfunite": ""}
@@ -286,11 +285,27 @@ func PdfSplit(ctx context.Context, srcfn string, pages []uint16) (filenames []st
 
 // PdfMerge merges pdf files into destfn
 func PdfMerge(ctx context.Context, destfn string, filenames ...string) error {
+	logger.Debug("PdfMerge", "filenames", len(filenames))
 	if len(filenames) == 0 {
 		return errors.New("filenames required")
 	} else if len(filenames) == 1 {
-		os.Remove(destfn)
-		return temp.LinkOrCopy(filenames[0], destfn)
+		if err := os.Link(filenames[0], destfn); err == nil {
+			return nil
+		}
+		sfh, err := os.Open(filenames[0])
+		if err != nil {
+			return err
+		}
+		defer sfh.Close()
+		dfh, err := renameio.NewPendingFile(destfn)
+		if err != nil {
+			return err
+		}
+		defer dfh.Close()
+		if _, err = io.Copy(dfh, sfh); err != nil {
+			return err
+		}
+		return dfh.CloseAtomicallyReplace()
 	}
 	err := pdfMerge(ctx, destfn, filenames...)
 	if err == nil {

converter/text.go

@@ -5,9 +5,8 @@
 package converter
 
 import (
-	"io"
-
 	"context"
+	"io"
 
 	"github.com/tgulacsi/go/text"
 )

main.go

@@ -207,6 +207,7 @@ func Main() error {
 	if err := appCmd.Parse(os.Args[1:]); err != nil {
 		return err
 	}
+	logger = zlog.NewLogger(zl).SLog()
 	converter.SetLogger(logger)
 
 	var closeLogfile func() error

pdfmerge.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log/slog"
 	"net/http"
 	"os"
 	"sort"
@@ -26,10 +27,10 @@ var pdfMergeServer = kithttp.NewServer(
 )
 
 func pdfMergeDecode(ctx context.Context, r *http.Request) (interface{}, error) {
-	logger := logger.With("fn", "pdfMergeDecode")
+	logger := logger.With(slog.String("fn", "pdfMergeDecode"))
 	inputs, err := getRequestFiles(r)
 	if err != nil {
-		logger.Error( "getRequestFiles", "error", err)
+		logger.Error("getRequestFiles", "error", err)
 		return nil, err
 	}
 	req := pdfMergeRequest{Inputs: inputs}
@@ -80,7 +81,7 @@ func pdfMergeEP(ctx context.Context, request interface{}) (response interface{},
 	for i, f := range req.Inputs {
 		tfh, err := readerToFile(f.ReadCloser, f.Filename)
 		if err != nil {
-			logger.Error( "readerToFile", "file", f.Filename, "error", err)
+			logger.Error("readerToFile", "file", f.Filename, "error", err)
 			return nil, fmt.Errorf("error saving %q: %w", f.Filename, err)
 		}
 		tbd = append(tbd, tfh.Cleanup)
@@ -94,18 +95,18 @@ func pdfMergeEP(ctx context.Context, request interface{}) (response interface{},
 
 	dst, err := tempFilename("pdfmerge-")
 	if err != nil {
-		logger.Error( "tempFilename", "error", err)
+		logger.Error("tempFilename", "error", err)
 		return nil, err
 	}
 	defer os.Remove(dst)
 	logger.Info("PdfMerge", "dst", dst, "filenames", filenames)
 	if err = converter.PdfMerge(ctx, dst, filenames...); err != nil {
-		logger.Error( "PdfMerge", "dst", dst, "filenames", filenames, "error", err)
+		logger.Error("PdfMerge", "dst", dst, "filenames", filenames, "error", err)
 		return nil, err
 	}
 	f, err := os.Open(dst)
 	if err != nil {
-		logger.Error( "Open(dst)", "dst", dst, "error", err)
+		logger.Error("Open(dst)", "dst", dst, "error", err)
 		return nil, err
 	}
 	return f, nil
@@ -117,7 +118,7 @@ func pdfMergeEncode(ctx context.Context, w http.ResponseWriter, response interfa
 		Stat() (os.FileInfo, error)
 	}); ok {
 		if fi, err := f.Stat(); err != nil {
-			logger.Error( "response file Stat", "error", err)
+			logger.Error("response file Stat", "error", err)
 		} else {
 			w.Header().Set("Content-Length", fmt.Sprintf("%d", fi.Size()))
 		}

server.go

@@ -126,12 +126,12 @@ func prepareContext(ctx context.Context, r *http.Request) context.Context {
 	ctx = SetRequestID(ctx, "")
 	lgr := getLogger(ctx)
 	lgr = lgr.With(
-		"reqID", GetRequestID(ctx),
-		"path", r.URL.Path,
-		"method", r.Method,
+		slog.String("reqID", GetRequestID(ctx)),
+		slog.String("path", r.URL.Path),
+		slog.String("method", r.Method),
 	)
 	if host, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
-		lgr = lgr.With("ip", host)
+		lgr = lgr.With(slog.String("ip", host))
 	}
 	ctx = zlog.NewSContext(ctx, lgr)
 	logAccept(ctx, r)