core+helper/Update to v2 manifest + gzip kpkgs

Author: ThatHackerDudeFromCyberspace

kpm-helper.py

@@ -9,7 +9,7 @@
 import json
 import os
 
-KPM_MANIFEST_VERSION=1
+KPM_MANIFEST_VERSION=2
 valid_supported_platforms = [
     "kindle",
     "kindle5",
@@ -101,7 +101,12 @@ def pack(args):
         print("Packing...")
 
         packageFilename = os.path.join(args.output_path, f"{manifest['id']}_{'.'.join(str(x) for x in manifest['version'])}_{'-'.join(manifest.get('supported_platforms', ['kindleany']))}.kpkg")
-        with tarfile.open(packageFilename, "w|xz", preset=args.compression) as file:
+        if (args.compression != 0):
+            file = tarfile.open(packageFilename, "w:gz", compresslevel=args.compression)
+        else:
+            file = tarfile.open(packageFilename, "w:")
+
+        with file:
             for source_item_name in os.listdir(args.pkg_path):
                 if (source_item_name in ['rootfs', 'startup.sh']):
                     print(f"[ERR] A file or folder with the name '{source_item_name}' was detected in the package - This is currently reserved for future use")

meson.build

@@ -1,4 +1,4 @@
-project('kpm', 'c', version : '1.0.0', license : 'GPL', default_options: ['b_ndebug=if-release', 'c_std=gnu23'])
+project('kpm', 'c', version : '0.2.0', license : 'GPL', default_options: ['b_ndebug=if-release', 'c_std=gnu23'])
 
 KPM_PLATFORM = meson.get_external_property('kindle_platform', get_option('kindle_platform'))
 if KPM_PLATFORM == ''

src/include/kpm/kpm.h

@@ -17,10 +17,10 @@
 
 #include "semver.h"
 
-#define KPM_MANIFEST_VERSION 1
+#define KPM_MANIFEST_VERSION 2
 
 #define KPM_VERSION_MAJOR 0
-#define KPM_VERSION_MINOR 1
+#define KPM_VERSION_MINOR 2
 #define KPM_VERSION_PATCH 0
 
 enum KPMResult
@@ -100,7 +100,7 @@ struct InstalledPackage
     char* author; /**< The package author */
     char* description; /**< The package description */
     struct SemVer version; /**< The package version */
-    bool installed_as_dependency;
+    bool installed_as_dependency; /**< Whether or not this package was installed as a dependency of another package */
 };
 
 /**

src/index.c

@@ -209,6 +209,7 @@ enum KPMResult KPM_UpdateIndex(struct KPM *kpm, struct KPMIO* kpmIO)
         if (cJSON_GetNumberValue(cJSON_GetObjectItem(json, "manifest_version")) > KPM_MANIFEST_VERSION)
         {
             kpmIO->log(KPM_VERBOSITY_ERROR, "Invalid manifest version, got %.0f, expected %i", cJSON_GetNumberValue(cJSON_GetObjectItem(json, "manifest_version")), KPM_MANIFEST_VERSION);
+            kpmIO->log(KPM_VERBOSITY_ERROR, "You may need to update KPM, run: kpm install kpm or kpm upgrade");
             SimpleGET_Cleanup(&request);
             cJSON_Delete(json);
             continue;

src/kpm.c

@@ -86,7 +86,7 @@ enum KPMResult KPM_Initialise(struct KPM *kpm)
         ) STRICT;
     )", NULL, NULL, NULL);
 
-    sqlite3_exec(kpm->db, "INSERT INTO repositories (id, url, name, description) VALUES ('kindlemodding', 'https://repo.kindlemodding.org/manifest.json', 'Official KMC Repo', 'The official KMC repo')", NULL, NULL, NULL);
+    sqlite3_exec(kpm->db, "INSERT INTO repositories (id, url, name, description) VALUES ('kindlemodding', 'https://repo.kindlemodding.org/manifest.v2.json', 'Official KMC Repo', 'The official KMC repo') ON CONFLICT(id) DO UPDATE SET url='https://repo.kindlemodding.org/manifest.v2.json'", NULL, NULL, NULL);
 
     char* query = asprintf_hd("INSERT OR REPLACE INTO installed_packages (id, repository, name, author, description, version_major, version_minor, version_patch, installed_as_dependency) VALUES ('kpm', 'kindlemodding', 'KPM', 'Hackerdude', 'The Kindle Package Manager allows you to install and uninstall apps and programs easily on your Kindle', %i, %i, %i, 0)", KPM_VERSION_MAJOR, KPM_VERSION_MINOR, KPM_VERSION_PATCH);
     sqlite3_exec(kpm->db, query, NULL, NULL, NULL);