aniani/amfora
1
0
Fork 0
mirror of https://github.com/makew0rld/amfora.git synced 2024-12-04 14:46:29 -05:00
Code

🔖 Ready for v1.3.0

Browse Source
This commit is contained in:
makeworld 2020-07-10 19:16:13 -04:00
parent 9b8985905f
commit bde371cff2
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -4,16 +4,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [1.3.0] - 2020-07-10
### Added ### Added
- **Downloading pages and any content** (#38) - **Downloading content** (#38)
- Configurable page size limit - `page_max_size` in config (#30) - Configurable page size limit - `page_max_size` in config (#30)
- Configurable page timeout - `page_max_time` in config - Configurable page timeout - `page_max_time` in config
- Link and heading lines are wrapped just like regular text lines - Link and heading lines are wrapped just like regular text lines
- Wrapped list items are indented to stay behind the bullet (#35) - Wrapped list items are indented to stay behind the bullet (#35)
- Certificate expiry date is stored when the cert IDs match (#39) - Certificate expiry date is stored when the cert IDs match (#39)
- What link was selected is remembered as you browse through history - What link was selected is remembered as you browse through history
- Render ANSI codes in `text/x-ansi` pages, or text pages that end with `.ans` - Render ANSI codes in `text/x-ansi` pages, or text pages that end with `.ans` (#45)
### Changed ### Changed
- Pages are rewrapped dynamically, whenever the terminal size changes (#33) - Pages are rewrapped dynamically, whenever the terminal size changes (#33)

4
amfora.go
View File

@ -8,7 +8,7 @@ import (
"github.com/makeworld-the-better-one/amfora/display" "github.com/makeworld-the-better-one/amfora/display"
) )
var version = "1.3.0-unreleased" var version = "1.3.0"
func main() { func main() {
// err := logger.Init() // err := logger.Init()
@ -18,7 +18,7 @@ func main() {
if len(os.Args) > 1 { if len(os.Args) > 1 {
if os.Args[1] == "--version" || os.Args[1] == "-v" { if os.Args[1] == "--version" || os.Args[1] == "-v" {
fmt.Println(version) fmt.Println("amfora v" + version)
return return
} }
if os.Args[1] == "--help" || os.Args[1] == "-h" { if os.Args[1] == "--help" || os.Args[1] == "-h" {

1
display/help.go
View File

@ -35,6 +35,7 @@ Ctrl-R, R|Reload a page, discarding the cached version.
|This can also be used if you resize your terminal. |This can also be used if you resize your terminal.
Ctrl-B|View bookmarks Ctrl-B|View bookmarks
Ctrl-D|Add, change, or remove a bookmark for the current page. Ctrl-D|Add, change, or remove a bookmark for the current page.
Ctrl-S|Save the current page to your downloads.
q, Ctrl-Q, Ctrl-C|Quit q, Ctrl-Q, Ctrl-C|Quit
`) `)

7
structs/structs.go
View File

@ -13,6 +13,7 @@ type PageMode int
const ( const (
ModeOff PageMode = iota // Regular mode ModeOff PageMode = iota // Regular mode
ModeLinkSelect // When the enter key is pressed, allow for tab-based link navigation ModeLinkSelect // When the enter key is pressed, allow for tab-based link navigation
ModeSearch // When a keyword is being searched in a page - TODO: NOT USED YET
) )
// Page is for storing UTF-8 text/gemini pages, as well as text/plain pages. // Page is for storing UTF-8 text/gemini pages, as well as text/plain pages.
@ -32,9 +33,9 @@ type Page struct {
// Size returns an approx. size of a Page in bytes. // Size returns an approx. size of a Page in bytes.
func (p *Page) Size() int { func (p *Page) Size() int {
b := len(p.Raw) + len(p.Content) + len(p.Url) + len(p.Selected) + len(p.SelectedID) n := len(p.Raw) + len(p.Content) + len(p.Url) + len(p.Selected) + len(p.SelectedID)
for i := range p.Links { for i := range p.Links {
b += len(p.Links[i]) n += len(p.Links[i])
} }
return b return n
} }