Merge branch 'release/v0.1.3'

Author: slaveofcode

.gitignore

@@ -54,4 +54,6 @@ config.yaml
 
 *.db
 *.db-wal
-*.db-shm
+*.db-shm
+
+hansip-files

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+### v0.1.3
+
+> 23 October 2022
+
+- Fixed error S3 when using `filesystem` mode
+- Updated `config.yaml` example for upload & bundle directory
+
 ### v0.1.2
 
 > 23 October 2022

config.example.yaml

@@ -1,24 +1,31 @@
+# Set host & port for hansip backend server
 server_api:
-  secure: false
+  secure: false # set true if the address is https
   host: localhost
   port: 8080
 
+# Set host & port for web application server
 server_web:
-  secure: false
+  secure: false # set true if the address is https
   host: localhost
   port: 8181
 
 storage:
   type: filesystem # or s3
 
 dirpaths:
-  upload: /tmp/hansip-files/uploaded
-  bundle: /tmp/hansip-files/bundled
+  # Directory when uploading files before processed 
+  upload: ./hansip-files/uploaded
+  # Directory for storing files after processed,
+  # files on bundle directory will be removed if activates S3 after successfully uploaded
+  bundle: ./hansip-files/bundled
 
 db:
   type: sqlite # or postgresql
 
 sqlite:
+  # path for sqlite database file
+  # by default will use WAL mode for better concurrency
   path: ./hansip.db
 
 postgresql:

routes/files/bundle_filegroup.go

@@ -207,33 +207,35 @@ func BundleFileGroup(repo repository.Repository, s3Client *s3.Client) func(c *gi
 			return
 		}
 
-		go func(filePath string) {
-			keyName := filepath.Base(filePath)
-			bundledFile, err := os.Open(filePath)
-			if err != nil {
-				log.Printf("Error reading bundled file at %s, is the file removed? %s", filePath, err.Error())
-				return
-			}
-			defer bundledFile.Close()
+		if appConfig.IsUsingS3Storage() {
+			go func(filePath string) {
+				keyName := filepath.Base(filePath)
+				bundledFile, err := os.Open(filePath)
+				if err != nil {
+					log.Printf("Error reading bundled file at %s, is the file removed? %s", filePath, err.Error())
+					return
+				}
+				defer bundledFile.Close()
 
-			_, err = s3Client.PutObject(context.Background(), &s3.PutObjectInput{
-				Bucket:  aws.String(appConfig.GetS3Bucket()),
-				Key:     &keyName,
-				Body:    bundledFile,
-				Expires: fileGroup.ExpiredAt, // cache expiration
-			})
+				_, err = s3Client.PutObject(context.Background(), &s3.PutObjectInput{
+					Bucket:  aws.String(appConfig.GetS3Bucket()),
+					Key:     &keyName,
+					Body:    bundledFile,
+					Expires: fileGroup.ExpiredAt, // cache expiration
+				})
 
-			if err == nil {
-				fileGroup.FileKey = keyName
-				db.Save(&fileGroup)
+				if err == nil {
+					fileGroup.FileKey = keyName
+					db.Save(&fileGroup)
 
-				// remove local file because already uploaded to S3
-				os.Remove(filePath)
-				return
-			}
+					// remove local file because already uploaded to S3
+					os.Remove(filePath)
+					return
+				}
 
-			log.Println("error S3 upload", err)
-		}(fileGroup.FileKey)
+				log.Println("error S3 upload", err)
+			}(fileGroup.FileKey)
+		}
 
 		pinCode := ""