Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Readtime calculations #106

Merged
merged 3 commits into from Mar 3, 2019
Merged

Readtime calculations #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3ecfb3
simple readtime calculations
techknowlogick Mar 3, 2019
bf05ad9
add missing import for math
techknowlogick Mar 3, 2019
f2b2a7a
go mod tidy
techknowlogick Mar 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions cmd/cmd-handler.go
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"html/template"
"math"
nurl "net/url"
"os"
fp "path/filepath"
Expand Down Expand Up @@ -64,8 +65,8 @@ func (h *cmdHandler) addBookmark(cmd *cobra.Command, args []string) {
article, _ := readability.FromURL(parsedURL.String(), 20*time.Second)

book.Author = article.Byline
book.MinReadTime = article.Length // TODO: recreate logic for max/min readtime
book.MaxReadTime = article.Length
book.MinReadTime = int(math.Floor(float64(article.Length)/(987+188) + 0.5))
book.MaxReadTime = int(math.Floor(float64(article.Length)/(987-188) + 0.5))
book.Content = article.TextContent
book.HTML = article.Content

Expand Down Expand Up @@ -320,8 +321,8 @@ func (h *cmdHandler) updateBookmarks(cmd *cobra.Command, args []string) {
}

book.Author = article.Byline
book.MinReadTime = article.Length // TODO: recreate logic for max/min readtime
book.MaxReadTime = article.Length
book.MinReadTime = int(math.Floor(float64(article.Length)/(987+188) + 0.5))
book.MaxReadTime = int(math.Floor(float64(article.Length)/(987-188) + 0.5))
book.Content = article.TextContent
book.HTML = article.Content

Expand Down
9 changes: 5 additions & 4 deletions cmd/serve/web-handler-api.go
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"io"
"math"
"net/http"
nurl "net/url"
"os"
Expand Down Expand Up @@ -127,8 +128,8 @@ func (h *webHandler) apiInsertBookmark(w http.ResponseWriter, r *http.Request, p
article, _ := readability.FromURL(parsedURL.String(), 20*time.Second)

book.Author = article.Byline
book.MinReadTime = article.Length // TODO: recreate logic for max/min readtime
book.MaxReadTime = article.Length
book.MinReadTime = int(math.Floor(float64(article.Length)/(987+188) + 0.5))
book.MaxReadTime = int(math.Floor(float64(article.Length)/(987-188) + 0.5))
book.Content = article.TextContent
book.HTML = article.Content

Expand Down Expand Up @@ -349,8 +350,8 @@ func (h *webHandler) apiUpdateCache(w http.ResponseWriter, r *http.Request, ps h

book.Excerpt = article.Excerpt
book.Author = article.Byline
book.MinReadTime = article.Length // TODO: recreate logic for max/min readtime
book.MaxReadTime = article.Length
book.MinReadTime = int(math.Floor(float64(article.Length)/(987+188) + 0.5))
book.MaxReadTime = int(math.Floor(float64(article.Length)/(987-188) + 0.5))
book.Content = article.TextContent
book.HTML = article.Content

Expand Down
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@ module src.techknowlogick.com/shiori

require (
github.com/PuerkitoBio/goquery v1.5.0
github.com/abadojack/whatlanggo v0.0.0-20190207205756-01d4c01a5a7c // indirect
github.com/asaskevich/govalidator v0.0.0-20190207205813-f9ffefc3facf
github.com/denisenkom/go-mssqldb v0.0.0-20190210074043-df6d76eb9289
github.com/dgrijalva/jwt-go v3.2.0+incompatible
Expand Down
35 changes: 1 addition & 34 deletions go.sum
View file
Open in desktop
Expand Up @@ -12,8 +12,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk=
github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
github.com/abadojack/whatlanggo v0.0.0-20190207205756-01d4c01a5a7c h1:8Y5aGMtMKIytxF3b6FToZijyvpscJP3ORR+Gd13IWeU=
github.com/abadojack/whatlanggo v0.0.0-20190207205756-01d4c01a5a7c/go.mod h1:JdU7lKuvX8qqAFrjw25JGWCVmbEzBknb3+L69+8BRJo=
github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
Expand Down Expand Up @@ -53,10 +51,6 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
github.com/go-shiori/go-readability v0.0.0-20180803130947-13aa531ebcea h1:L8rbe+5UmcjiuSjuwqtJ3dMN+9KURwOsbFS7BJvLYfQ=
github.com/go-shiori/go-readability v0.0.0-20180803130947-13aa531ebcea/go.mod h1:3CKDJ+wAIJjcVnB+q71vghT7z8619JWBC8C/K0nqRMI=
github.com/go-shiori/go-readability v0.0.0-20190226185634-f406041601c1 h1:x6VugC+tK7G/xIaS7RXXS2vEH0slDP/iU+zephjVc1M=
github.com/go-shiori/go-readability v0.0.0-20190226185634-f406041601c1/go.mod h1:3CKDJ+wAIJjcVnB+q71vghT7z8619JWBC8C/K0nqRMI=
github.com/go-shiori/go-readability v0.0.0-20190301152547-7e14b711edd4 h1:39lfDOZJGJ+dFv18WKM9+Jn4WellA8ZXug+QFB1wLTA=
github.com/go-shiori/go-readability v0.0.0-20190301152547-7e14b711edd4/go.mod h1:3CKDJ+wAIJjcVnB+q71vghT7z8619JWBC8C/K0nqRMI=
github.com/go-sql-driver/mysql v1.4.0 h1:7LxgVwFb2hIQtMm87NdgAVfXjnt4OePseqT1tKx+opk=
Expand Down Expand Up @@ -517,14 +511,6 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnf
golang.org/x/crypto v0.0.0-20190102171810-8d7daa0c54b3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190225135744-7f87c0fbb88b h1:1UUtOzRaDY12lS8VuW9yN8TJQwFkWEfJxesrFvovzOw=
golang.org/x/crypto v0.0.0-20190225135744-7f87c0fbb88b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190227185955-215aa809caaf h1:aq+8nMzYfTLRUwU75z7LOPNKhxg8fK0LHDKLCfDWu94=
golang.org/x/crypto v0.0.0-20190227185955-215aa809caaf/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190227224443-215aa809caaf h1:B12OfuObYPwMpoWNs/QIdXXmLDt88zu4KwDHzsIxprI=
golang.org/x/crypto v0.0.0-20190227224443-215aa809caaf/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190228064905-31a38585487a h1:TGjUlw3tXO6ioQy4rBv2swnr5xf/kaJ/QSP06gVR5vQ=
golang.org/x/crypto v0.0.0-20190228064905-31a38585487a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190228191405-8dd112bcdc25 h1:rN4riPygMPCtBUonrBs9ebEN86tVeVyeYzK7zqD0eDo=
golang.org/x/crypto v0.0.0-20190228191405-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
Expand All @@ -550,18 +536,6 @@ golang.org/x/net v0.0.0-20181207154023-610586996380/go.mod h1:mL1N/T3taQHkDXs73r
golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis=
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190225160740-fe579d43d832 h1:plSh7TG0jAB3U48LS/K04mJCqFQU/Y9kkYebQ7v+63c=
golang.org/x/net v0.0.0-20190225160740-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190226235625-afe646ca25a4 h1:AxEZ/781JgTaXGCY7zEp5yyh8pgcoUHnVkwUniXaa3I=
golang.org/x/net v0.0.0-20190226235625-afe646ca25a4/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190227002710-afe646ca25a4 h1:fZMVUD/VMR/mkHPRUcpnp9T/eyD3tmy8iHhJIL9uMzA=
golang.org/x/net v0.0.0-20190227002710-afe646ca25a4/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190227034951-312bce6e941f h1:oPaFdYw2y5qSpdPCjm3RhYey7Np7Qc5CiR+pxBka9k8=
golang.org/x/net v0.0.0-20190227034951-312bce6e941f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190227190440-c95aed5357e7 h1:x73Hvzv++cHb8qzVbDyLEafbucA5EkKsHus/a2InAOU=
golang.org/x/net v0.0.0-20190227190440-c95aed5357e7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190228192604-92fc7df08ae7 h1:PoKZdX5aYAqU0EbcAFRB7lNBHGsyqEsP4ctEjOI8Qyk=
golang.org/x/net v0.0.0-20190228192604-92fc7df08ae7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190302005804-16b79f2e4e95 h1:pS3nEto9XwvR74IXx5ZIwxhXobIJFTWOtae+GMEQVUA=
golang.org/x/net v0.0.0-20190302005804-16b79f2e4e95/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
Expand All @@ -573,6 +547,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI=
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand All @@ -599,14 +574,6 @@ golang.org/x/sys v0.0.0-20190116161447-11f53e031339 h1:g/Jesu8+QLnA0CPzF3E1pURg0
golang.org/x/sys v0.0.0-20190116161447-11f53e031339/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190225075313-cc5685c2db12 h1:THsna9cXCXLW7JUInw1MSMU6qyFffehNFLKMtt+h+uc=
golang.org/x/sys v0.0.0-20190225075313-cc5685c2db12/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190226235851-775f8194d0f9 h1:+FgdUJCU/NkAa1caELG2VjNzTamIp+WBt26b9ck3KR0=
golang.org/x/sys v0.0.0-20190226235851-775f8194d0f9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190228085230-92a0ff1e1e2f h1:dV6bSv0EQGhrEQUwTWcKxmgVm5H/RrIprBLBePl8ygk=
golang.org/x/sys v0.0.0-20190228085230-92a0ff1e1e2f/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190228143232-a34e9553db1e h1:fU1K00ZWcxtWkRcjgtHNiTtz5yq6Htc99QmoKNLqeaU=
golang.org/x/sys v0.0.0-20190228143232-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190302045942-b6889370fb10 h1:8CZ/uD8ROgfPG0VSU1NbJ/vErUATuWmWD+5lUJCiM9U=
golang.org/x/sys v0.0.0-20190302045942-b6889370fb10/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
Expand Down