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

API-10 # ignore trailing spaces of bitwarden items #11

Merged
merged 1 commit into from
Dec 6, 2018
Merged

API-10 # ignore trailing spaces of bitwarden items #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions core.go
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@ import (
"strings"
"time"

"github.com/davecgh/go-spew/spew"

"github.com/mholt/archiver"
"github.com/tidwall/pretty"
)
Expand Down Expand Up @@ -79,23 +81,26 @@ func CreateBackupFile(fileName, passphrase, sessionKey string, sleepMilliseconds
}

func CreateBackupBytes(passphrase, sessionKey string, sleepMilliseconds int) ([]byte, error) {
if err := os.MkdirAll(BackupFolderName, os.ModePerm); err != nil {
return nil, err
}
defer os.RemoveAll(BackupFolderName)

pwes := []PortWardenElement{}

// save formmated json to "main.json"
rawByte, err := BWListItemsRawBytes(sessionKey)
if err != nil {
return nil, err
}
if err := json.Unmarshal(rawByte, &pwes); err != nil {
return nil, err
}
if err = os.MkdirAll(BackupFolderName, os.ModePerm); err != nil {
return nil, err
}
err = BWGetAllAttachments(BackupFolderName, sessionKey, pwes, sleepMilliseconds)
if err != nil {
return nil, err
}

// save formmated json to "main.json"
formattedByte := pretty.Pretty(rawByte)
if err := ioutil.WriteFile(BackupFolderName+"main.json", formattedByte, 0644); err != nil {
return nil, err
Expand All @@ -114,11 +119,6 @@ func CreateBackupBytes(passphrase, sessionKey string, sleepMilliseconds int) ([]
return nil, err
}

// cleanup: delete temporary files
err = os.RemoveAll(BackupFolderName)
if err != nil {
return nil, err
}
return encryptedBytes, nil
}

Expand Down Expand Up @@ -178,9 +178,11 @@ func BWGetAllAttachments(outputDir, sessionKey string, pws []PortWardenElement,
for _, item := range pws {
if len(item.Attachments) > 0 {
for _, innerItem := range item.Attachments {
err := BWGetAttachment(outputDir+item.Name+"/", item.ID, innerItem.ID, sessionKey)
ourputDir := strings.TrimSpace(outputDir + item.Name) // Keep this line. See https://github.com/vwxyzjn/portwarden/issues/10
err := BWGetAttachment(ourputDir+"/", item.ID, innerItem.ID, sessionKey)
time.Sleep(time.Millisecond * time.Duration(sleepMilliseconds))
if err != nil {
spew.Dump(err, "failed item ids are ", item.ID, innerItem.ID)
return err
}
}
Expand Down