mirror of
https://github.com/Picocrypt/Picocrypt.git
synced 2025-06-27 21:56:14 +02:00
handle more errors in temp zip code
This commit is contained in:
parent
22a1118f01
commit
7a28e2b273
1 changed files with 33 additions and 5 deletions
|
@ -1253,9 +1253,24 @@ func work() {
|
||||||
// Create file info header (size, last modified, etc.)
|
// Create file info header (size, last modified, etc.)
|
||||||
stat, err := os.Stat(path)
|
stat, err := os.Stat(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
continue // Skip temporary and inaccessible files
|
writer.Close()
|
||||||
|
file.Close()
|
||||||
|
os.Remove(inputFile)
|
||||||
|
resetUI()
|
||||||
|
mainStatus = "Failed to stat input files"
|
||||||
|
mainStatusColor = RED
|
||||||
|
return
|
||||||
|
}
|
||||||
|
header, err := zip.FileInfoHeader(stat)
|
||||||
|
if err != nil {
|
||||||
|
writer.Close()
|
||||||
|
file.Close()
|
||||||
|
os.Remove(inputFile)
|
||||||
|
resetUI()
|
||||||
|
mainStatus = "Failed to create zip.FileInfoHeader"
|
||||||
|
mainStatusColor = RED
|
||||||
|
return
|
||||||
}
|
}
|
||||||
header, _ := zip.FileInfoHeader(stat)
|
|
||||||
header.Name = strings.TrimPrefix(path, rootDir)
|
header.Name = strings.TrimPrefix(path, rootDir)
|
||||||
header.Name = filepath.ToSlash(header.Name)
|
header.Name = filepath.ToSlash(header.Name)
|
||||||
header.Name = strings.TrimPrefix(header.Name, "/")
|
header.Name = strings.TrimPrefix(header.Name, "/")
|
||||||
|
@ -1267,7 +1282,16 @@ func work() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Open the file for reading
|
// Open the file for reading
|
||||||
entry, _ := writer.CreateHeader(header)
|
entry, err := writer.CreateHeader(header)
|
||||||
|
if err != nil {
|
||||||
|
writer.Close()
|
||||||
|
file.Close()
|
||||||
|
os.Remove(inputFile)
|
||||||
|
resetUI()
|
||||||
|
mainStatus = "Failed to writer.CreateHeader"
|
||||||
|
mainStatusColor = RED
|
||||||
|
return
|
||||||
|
}
|
||||||
fin, err := os.Open(path)
|
fin, err := os.Open(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
writer.Close()
|
writer.Close()
|
||||||
|
@ -1298,8 +1322,12 @@ func work() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
writer.Close()
|
if err := writer.Close(); err != nil {
|
||||||
file.Close()
|
panic(err)
|
||||||
|
}
|
||||||
|
if err := file.Close(); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Recombine a split file if necessary
|
// Recombine a split file if necessary
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue