From ef8935dc1fd0737cb6d0d96e10c74993603ecbf7 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Tue, 5 May 2020 13:55:06 +0200
Subject: [PATCH] Check if a kara has mdt, correct value return for
kara_metadata_write
---
src/mkv/write.c | 9 ++++-----
src/net/downloader.c | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/mkv/write.c b/src/mkv/write.c
index d366c6bf..7faa3999 100644
--- a/src/mkv/write.c
+++ b/src/mkv/write.c
@@ -108,8 +108,7 @@ kara_metadata_write(struct kara_metadata *mdt, const char *filename, const char
char *const metadafilepath = &tmpfilepath[4];
const char *const args1[] = { mkvpropedit, "-t", "all:", filename, NULL };
const char *const args2[] = { mkvpropedit, "-t", tmpfilepath, filename, NULL };
- int fd;
- bool sta = false;
+ int fd, sta = -1;
memset(tmpfilepath, 0, PATH_MAX);
strncat(tmpfilepath, "all:/tmp/lektor.metadata.XXXXXX", PATH_MAX - 1);
@@ -128,7 +127,7 @@ kara_metadata_write(struct kara_metadata *mdt, const char *filename, const char
if (!mkvpropedit__(args1) || !mkvpropedit__(args2))
goto error;
- sta = true;
+ sta = 0;
error:
close(fd);
unlink(metadafilepath);
@@ -207,7 +206,7 @@ metadata_set_directory(const char *kara_dir, const char *mkvpropedit)
if (dir->d_type == DT_REG &&
metadata_from_path(path, &meta) &&
- kara_metadata_write(&meta, path, mkvpropedit))
+ ! kara_metadata_write(&meta, path, mkvpropedit))
continue;
else if (dir->d_type == DT_DIR &&
!STR_MATCH(dir->d_name, ".") &&
@@ -226,6 +225,6 @@ metadata_set_file(char *karapath, const char *mkvpropedit)
struct kara_metadata meta;
return metadata_from_path(karapath, &meta) &&
- kara_metadata_write(&meta, karapath, mkvpropedit);
+ ! kara_metadata_write(&meta, karapath, mkvpropedit);
}
diff --git a/src/net/downloader.c b/src/net/downloader.c
index 7ccf0e5b..753e2092 100644
--- a/src/net/downloader.c
+++ b/src/net/downloader.c
@@ -381,7 +381,7 @@ __handle_got_json(volatile sqlite3 *db, struct lkt_repo *repo, struct json_objec
continue;
}
- if (!kara_metadata_write(&kara.mdt, kara.filename, mkvpropedit)) {
+ if (kara_metadata_write(&kara.mdt, kara.filename, mkvpropedit)) {
LOG_WARN_SCT("REPO", "Could not write metadata to kara '%ld' with path '%s'", kara.id, kara.filename);
continue;
}
--
GitLab