Dekker1/ponder
Archived
1
0
Fork 0
Code

Moves default clean file checks to the helper package

Browse Source
This commit is contained in:
Jip J. Dekker 2016-10-02 02:29:52 +02:00
parent 345b99cc0c
commit b2f45d6add
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/clean.go
View File

@ -32,26 +32,12 @@ func Clean(path string, opts *settings.Settings) {
// Remove score files // Remove score files
for i := range scores { for i := range scores {
scores[i].GenerateOutputPath(opts) scores[i].GenerateOutputPath(opts)
if helpers.Exists(scores[i].OutputPath) { helpers.CleanFile(scores[i].OutputPath)
if err := os.Remove(scores[i].OutputPath); err != nil {
log.WithFields(log.Fields{
"error": err,
"score": scores[i],
}).Error("unable to delete file")
}
}
} }
// Remove LaTeX resources // Remove LaTeX resources
texPath := filepath.Join(opts.OutputDir, opts.Name+".tex") texPath := filepath.Join(opts.OutputDir, opts.Name+".tex")
if helpers.Exists(texPath) { helpers.CleanFile(texPath)
if err := os.Remove(texPath); err != nil {
log.WithFields(log.Fields{
"error": err,
"file": texPath,
}).Error("unable to delete file")
}
}
for i := range opts.LatexResources { for i := range opts.LatexResources {
path := filepath.Join(opts.OutputDir, filepath.Base(opts.LatexResources[i])) path := filepath.Join(opts.OutputDir, filepath.Base(opts.LatexResources[i]))
err := os.RemoveAll(path) err := os.RemoveAll(path)
@ -65,12 +51,5 @@ func Clean(path string, opts *settings.Settings) {
// Remove target songbook // Remove target songbook
songbookPath := filepath.Join(opts.OutputDir, opts.Name+".pdf") songbookPath := filepath.Join(opts.OutputDir, opts.Name+".pdf")
if helpers.Exists(songbookPath) { helpers.CleanFile(songbookPath)
if err := os.Remove(songbookPath); err != nil {
log.WithFields(log.Fields{
"error": err,
"songbook": songbookPath,
}).Error("unable to delete file")
}
}
} }

13
helpers/file_utils.go
View File

@ -99,3 +99,16 @@ func AbsolutePath(path, root string) string {
} }
return filepath.Join(root, path) return filepath.Join(root, path)
} }
// CleanFile removes the file on the given path if it exists. In case of
// failure, an error will be logged.
func CleanFile(path string) {
if Exists(path) {
if err := os.Remove(path); err != nil {
log.WithFields(log.Fields{
"error": err,
"file": path,
}).Error("unable to delete file")
}
}
}