Don't specify the mkvpropedit path with hard defined strings.

inc/lektor/mkv.h

@@ -44,7 +44,7 @@ int kara_metadata_write(struct kara_metadata *mdt, const char *filename,
                         const char *mkvpropedit);
 
 /* Set the metadata for the file according to its path. */
-int metadata_set_file(char *karapath);
+int metadata_set_file(char *karapath, const char *mkvpropedit);
 
 /* Set metadata for files under a given directory by their path. */
-int metadata_set_directory(const char *kara_dir);
+int metadata_set_directory(const char *kara_dir, const char *mkvpropedit);

src/main/lktadm.c

@@ -31,7 +31,7 @@ main(int argc, char *argv[])
     sqlite3 *db;
     bool ret = true;
     lkt_config_t conf;
-    char kara_dir[PATH_MAX], *db_path;
+    char kara_dir[PATH_MAX], *db_path, *mkvpropedit;
     struct kara_metadata data;
     struct lkt_repo repo;
 
@@ -45,6 +45,12 @@ main(int argc, char *argv[])
         return 1;
     }
 
+    /* In any case, we won't free the mkvpropedit, this is not a daemon. */
+    if (config_get_alloc(conf, "externals", "mkvpropedit", &mkvpropedit)) {
+        fprintf(stderr, " ! could not get the 'mkvpropedit property from the externals section\n'");
+        return 1;
+    }
+
     /* Arguments handle. */
 
     if (strcmp(argv[1], "--init") == 0) {
@@ -53,7 +59,7 @@ main(int argc, char *argv[])
             return 10;
         }
 
-        return metadata_set_directory(kara_dir);
+        return metadata_set_directory(kara_dir, mkvpropedit);
     }
 
     else if (strcmp(argv[1], "--populate-all") == 0) {
@@ -82,14 +88,14 @@ end_populate:
     else if (strcmp(argv[1], "--file") == 0) {
         ret = 0;
         for (i = 2; i < argc; ++i)
-            ret |= metadata_set_file(argv[i]);
+            ret |= metadata_set_file(argv[i], mkvpropedit);
         return ret;
     }
 
     else if (strcmp(argv[1], "--prompt-file") == 0) {
         ret = 0;
         for (i = 2; i < argc; ++i)
-            ret |= metadata_set_file(argv[i]);
+            ret |= metadata_set_file(argv[i], mkvpropedit);
         return ret;
     }
 

src/mkv/write.c

@@ -53,8 +53,7 @@ static const char *METADATA_TEMPLATE =
     "       <String>%d</String>                     "
     "     </Simple>                                 "
     "   </Tag>                                      "
-    "   </Tags>                                     "
-    ;
+    "   </Tags>                                     ";
 
 static bool
 mkvpropedit__(const char *const args[])
@@ -248,7 +247,7 @@ error:
 }
 
 int
-metadata_set_directory(const char *kara_dir)
+metadata_set_directory(const char *kara_dir, const char *mkvpropedit)
 {
     DIR *d;
     struct dirent *dir;
@@ -271,12 +270,12 @@ metadata_set_directory(const char *kara_dir)
 
         if (dir->d_type == DT_REG &&
             metadata_from_path(path, &meta) &&
-            kara_metadata_write(&meta, path, "/usr/bin/mkvpropedit"))
+            kara_metadata_write(&meta, path, mkvpropedit))
             continue;
         else if (dir->d_type == DT_DIR &&
                  strcmp(dir->d_name, ".") != 0 &&
                  strcmp(dir->d_name, "..") != 0)
-            metadata_set_directory(path);
+            metadata_set_directory(path, mkvpropedit);
     }
 
     fprintf(stderr, " * metadata_set_directory: Passed directory '%s'\n", kara_dir);
@@ -285,11 +284,11 @@ metadata_set_directory(const char *kara_dir)
 }
 
 int
-metadata_set_file(char *karapath)
+metadata_set_file(char *karapath, const char *mkvpropedit)
 {
     struct kara_metadata meta;
 
     return metadata_from_path(karapath, &meta) &&
-           kara_metadata_write(&meta, karapath, "/usr/bin/mkvpropedit");
+           kara_metadata_write(&meta, karapath, mkvpropedit);
 }