I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit d59bcff9 authored by aargh's avatar aargh
Browse files

fix golint warnings

parent d26bb348
No related branches found
No related tags found
No related merge requests found
...@@ -114,44 +114,43 @@ func (client *GUI) renderContentArea() fyne.CanvasObject { ...@@ -114,44 +114,43 @@ func (client *GUI) renderContentArea() fyne.CanvasObject {
client.contentPane = widget.NewVBox() client.contentPane = widget.NewVBox()
if client.selectedChannel == "" { if client.selectedChannel == "" {
return client.contentPane return client.contentPane
} else { }
if client.selectedMessage != 0 { if client.selectedMessage != 0 {
var currentMessage data.Message var currentMessage data.Message
for _, msg := range client.db.chanList[client.selectedChannel] { for _, msg := range client.db.chanList[client.selectedChannel] {
if msg.ID == client.selectedMessage { if msg.ID == client.selectedMessage {
currentMessage = msg currentMessage = msg
break break
}
} }
if currentMessage.Subject != "" { }
client.contentPane.Append(newLabel("Subject: " + currentMessage.Subject)) if currentMessage.Subject != "" {
client.contentPane.Append(canvas.NewLine(color.White)) client.contentPane.Append(newLabel("Subject: " + currentMessage.Subject))
if len(currentMessage.Raw.Page) > 0 { client.contentPane.Append(canvas.NewLine(color.White))
for num, p := range currentMessage.Raw.Page[:1] { if len(currentMessage.Raw.Page) > 0 {
if num >= 0 { for num, p := range currentMessage.Raw.Page[:1] {
client.contentPane.Append(newLabel("Page: " + strconv.Itoa(num+1) + "/" + strconv.Itoa(len(currentMessage.Raw.Page)-1))) if num >= 0 {
client.contentPane.Append(newLabel(p.Data)) client.contentPane.Append(newLabel("Page: " + strconv.Itoa(num+1) + "/" + strconv.Itoa(len(currentMessage.Raw.Page)-1)))
client.contentPane.Append(canvas.NewLine(color.White)) client.contentPane.Append(newLabel(p.Data))
} client.contentPane.Append(canvas.NewLine(color.White))
} }
} }
if len(currentMessage.Raw.Attachment) > 0 { }
for num, a := range currentMessage.Raw.Attachment { if len(currentMessage.Raw.Attachment) > 0 {
if num >= 0 { for num, a := range currentMessage.Raw.Attachment {
client.contentPane.Append(newLabel("Attachment: " + strconv.Itoa(num+1) + "/" + strconv.Itoa(len(currentMessage.Raw.Attachment)) + " Name: " + a.Name)) if num >= 0 {
client.contentPane.Append(newLabel("Type: " + a.ContentType + " Description: " + a.Description)) client.contentPane.Append(newLabel("Attachment: " + strconv.Itoa(num+1) + "/" + strconv.Itoa(len(currentMessage.Raw.Attachment)) + " Name: " + a.Name))
adata := a.Data client.contentPane.Append(newLabel("Type: " + a.ContentType + " Description: " + a.Description))
image, err := renderImage(imageExtFromName(a.ContentType), adata) adata := a.Data
if err != nil { image, err := renderImage(imageExtFromName(a.ContentType), adata)
client.contentPane.Append(widget.NewLabel("Unable to display preview")) if err != nil {
} else { client.contentPane.Append(widget.NewLabel("Unable to display preview"))
i := canvas.NewImageFromImage(image) } else {
i.FillMode = canvas.ImageFillContain i := canvas.NewImageFromImage(image)
i.SetMinSize(fyne.NewSize(fyne.Min(image.Bounds().Dx(), client.contentArea.Size().Width), image.Bounds().Dy())) i.FillMode = canvas.ImageFillContain
client.contentPane.Append(i) i.SetMinSize(fyne.NewSize(fyne.Min(image.Bounds().Dx(), client.contentArea.Size().Width), image.Bounds().Dy()))
} client.contentPane.Append(i)
client.contentPane.Append(canvas.NewLine(color.White))
} }
client.contentPane.Append(canvas.NewLine(color.White))
} }
} }
} }
......
...@@ -20,7 +20,7 @@ type database struct { ...@@ -20,7 +20,7 @@ type database struct {
Messages []data.Message Messages []data.Message
} }
func NewDatabase() *database { func newDatabase() *database {
return new(database) return new(database)
} }
......
...@@ -13,6 +13,7 @@ import ( ...@@ -13,6 +13,7 @@ import (
"github.com/kpetku/syndie-core/fetcher" "github.com/kpetku/syndie-core/fetcher"
) )
// GUI contains various GUI configuration options
type GUI struct { type GUI struct {
db *database db *database
window fyne.Window window fyne.Window
...@@ -30,12 +31,14 @@ type GUI struct { ...@@ -30,12 +31,14 @@ type GUI struct {
selectedMessage int selectedMessage int
} }
// NewGUI creates a new GUI
func NewGUI() *GUI { func NewGUI() *GUI {
return new(GUI) return new(GUI)
} }
// Start launches a new syndie-gui application
func (client *GUI) Start(path string) { func (client *GUI) Start(path string) {
client.db = NewDatabase() client.db = newDatabase()
client.db.openDB(path) client.db.openDB(path)
client.db.reload() client.db.reload()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment