From 5c29e49f9f422c8889ce2ed6b5b5a2914b55cace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Sun, 17 Oct 2021 17:04:06 +0200 Subject: Support feed targets per feed --- internal/imap/folder.go | 4 ++++ internal/imap/imap.go | 9 ++------- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'internal') diff --git a/internal/imap/folder.go b/internal/imap/folder.go index 9386293..32bfefe 100644 --- a/internal/imap/folder.go +++ b/internal/imap/folder.go @@ -7,6 +7,10 @@ type Folder struct { delimiter string } +func (f Folder) IsBlank() bool { + return f.str == "" +} + func (f Folder) String() string { return f.str } diff --git a/internal/imap/imap.go b/internal/imap/imap.go index 4a18a94..a44a513 100644 --- a/internal/imap/imap.go +++ b/internal/imap/imap.go @@ -2,7 +2,6 @@ package imap import ( "fmt" - "strings" "github.com/Necoro/feed2imap-go/pkg/config" "github.com/Necoro/feed2imap-go/pkg/log" @@ -31,15 +30,11 @@ func Connect(url config.Url) (*Client, error) { } client.delimiter = delim - toplevel := url.Root - if toplevel[0] == '/' { - toplevel = toplevel[1:] - } - client.toplevel = client.folderName(strings.Split(toplevel, "/")) + client.toplevel = client.folderName(url.RootPath()) log.Printf("Determined '%s' as toplevel, with '%s' as delimiter", client.toplevel, client.delimiter) - if toplevel != "" { + if !client.toplevel.IsBlank() { if err = conn.ensureFolder(client.toplevel); err != nil { return nil, err } -- cgit v1.2.3