Merge pull request #164 from knoxfighter/Bugfix/windows-filelock

added missing file closing

Author: mroote

src/factorio_save.go

@@ -46,6 +46,7 @@ func OpenArchiveFile(path string, name string) (r io.ReadCloser, err error) {
 		}
 	}
 
+	archive.Close()
 	return nil, errors.New("file not found")
 }
 

src/factorio_server.go

@@ -76,6 +76,11 @@ func initFactorio() (f *FactorioServer, err error) {
 		if err != nil {
 			return nil, fmt.Errorf("failed to copy example server settings: %v", err)
 		}
+
+		err = example.Close()
+		if err != nil {
+			return nil, fmt.Errorf("failed to close example server settings: %s", err)
+		}
 	} else {
 		// otherwise, open file normally
 		settings, err = os.Open(settingsPath)

src/mod_modInfo.go

@@ -65,6 +65,7 @@ func (modInfoList *ModInfoList) listInstalledMods() error {
 				log.Fatalln(err)
 				return err
 			}
+			defer zipFile.Close()
 
 			var modInfo ModInfo
 			err = modInfo.getModInfo(&zipFile.Reader)
@@ -171,11 +172,15 @@ func (modInfo *ModInfo) getModInfo(reader *zip.Reader) error {
 			}
 
 			byteArray, err := ioutil.ReadAll(rc)
-			rc.Close()
 			if err != nil {
 				log.Fatal(err)
 				return err
 			}
+			err = rc.Close()
+			if err != nil {
+				log.Printf("Error closing singleFile: %s", err)
+				return err
+			}
 
 			err = json.Unmarshal(byteArray, modInfo)
 			if err != nil {

src/mods.go

@@ -307,7 +307,12 @@ func modStartUp() {
 					log.Printf("error reading mod_file_rc: %s", err)
 					return err
 				}
-				modFileRc.Close()
+
+				err = modFileRc.Close()
+				if err != nil {
+					log.Printf("error closing mod_file_rc: %s", err)
+					return err
+				}
 
 				modFileByteReader := bytes.NewReader(modFileBuffer)
 				modFileZipReader, err := zip.NewReader(modFileByteReader, int64(len(modFileBuffer)))

src/mods_handler.go

@@ -548,6 +548,12 @@ func DownloadModsHandler(w http.ResponseWriter, r *http.Request) {
 				log.Printf("error on copying file into zip: %s", err)
 				return err
 			}
+
+			err = file.Close()
+			if err != nil {
+				log.Printf("error closing file: %s", err)
+				return err
+			}
 		}
 
 		return nil
@@ -703,7 +709,14 @@ func DownloadModPackHandler(w http.ResponseWriter, r *http.Request) {
 					log.Printf("error on opening modfile: %s", err)
 					return err
 				}
-				defer file.Close()
+				// Close file, when function returns
+				defer func() {
+					err2 := file.Close()
+					if err == nil && err2 != nil {
+						log.Printf("Error closing file: %s", err2)
+						err = err2
+					}
+				}()
 
 				_, err = io.Copy(writer, file)
 				if err != nil {