@@ -66,8 +66,8 @@ func NewSqliteStorage(dbPath string) (*sqliteStorage, error) {
6666 return storage , nil
6767}
6868
69- func (s * sqliteStorage ) Store (ctx context.Context , fileMsg * types.ScannedFile ) (* FileStored , error ) {
70- recordStored := & FileStored {
69+ func (s * sqliteStorage ) Store (ctx context.Context , fileMsg * types.ScannedFile ) (FileStored , error ) {
70+ recordStored := FileStored {
7171 FileHash : false ,
7272 FileInfo : false ,
7373 }
@@ -76,13 +76,13 @@ func (s *sqliteStorage) Store(ctx context.Context, fileMsg *types.ScannedFile) (
7676 recordStored .FileHash = err == nil
7777
7878 if err != nil && hashID == - 1 {
79- return recordStored , fmt .Errorf ("failed to save hash to database: %v " , err )
79+ return recordStored , fmt .Errorf ("failed to save hash to database: %w " , err )
8080 }
8181
8282 err = s .saveFileInfo (hashID , fileMsg )
8383 recordStored .FileInfo = err == nil
8484 if err != nil && err != ErrFileInfoExists {
85- return recordStored , fmt .Errorf ("failed to save file info to database: %v " , err )
85+ return recordStored , fmt .Errorf ("failed to save file info to database: %w " , err )
8686 }
8787
8888 return recordStored , nil
@@ -100,14 +100,14 @@ func (s *sqliteStorage) saveFileHash(hash string) (int64, error) {
100100 if err == sql .ErrNoRows {
101101 result , err := s .pInsertHash .Exec (hash )
102102 if err != nil {
103- return hashID , fmt .Errorf ("failed to insert file hash: %v " , err )
103+ return hashID , fmt .Errorf ("failed to insert file hash: %w " , err )
104104 }
105105 hashID , err = result .LastInsertId ()
106106 if err != nil {
107- return hashID , fmt .Errorf ("failed to get last insert ID: %v " , err )
107+ return hashID , fmt .Errorf ("failed to get last insert ID: %w " , err )
108108 }
109- } else if err != nil {
110- return hashID , fmt .Errorf ("failed to query file hash: %v " , err )
109+ } else {
110+ return hashID , fmt .Errorf ("failed to query file hash: %w " , err )
111111 }
112112
113113 return hashID , nil
@@ -118,15 +118,15 @@ type FileStored struct {
118118 FileInfo bool
119119}
120120
121- func (r * FileStored ) Dirty () bool {
121+ func (r FileStored ) Dirty () bool {
122122 return r .FileHash || r .FileInfo
123123}
124124
125- func (r * FileStored ) Both () bool {
125+ func (r FileStored ) Both () bool {
126126 return r .FileHash && r .FileInfo
127127}
128128
129- func (r * FileStored ) Clean () bool {
129+ func (r FileStored ) Clean () bool {
130130 return ! r .FileHash && ! r .FileInfo
131131}
132132
@@ -152,14 +152,14 @@ func (s *sqliteStorage) saveFileInfo(hashID int64, fileMsg *types.ScannedFile) e
152152 fileMsg .Hostname , fileMsg .Extension , fileMsg .Hash ,
153153 )
154154 if err != nil {
155- return fmt .Errorf ("failed to insert file info: %v " , err )
155+ return fmt .Errorf ("failed to insert file info: %w " , err )
156156 }
157157 fileID , err = result .LastInsertId ()
158158 if err != nil {
159- return fmt .Errorf ("failed to get last insert ID: %v " , err )
159+ return fmt .Errorf ("failed to get last insert ID: %w " , err )
160160 }
161161 return nil
162162 }
163163
164- return fmt .Errorf ("failed to query file info: %v " , err )
164+ return fmt .Errorf ("failed to query file info: %w " , err )
165165}
0 commit comments