Project_Lunta/Syndie_GUI
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix golint warnings

Browse Source
This commit is contained in:
aargh
2020-07-25 19:55:40 -04:00
parent d26bb34800
commit d59bcff9fa
3 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
channels.go
View File

@ -114,44 +114,43 @@ func (client *GUI) renderContentArea() fyne.CanvasObject {
client.contentPane = widget.NewVBox()
if client.selectedChannel == "" {
return client.contentPane
} else {
if client.selectedMessage != 0 {
var currentMessage data.Message
for _, msg := range client.db.chanList[client.selectedChannel] {
if msg.ID == client.selectedMessage {
currentMessage = msg
break
}
}
if client.selectedMessage != 0 {
var currentMessage data.Message
for _, msg := range client.db.chanList[client.selectedChannel] {
if msg.ID == client.selectedMessage {
currentMessage = msg
break
}
if currentMessage.Subject != "" {
client.contentPane.Append(newLabel("Subject: " + currentMessage.Subject))
client.contentPane.Append(canvas.NewLine(color.White))
if len(currentMessage.Raw.Page) > 0 {
for num, p := range currentMessage.Raw.Page[:1] {
if num >= 0 {
client.contentPane.Append(newLabel("Page: " + strconv.Itoa(num+1) + "/" + strconv.Itoa(len(currentMessage.Raw.Page)-1)))
client.contentPane.Append(newLabel(p.Data))
client.contentPane.Append(canvas.NewLine(color.White))
}
}
if currentMessage.Subject != "" {
client.contentPane.Append(newLabel("Subject: " + currentMessage.Subject))
client.contentPane.Append(canvas.NewLine(color.White))
if len(currentMessage.Raw.Page) > 0 {
for num, p := range currentMessage.Raw.Page[:1] {
if num >= 0 {
client.contentPane.Append(newLabel("Page: " + strconv.Itoa(num+1) + "/" + strconv.Itoa(len(currentMessage.Raw.Page)-1)))
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 num >= 0 {
client.contentPane.Append(newLabel("Attachment: " + strconv.Itoa(num+1) + "/" + strconv.Itoa(len(currentMessage.Raw.Attachment)) + " Name: " + a.Name))
client.contentPane.Append(newLabel("Type: " + a.ContentType + " Description: " + a.Description))
adata := a.Data
image, err := renderImage(imageExtFromName(a.ContentType), adata)
if err != nil {
client.contentPane.Append(widget.NewLabel("Unable to display preview"))
} else {
i := canvas.NewImageFromImage(image)
i.FillMode = canvas.ImageFillContain
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))
}
if len(currentMessage.Raw.Attachment) > 0 {
for num, a := range currentMessage.Raw.Attachment {
if num >= 0 {
client.contentPane.Append(newLabel("Attachment: " + strconv.Itoa(num+1) + "/" + strconv.Itoa(len(currentMessage.Raw.Attachment)) + " Name: " + a.Name))
client.contentPane.Append(newLabel("Type: " + a.ContentType + " Description: " + a.Description))
adata := a.Data
image, err := renderImage(imageExtFromName(a.ContentType), adata)
if err != nil {
client.contentPane.Append(widget.NewLabel("Unable to display preview"))
} else {
i := canvas.NewImageFromImage(image)
i.FillMode = canvas.ImageFillContain
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))
}
}
}

2
database.go
View File

@ -20,7 +20,7 @@ type database struct {
Messages []data.Message
}
func NewDatabase() *database {
func newDatabase() *database {
return new(database)
}

5
gui.go
View File

@ -13,6 +13,7 @@ import (
"github.com/kpetku/syndie-core/fetcher"
)
// GUI contains various GUI configuration options
type GUI struct {
db *database
window fyne.Window
@ -30,12 +31,14 @@ type GUI struct {
selectedMessage int
}
// NewGUI creates a new GUI
func NewGUI() *GUI {
return new(GUI)
}
// Start launches a new syndie-gui application
func (client *GUI) Start(path string) {
client.db = NewDatabase()
client.db = newDatabase()
client.db.openDB(path)
client.db.reload()