Skip to content
Extraits de code Groupes Projets
Vérifiée Valider ce5d0e69 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

Deleting depracted function

parent 7cc3a326
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!44Metadata write
...@@ -96,48 +96,6 @@ mkvpropedit__(const char *const args[]) ...@@ -96,48 +96,6 @@ mkvpropedit__(const char *const args[])
return true; return true;
} }
/* XXX: To be deleted. */
static bool
metadata_write(char *const mkvfile, struct kara_metadata *meta, int num)
{
char tmpfilepath[PATH_MAX];
char *const metadafilepath = &tmpfilepath[4];
const char *const args1[] = { "mkvpropedit", "-t", "all:", mkvfile, NULL };
const char *const args2[] = { "mkvpropedit", "-t", tmpfilepath, mkvfile, NULL };
int fd;
bool sta = false;
memset(tmpfilepath, 0, PATH_MAX);
strncat(tmpfilepath, "all:/tmp/lektor.metadata.XXXXXX", PATH_MAX - 1);
if ((fd = mkstemp(metadafilepath)) < 0) {
fprintf(stderr, " ! metadata_write: failed to create temporary file: %s\n",
strerror(errno));
goto error;
}
if (dprintf(fd, METADATA_TEMPLATE, meta->source_name, meta->song_name, meta->category,
meta->language, meta->author_name, meta->song_type, num) < 0) {
fprintf(stderr, " ! metadata_write: failed to write to temporary file: %s\n",
metadafilepath);
goto error;
}
// First command //
if (!mkvpropedit__(args1))
goto error;
// Second command //
if (!mkvpropedit__(args2))
goto error;
sta = true;
error:
close(fd);
unlink(metadafilepath);
return sta;
}
int int
kara_metadata_write(struct kara_metadata *mdt, const char *filename, const char *mkvpropedit) kara_metadata_write(struct kara_metadata *mdt, const char *filename, const char *mkvpropedit)
{ {
...@@ -180,13 +138,13 @@ error: ...@@ -180,13 +138,13 @@ error:
} }
static bool static bool
metadata_from_path(char *const mkvfile, struct kara_metadata *meta, int *const num) metadata_from_path(char *const mkvfile, struct kara_metadata *meta)
{ {
pcre *regex = NULL; pcre *regex = NULL;
pcre_extra *pcre_extra = NULL; pcre_extra *pcre_extra = NULL;
bool sta = false; bool sta = false;
const int sub_str_vec_len = 30; const int sub_str_vec_len = 30;
int pcre_error_offset, pcre_exec_ret, sub_str_vec[sub_str_vec_len], i; int pcre_error_offset, pcre_exec_ret, sub_str_vec[sub_str_vec_len], i, num;
char num_str[LEKTOR_TAG_MAX]; char num_str[LEKTOR_TAG_MAX];
const char *substr; const char *substr;
char *copy_to; char *copy_to;
...@@ -273,8 +231,7 @@ metadata_from_path(char *const mkvfile, struct kara_metadata *meta, int *const n ...@@ -273,8 +231,7 @@ metadata_from_path(char *const mkvfile, struct kara_metadata *meta, int *const n
pcre_free_substring(substr); pcre_free_substring(substr);
} }
if ((*num = atoi(num_str)) <= 0) meta->song_number = ((num = atoi(num_str)) <= 0) ? 1 : num;
* num = 1;
sta = true; sta = true;
error: error:
pcre_free(regex); pcre_free(regex);
...@@ -297,7 +254,6 @@ metadata_set_directory(const char *kara_dir) ...@@ -297,7 +254,6 @@ metadata_set_directory(const char *kara_dir)
struct dirent *dir; struct dirent *dir;
char path[PATH_MAX]; char path[PATH_MAX];
struct kara_metadata meta; struct kara_metadata meta;
int num;
memset(path, 0, PATH_MAX * sizeof(char)); memset(path, 0, PATH_MAX * sizeof(char));
d = opendir(kara_dir); d = opendir(kara_dir);
...@@ -314,8 +270,8 @@ metadata_set_directory(const char *kara_dir) ...@@ -314,8 +270,8 @@ metadata_set_directory(const char *kara_dir)
strncat(path, dir->d_name, PATH_MAX - 1); strncat(path, dir->d_name, PATH_MAX - 1);
if (dir->d_type == DT_REG && if (dir->d_type == DT_REG &&
metadata_from_path(path, &meta, &num) && metadata_from_path(path, &meta) &&
metadata_write(path, &meta, num)) kara_metadata_write(&meta, path, "/usr/bin/mkvpropedit"))
continue; continue;
else if (dir->d_type == DT_DIR && else if (dir->d_type == DT_DIR &&
strcmp(dir->d_name, ".") != 0 && strcmp(dir->d_name, ".") != 0 &&
...@@ -331,10 +287,9 @@ metadata_set_directory(const char *kara_dir) ...@@ -331,10 +287,9 @@ metadata_set_directory(const char *kara_dir)
int int
metadata_set_file(char *karapath) metadata_set_file(char *karapath)
{ {
int num;
struct kara_metadata meta; struct kara_metadata meta;
return metadata_from_path(karapath, &meta, &num) && return metadata_from_path(karapath, &meta) &&
metadata_write(karapath, &meta, num); kara_metadata_write(&meta, karapath, "/usr/bin/mkvpropedit");
} }
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter