go-shiori/shiori
1
1
Fork 0
mirror of https://github.com/go-shiori/shiori.git synced 2025-10-04 02:36:47 +08:00
Code Issues Projects Releases Packages Wiki Activity

Make no-archival flags works

Browse source
This commit is contained in:
Radhi Fadlillah 2019-06-10 15:49:54 +07:00
parent e0474d6865
commit a88a25c41a
2 changed files with 42 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
internal/cmd/add.go
View file

@ -29,6 +29,7 @@ func addCmd() *cobra.Command {
cmd.Flags().StringP("excerpt", "e", "", "Custom excerpt for this bookmark")
cmd.Flags().StringSliceP("tags", "t", []string{}, "Comma-separated tags for this bookmark")
cmd.Flags().BoolP("offline", "o", false, "Save bookmark without fetching data from internet")
cmd.Flags().BoolP("no-archival", "a", false, "Save bookmark without creating offline archive")
cmd.Flags().Bool("log-archival", false, "Log the archival process")
return cmd
@ -41,6 +42,7 @@ func addHandler(cmd *cobra.Command, args []string) {
excerpt, _ := cmd.Flags().GetString("excerpt")
tags, _ := cmd.Flags().GetStringSlice("tags")
offline, _ := cmd.Flags().GetBool("offline")
noArchival, _ := cmd.Flags().GetBool("no-archival")
logArchival, _ := cmd.Flags().GetBool("log-archival")
// Clean up URL by removing its fragment and UTM parameters
@ -97,24 +99,30 @@ func addHandler(cmd *cobra.Command, args []string) {
defer resp.Body.Close()
// Save as archive
buffer := bytes.NewBuffer(nil)
var readabilityInput io.Reader = resp.Body
archivePath := fp.Join(DataDir, "archive", fmt.Sprintf("%d", book.ID))
archivalRequest := warc.ArchivalRequest{
URL: url,
Reader: io.TeeReader(resp.Body, buffer),
ContentType: resp.Header.Get("Content-Type"),
LogEnabled: logArchival,
}
if !noArchival {
buffer := bytes.NewBuffer(nil)
err = warc.NewArchive(archivalRequest, archivePath)
if err != nil {
cError.Printf("Failed to create archive: %v\n", err)
return
archivePath := fp.Join(DataDir, "archive", fmt.Sprintf("%d", book.ID))
archivalRequest := warc.ArchivalRequest{
URL: url,
Reader: io.TeeReader(resp.Body, buffer),
ContentType: resp.Header.Get("Content-Type"),
LogEnabled: logArchival,
}
err = warc.NewArchive(archivalRequest, archivePath)
if err != nil {
cError.Printf("Failed to create archive: %v\n", err)
return
}
readabilityInput = buffer
}
// Parse article
article, err := readability.FromReader(buffer, url)
article, err := readability.FromReader(readabilityInput, url)
if err != nil {
cError.Printf("Failed to parse article: %v\n", err)
return

36
internal/cmd/update.go
View file

@ -183,27 +183,33 @@ func updateHandler(cmd *cobra.Command, args []string) {
defer resp.Body.Close()
// Save as archive, make sure to delete the old one first
buffer := bytes.NewBuffer(nil)
var readabilityInput io.Reader = resp.Body
archivePath := fp.Join(DataDir, "archive", fmt.Sprintf("%d", book.ID))
os.Remove(archivePath)
if !noArchival {
buffer := bytes.NewBuffer(nil)
archivalRequest := warc.ArchivalRequest{
URL: book.URL,
Reader: io.TeeReader(resp.Body, buffer),
ContentType: resp.Header.Get("Content-Type"),
LogEnabled: logArchival,
}
archivePath := fp.Join(DataDir, "archive", fmt.Sprintf("%d", book.ID))
os.Remove(archivePath)
err = warc.NewArchive(archivalRequest, archivePath)
if err != nil {
chProblem <- book.ID
chMessage <- fmt.Errorf("Failed to create archive %s: %v", book.URL, err)
return
archivalRequest := warc.ArchivalRequest{
URL: book.URL,
Reader: io.TeeReader(resp.Body, buffer),
ContentType: resp.Header.Get("Content-Type"),
LogEnabled: logArchival,
}
err = warc.NewArchive(archivalRequest, archivePath)
if err != nil {
chProblem <- book.ID
chMessage <- fmt.Errorf("Failed to create archive %s: %v", book.URL, err)
return
}
readabilityInput = buffer
}
// Parse article
article, err := readability.FromReader(buffer, book.URL)
article, err := readability.FromReader(readabilityInput, book.URL)
if err != nil {
chProblem <- book.ID
chMessage <- fmt.Errorf("Failed to parse %s: %v", book.URL, err)