Merge pull request #148 from x-motemen/fix-fetch

[bugfix] fix fetch subcommand

main.go

@@ -111,27 +111,24 @@ 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
 			}
 			blogID, err := e.blogID()
 			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
 			}
 		}

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)
 		}