Elara6331/opensend
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up code

Browse Source
This commit is contained in:
Elara 2021-01-02 21:44:09 -08:00
parent 599e3d4b94
commit 333cc4e195
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
parameterSerialization.go
View File

@ -174,7 +174,8 @@ func (parameters *Parameters) ExecuteAction(srcDir string, destDir string) {
// Use ConsoleWriter logger // Use ConsoleWriter logger
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr}).Hook(FatalHook{}) log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr}).Hook(FatalHook{})
// If action is file // If action is file
if parameters.ActionType == "file" { switch parameters.ActionType {
case "file":
// Open file from parameters at given directory // Open file from parameters at given directory
src, err := os.Open(srcDir + "/" + parameters.ActionData) src, err := os.Open(srcDir + "/" + parameters.ActionData)
if err != nil { if err != nil {
@ -195,7 +196,7 @@ func (parameters *Parameters) ExecuteAction(srcDir string, destDir string) {
log.Fatal().Err(err).Msg("Error copying data to file") log.Fatal().Err(err).Msg("Error copying data to file")
} }
// If action is url // If action is url
} else if parameters.ActionType == "url" { case "url":
// Parse received URL // Parse received URL
urlParser, err := url.Parse(parameters.ActionData) urlParser, err := url.Parse(parameters.ActionData)
// If there was an error parsing // If there was an error parsing
@ -217,7 +218,7 @@ func (parameters *Parameters) ExecuteAction(srcDir string, destDir string) {
log.Fatal().Err(err).Msg("Error opening browser") log.Fatal().Err(err).Msg("Error opening browser")
} }
// If action is dir // If action is dir
} else if parameters.ActionType == "dir" { case "dir":
// Set destination directory to ~/Downloads/{dir name} // Set destination directory to ~/Downloads/{dir name}
dstDir := filepath.Clean(destDir) + "/" + parameters.ActionData dstDir := filepath.Clean(destDir) + "/" + parameters.ActionData
// Try to create destination directory // Try to create destination directory
@ -239,15 +240,14 @@ func (parameters *Parameters) ExecuteAction(srcDir string, destDir string) {
for { for {
// Jump to next header in tar archive // Jump to next header in tar archive
header, err := tarUnarchiver.Next() header, err := tarUnarchiver.Next()
switch {
// If EOF // If EOF
case err == io.EOF: if err == io.EOF {
// break loop // break loop
break unarchiveLoop break unarchiveLoop
case err != nil: } else if err != nil {
log.Fatal().Err(err).Msg("Error unarchiving tar archive") log.Fatal().Err(err).Msg("Error unarchiving tar archive")
// If nil header // If nil header
case header == nil: } else if header == nil {
// Skip // Skip
continue continue
} }
@ -271,7 +271,7 @@ func (parameters *Parameters) ExecuteAction(srcDir string, destDir string) {
} }
} }
// Catchall // Catchall
} else { default:
// Log unknown action type // Log unknown action type
log.Fatal().Msg("Unknown action type " + parameters.ActionType) log.Fatal().Msg("Unknown action type " + parameters.ActionType)
} }