X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=tests%2Flibopkg_test.c;h=6288bd41484c7a4efbff6443b2f99dc1cf20b23b;hp=fe1cefd8839a59fb95c779d8db88e3c2c12730ba;hb=f53b702fecb08d1b8ee090bc48c12faeb5d4b49c;hpb=871744d4c3437d0de1294343b0fe4202f2111def

diff --git a/tests/libopkg_test.c b/tests/libopkg_test.c
index fe1cefd..6288bd4 100644
--- a/tests/libopkg_test.c
+++ b/tests/libopkg_test.c
@@ -2,10 +2,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+opkg_package_t *find_pkg = NULL;
+
 void
-progress_callback (opkg_t *opkg, int percent, void *data)
+progress_callback (opkg_t *opkg, const opkg_progress_data_t *progress, void *data)
 {
-  printf ("\r%s %3d%%", (char*) data, percent);
+  printf ("\r%s %3d%%", (char*) data, progress->percentage);
   fflush (stdout);
 }
 
@@ -23,7 +25,13 @@ package_list_callback (opkg_t *opkg, opkg_package_t *pkg, void *data)
   printf ("\rPackage count: %d Installed, %d Total Available", install_count, total_count);
   fflush (stdout);
 
-  opkg_package_free (pkg);
+  if (!find_pkg)
+  {
+    /* store the first package to print out later */
+    find_pkg = pkg;
+  }
+  else
+    opkg_package_free (pkg);
 }
 
 void
@@ -32,10 +40,36 @@ package_list_upgradable_callback (opkg_t *opkg, opkg_package_t *pkg, void *data)
   printf ("%s - %s\n", pkg->name, pkg->version);
 }
 
+void
+print_package (opkg_package_t *pkg)
+{
+  printf (
+      "Name:         %s\n"
+      "Version:      %s\n"
+      "Repository:   %s\n"
+      "Architecture: %s\n"
+      "Description:  %s\n"
+      "Tags:         %s\n"
+      "URL:          %s\n"
+      "Size:         %d\n"
+      "Installed:    %s\n",
+      pkg->name,
+      pkg->version,
+      pkg->repository,
+      pkg->architecture,
+      pkg->description,
+      pkg->tags,
+      pkg->url,
+      pkg->size,
+      (pkg->installed ? "True" : "False")
+      );
+}
+
 int
 main (int argc, char **argv)
 {
   opkg_t *opkg;
+  opkg_package_t *pkg;
   int err;
   
   opkg = opkg_new ();
@@ -47,6 +81,25 @@ main (int argc, char **argv)
   err = opkg_update_package_lists (opkg, progress_callback, "Updating...");
   printf ("\nopkg_update_package_lists returned %d\n", err);
 
+  opkg_list_packages (opkg, package_list_callback, NULL);
+  printf ("\n");
+
+  if (find_pkg)
+  {
+    printf ("Finding package \"%s\"\n", find_pkg->name);
+    pkg = opkg_find_package (opkg, find_pkg->name, find_pkg->version, find_pkg->architecture, find_pkg->repository);
+    if (pkg)
+    {
+      print_package (pkg);
+      opkg_package_free (find_pkg);
+      opkg_package_free (pkg);
+    }
+    else
+      printf ("Package \"%s\" not found!\n", find_pkg->name);
+  }
+  else
+    printf ("No package available to test find_package.\n");
+
   err = opkg_install_package (opkg, "aspell", progress_callback, "Installing...");
   printf ("\nopkg_install_package returned %d\n", err);
 
@@ -62,8 +115,7 @@ main (int argc, char **argv)
   err = opkg_upgrade_all (opkg, progress_callback, "Upgrading all...");
   printf ("\nopkg_upgrade_all returned %d\n", err);
 
-  opkg_list_packages (opkg, package_list_callback, NULL);
-  printf ("\n");
-
   opkg_free (opkg);
+
+  return 0;
 }