From 08a31a5f197b9cc328ee9e9c5720104d0bd401d6 Mon Sep 17 00:00:00 2001
From: Songmu <y.songmu@gmail.com>
Date: Mon, 13 Nov 2023 02:07:10 +0900
Subject: [PATCH] [bugfix] fix fetch

---
 main.go      | 15 ++++++---------
 main_test.go |  6 +++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/main.go b/main.go
index 764a6ef..e90091e 100644
--- a/main.go
+++ b/main.go
@@ -111,13 +111,7 @@ var commandFetch = &cli.Command{
 			return err
 		}
 		for _, path := range c.Args().Slice() {
-			f, err := os.Open(path)
-			if err != nil {
-				return err
-			}
-			defer f.Close()
-
-			e, err := entryFromReader(f)
+			e, err := entryFromFile(path)
 			if err != nil {
 				return err
 			}
@@ -125,13 +119,16 @@ var commandFetch = &cli.Command{
 			if err != nil {
 				return err
 			}
-
 			bc := conf.Get(blogID)
 			if bc == nil {
 				return fmt.Errorf("cannot find blog for %s", path)
 			}
 			b := newBroker(bc, c.App.Writer)
-			if _, err := b.StoreFresh(e, path); err != nil {
+			re, err := asEntry(b.GetEntry(e.EditURL))
+			if err != nil {
+				return err
+			}
+			if _, err := b.StoreFresh(re, path); err != nil {
 				return err
 			}
 		}
diff --git a/main_test.go b/main_test.go
index 9247c31..b169fce 100644
--- a/main_test.go
+++ b/main_test.go
@@ -153,7 +153,11 @@ func TestBlogsync(t *testing.T) {
 		if err := appendFile(movedPath, "updated\n"); err != nil {
 			t.Fatal(err)
 		}
-		draftFile, err := blogsync("push", entryFile)
+		relPath, err := filepath.Rel(dir, entryFile)
+		if err != nil {
+			t.Fatal(err)
+		}
+		draftFile, err := blogsync("push", relPath)
 		if err != nil {
 			t.Fatal(err)
 		}