piwigo/PiwigoDirectoryUploader
2
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

added column UploadRequired to the image metadata

Browse Source
This commit is contained in:
Philipp Häfelfinger 2019-03-17 22:59:18 +01:00
parent 02f59c47f9
commit 2333eccd0e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/app/datastore.go
View File

@ -20,6 +20,7 @@ type ImageMetaData struct {
LastChange time.Time LastChange time.Time
CategoryPath string CategoryPath string
CategoryId int CategoryId int
UploadRequired bool
} }
func (img *ImageMetaData) String() string { func (img *ImageMetaData) String() string {
@ -54,7 +55,7 @@ func (d *localDataStore) Initialize(connectionString string) error {
} }
func (d *localDataStore) GetImageMetadata(relativePath string) (ImageMetaData, error) { func (d *localDataStore) GetImageMetadata(relativePath string) (ImageMetaData, error) {
logrus.Debugf("Query image metadata for file %s", relativePath) logrus.Tracef("Query image metadata for file %s", relativePath)
img := ImageMetaData{} img := ImageMetaData{}
db, err := d.openDatabase() db, err := d.openDatabase()
@ -63,7 +64,7 @@ func (d *localDataStore) GetImageMetadata(relativePath string) (ImageMetaData, e
} }
defer db.Close() defer db.Close()
stmt, err := db.Prepare("SELECT imageId, piwigoId, relativePath, fileName, md5sum, lastChanged, categoryPath, categoryId FROM image WHERE relativePath = ?") stmt, err := db.Prepare("SELECT imageId, piwigoId, relativePath, fileName, md5sum, lastChanged, categoryPath, categoryId, uploadRequired FROM image WHERE relativePath = ?")
if err != nil { if err != nil {
return img, err return img, err
} }
@ -75,7 +76,7 @@ func (d *localDataStore) GetImageMetadata(relativePath string) (ImageMetaData, e
defer rows.Close() defer rows.Close()
if rows.Next() { if rows.Next() {
err = rows.Scan(&img.ImageId, &img.PiwigoId, &img.RelativeImagePath, &img.Filename, &img.Md5Sum, &img.LastChange, &img.CategoryPath, &img.CategoryId) err = rows.Scan(&img.ImageId, &img.PiwigoId, &img.RelativeImagePath, &img.Filename, &img.Md5Sum, &img.LastChange, &img.CategoryPath, &img.CategoryId, &img.UploadRequired)
if err != nil { if err != nil {
return img, err return img, err
} }
@ -88,7 +89,7 @@ func (d *localDataStore) GetImageMetadata(relativePath string) (ImageMetaData, e
} }
func (d *localDataStore) SaveImageMetadata(img ImageMetaData) error { func (d *localDataStore) SaveImageMetadata(img ImageMetaData) error {
logrus.Debugf("Saving imagemetadata: %s", img.String()) logrus.Tracef("Saving imagemetadata: %s", img.String())
db, err := d.openDatabase() db, err := d.openDatabase()
if err != nil { if err != nil {
return err return err
@ -115,16 +116,16 @@ func (d *localDataStore) SaveImageMetadata(img ImageMetaData) error {
return err return err
} }
logrus.Debugf("Commiting metadata for image %s", img.String()) logrus.Tracef("Commiting metadata for image %s", img.String())
return tx.Commit() return tx.Commit()
} }
func (d *localDataStore) insertImageMetaData(tx *sql.Tx, data ImageMetaData) error { func (d *localDataStore) insertImageMetaData(tx *sql.Tx, data ImageMetaData) error {
stmt, err := tx.Prepare("INSERT INTO image (piwigoId, relativePath, fileName, md5sum, lastChanged, categoryPath, categoryId) VALUES (?,?,?,?,?,?,?)") stmt, err := tx.Prepare("INSERT INTO image (piwigoId, relativePath, fileName, md5sum, lastChanged, categoryPath, categoryId, uploadRequired) VALUES (?,?,?,?,?,?,?,?)")
if err != nil { if err != nil {
return err return err
} }
_, err = stmt.Exec(data.PiwigoId, data.RelativeImagePath, data.Filename, data.Md5Sum, data.LastChange, data.CategoryPath, data.CategoryId) _, err = stmt.Exec(data.PiwigoId, data.RelativeImagePath, data.Filename, data.Md5Sum, data.LastChange, data.CategoryPath, data.CategoryId, data.UploadRequired)
return err return err
} }
@ -148,7 +149,8 @@ func (d *localDataStore) createTablesIfNeeded(db *sql.DB) error {
"md5sum NVARCHAR(50) NOT NULL," + "md5sum NVARCHAR(50) NOT NULL," +
"lastChanged DATETIME NOT NULL," + "lastChanged DATETIME NOT NULL," +
"categoryPath NVARCHAR(1000) NOT NULL," + "categoryPath NVARCHAR(1000) NOT NULL," +
"categoryId INTEGER NULL" + "categoryId INTEGER NULL," +
"uploadRequired BIT NOT NULL" +
");") ");")
if err != nil { if err != nil {
return err return err