X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg.c;h=630b243954f596bb61aa8ee93e3bc5ae9a1b7563;hp=30bde2ef401248d632c99c1246465d6177b0c18f;hb=371254054431baca18545c4e02c9e588e7d95a66;hpb=4b1f75293bdff6372cf3e390d7875fd66c8afc01

diff --git a/libopkg/opkg.c b/libopkg/opkg.c
index 30bde2e..630b243 100644
--- a/libopkg/opkg.c
+++ b/libopkg/opkg.c
@@ -26,6 +26,7 @@
 #include "opkg_configure.h"
 #include "opkg_download.h"
 #include "opkg_remove.h"
+#include "opkg_upgrade.h"
 
 #include "sprintf_alloc.h"
 #include "file_util.h"
@@ -43,7 +44,8 @@ struct _opkg_t
     printf ("opkg: file %s: line %d (%s): Assertation '%s' failed",\
             __FILE__, __LINE__, __PRETTY_FUNCTION__, # expr); abort (); }
 
-#define progress(percent) if (progress_callback) progress_callback (opkg, percent, user_data);
+#define progress(d, p) d.percentage = p; if (progress_callback) progress_callback (opkg, &d, user_data);
+#define OLD_PKG_TO_NEW(pkg) opkg_package_new_with_values (pkg->name, pkg->version, pkg->architecture, pkg->description, pkg->tags, pkg->url, (pkg->size ? atoi (pkg->size) : 0), (pkg->state_status == SS_INSTALLED));
 
 /** Private Functions ***/
 
@@ -90,6 +92,7 @@ opkg_configure_packages(opkg_conf_t *conf, char *pkg_name)
 struct _curl_cb_data
 {
   opkg_progress_callback_t cb;
+  opkg_progress_data_t *progress_data;
   opkg_t *opkg;
   void *user_data;
   int start_range;
@@ -105,6 +108,7 @@ curl_progress_cb (struct _curl_cb_data *cb_data,
 {
   int p = (t) ? d * 100 / t : 0;
   static int prev = -1;
+  int progress = 0;
 
   /* prevent the same value being sent twice (can occur due to rounding) */
   if (p == prev)
@@ -114,8 +118,11 @@ curl_progress_cb (struct _curl_cb_data *cb_data,
   if (t < 1)
     return 0;
 
+  progress = cb_data->start_range + (d / t * ((cb_data->finish_range - cb_data->start_range)));
+  cb_data->progress_data->percentage = progress;
+
   (cb_data->cb)(cb_data->opkg,
-                cb_data->start_range + (d / t * ((cb_data->finish_range - cb_data->start_range))),
+                cb_data->progress_data,
                 cb_data->user_data);
 
   return 0;
@@ -124,6 +131,53 @@ curl_progress_cb (struct _curl_cb_data *cb_data,
 
 /*** Public API ***/
 
+opkg_package_t *
+opkg_package_new ()
+{
+
+  opkg_package_t *p;
+
+  p = malloc (sizeof (opkg_package_t));
+  memset (p, 0, sizeof (opkg_package_t));
+
+  return p;
+}
+
+opkg_package_t *
+opkg_package_new_with_values (const char *name, const char *version,
+    const char *arch, const char *desc, const char *tags, const char *url, int size, int installed)
+{
+  opkg_package_t *package;
+  package = opkg_package_new ();
+
+#define sstrdup(x) (x) ? strdup (x) : NULL;
+
+  package->name = sstrdup (name);
+  package->version = sstrdup (version);
+  package->architecture = sstrdup (arch);
+  package->description = sstrdup (desc);
+  package->tags = sstrdup (tags);
+  package->url = sstrdup (url);
+
+  package->size = size;
+  package->installed = (installed != 0);
+
+  return package;
+}
+
+void
+opkg_package_free (opkg_package_t *p)
+{
+  free (p->name);
+  free (p->version);
+  free (p->architecture);
+  free (p->description);
+  free (p->tags);
+  free (p->url);
+
+  free (p);
+}
+
 opkg_t *
 opkg_new ()
 {
@@ -150,7 +204,7 @@ opkg_free (opkg_t *opkg)
 }
 
 int
-opkg_read_config_files (opkg_t *opkg)
+opkg_re_read_config_files (opkg_t *opkg)
 {
   args_t *a;
   opkg_conf_t *c;
@@ -251,7 +305,7 @@ opkg_get_option (opkg_t *opkg, char *option, void **value)
 void
 opkg_set_option (opkg_t *opkg, char *option, void *value)
 {
-  int i = 0;
+  int i = 0, found = 0;
   opkg_option_t *options;
 
   opkg_assert (opkg != NULL);
@@ -267,11 +321,18 @@ opkg_set_option (opkg_t *opkg, char *option, void *value)
   {
     if (strcmp (options[i].name, option) == 0)
     {
+      found = 1;
       break;
     }
     i++;
   }
 
+  if (!found)
+  {
+    /* XXX: Warning: Option not found */
+    return;
+  }
+
   /* set the option */
   switch (options[i].type)
   {
@@ -298,19 +359,31 @@ opkg_install_package (opkg_t *opkg, const char *package_name, opkg_progress_call
 {
   int err;
   char *package_id = NULL;
+  opkg_progress_data_t pdata;
+  pkg_t *new;
 
   opkg_assert (opkg != NULL);
   opkg_assert (package_name != NULL);
 
-  progress (0);
+  /* ... */
+  pkg_info_preinstall_check (opkg->conf);
+
+  new = pkg_hash_fetch_best_installation_candidate_by_name (opkg->conf, package_name);
+
+  if (!new)
+  {
+    /* XXX: Error: Could not find package to install */
+    return 1;
+  }
+  pdata.action = OPKG_INSTALL;
+  pdata.package = OLD_PKG_TO_NEW (new);
+
+  progress (pdata, 0);
 
   /* download the package */
   opkg_prepare_url_for_install (opkg->conf, package_name, &package_id);
 
-  progress (50);
-
-  /* ... */
-  pkg_info_preinstall_check (opkg->conf);
+  progress (pdata, 50);
 
   if (!package_id)
     package_id = strdup (package_name);
@@ -328,7 +401,7 @@ opkg_install_package (opkg_t *opkg, const char *package_name, opkg_progress_call
   if (err)
     return err;
 
-  progress (75);
+  progress (pdata, 75);
 
   /* run configure scripts, etc. */
   err = opkg_configure_packages (opkg->conf, NULL);
@@ -339,7 +412,8 @@ opkg_install_package (opkg_t *opkg, const char *package_name, opkg_progress_call
   opkg_conf_write_status_files (opkg->conf);
   pkg_write_changed_filelists (opkg->conf);
 
-  progress (100);
+  progress (pdata, 100);
+  opkg_package_free (pdata.package);
   return 0;
 }
 
@@ -348,19 +422,15 @@ opkg_remove_package (opkg_t *opkg, const char *package_name, opkg_progress_callb
 {
   pkg_t *pkg = NULL;
   pkg_t *pkg_to_remove;
+  opkg_progress_data_t pdata;
 
   opkg_assert (opkg != NULL);
   opkg_assert (package_name != NULL);
 
-  progress (0);
 
-  pkg_info_preinstall_check (opkg->conf);
 
-  pkg_vec_t *installed_pkgs = pkg_vec_alloc ();
-
-  pkg_hash_fetch_all_installed (&opkg->conf->pkg_hash, installed_pkgs);
+  pkg_info_preinstall_check (opkg->conf);
 
-  progress (25);
 
   pkg = pkg_hash_fetch_installed_by_name (&opkg->conf->pkg_hash, package_name);
 
@@ -370,13 +440,17 @@ opkg_remove_package (opkg_t *opkg, const char *package_name, opkg_progress_callb
     return 1;
   }
 
+  pdata.action = OPKG_REMOVE;
+  pdata.package = OLD_PKG_TO_NEW (pkg);
+  progress (pdata, 0);
+
+
   if (pkg->state_status == SS_NOT_INSTALLED)
   {
     /* XXX:  Error: Package seems to be not installed (STATUS = NOT_INSTALLED). */
     return 1;
   }
-
-  progress (75);
+  progress (pdata, 25);
 
   if (opkg->conf->restrict_to_default_dest)
   {
@@ -390,7 +464,7 @@ opkg_remove_package (opkg_t *opkg, const char *package_name, opkg_progress_callb
   }
 
 
-  progress (75);
+  progress (pdata, 75);
 
   opkg_remove_pkg (opkg->conf, pkg_to_remove, 0);
 
@@ -399,7 +473,8 @@ opkg_remove_package (opkg_t *opkg, const char *package_name, opkg_progress_callb
   pkg_write_changed_filelists (opkg->conf);
 
 
-  progress (100);
+  progress (pdata, 100);
+  opkg_package_free (pdata.package);
   return 0;
 }
 
@@ -407,12 +482,13 @@ int
 opkg_upgrade_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t progress_callback, void *user_data)
 {
   pkg_t *pkg;
+  opkg_progress_data_t pdata;
+
+
 
   opkg_assert (opkg != NULL);
   opkg_assert (package_name != NULL);
 
-  progress (0);
-
   pkg_info_preinstall_check (opkg->conf);
 
   if (opkg->conf->restrict_to_default_dest)
@@ -438,13 +514,16 @@ opkg_upgrade_package (opkg_t *opkg, const char *package_name, opkg_progress_call
     return 1;
   }
 
-  progress (25);
+  pdata.action = OPKG_INSTALL;
+  pdata.package = OLD_PKG_TO_NEW (pkg);
+  progress (pdata, 0);
 
   opkg_upgrade_pkg (opkg->conf, pkg);
-  progress (75);
+  progress (pdata, 75);
 
   opkg_configure_packages (opkg->conf, NULL);
-  progress (100);
+  progress (pdata, 100);
+  opkg_package_free (pdata.package);
   return 0;
 }
 
@@ -455,9 +534,13 @@ opkg_upgrade_all (opkg_t *opkg, opkg_progress_callback_t progress_callback, void
   int err = 0;
   int i;
   pkg_t *pkg;
+  opkg_progress_data_t pdata;
+
+  pdata.action = OPKG_INSTALL;
+  pdata.package = NULL;
 
   opkg_assert (opkg != NULL);
-  progress (0);
+  progress (pdata, 0);
 
   installed = pkg_vec_alloc ();
   pkg_info_preinstall_check (opkg->conf);
@@ -466,8 +549,12 @@ opkg_upgrade_all (opkg_t *opkg, opkg_progress_callback_t progress_callback, void
   for (i = 0; i < installed->len; i++)
   {
     pkg = installed->pkgs[i];
+
+    pdata.package = OLD_PKG_TO_NEW (pkg);
+    progress (pdata, 99 * i / installed->len);
+    opkg_package_free (pdata.package);
+
     err += opkg_upgrade_pkg (opkg->conf, pkg);
-    progress (100 * i / installed->len);
   }
   pkg_vec_free (installed);
 
@@ -478,7 +565,8 @@ opkg_upgrade_all (opkg_t *opkg, opkg_progress_callback_t progress_callback, void
   if (err)
     return 1;
 
-  progress (100);
+  pdata.package = NULL;
+  progress (pdata, 100);
   return 0;
 }
 
@@ -491,10 +579,13 @@ opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callb
   pkg_src_list_elt_t *iter;
   pkg_src_t *src;
   int sources_list_count, sources_done;
+  opkg_progress_data_t pdata;
 
   opkg_assert (opkg != NULL);
 
-  progress (0);
+  pdata.action = OPKG_DOWNLOAD;
+  pdata.package = NULL;
+  progress (pdata, 0);
 
   sprintf_alloc (&lists_dir, "%s",
                  (opkg->conf->restrict_to_default_dest)
@@ -563,6 +654,7 @@ opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callb
       /* XXX: Note: downloading url */
 
       cb_data.cb = progress_callback;
+      cb_data.progress_data = &pdata;
       cb_data.opkg = opkg;
       cb_data.user_data = user_data;
       cb_data.start_range = 100 * sources_done / sources_list_count;
@@ -638,7 +730,7 @@ opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callb
     free (list_file_name);
 
     sources_done++;
-    progress (100 * sources_done / sources_list_count);
+    progress (pdata, 100 * sources_done / sources_list_count);
   }
 
   rmdir (tmp);
@@ -647,3 +739,74 @@ opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callb
 
   return 0;
 }
+
+
+int
+opkg_list_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_data)
+{
+  pkg_vec_t *all;
+  int i;
+
+  opkg_assert (opkg);
+  opkg_assert (callback);
+
+  all = pkg_vec_alloc ();
+  pkg_hash_fetch_available (&opkg->conf->pkg_hash, all);
+  for (i = 0; i < all->len; i++)
+  {
+    pkg_t *pkg;
+    opkg_package_t *package;
+
+    pkg = all->pkgs[i];
+
+    package = OLD_PKG_TO_NEW (pkg);
+    callback (opkg, package, user_data);
+  }
+
+  pkg_vec_free (all);
+
+  return 0;
+}
+
+int
+opkg_list_upgradable_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_data)
+{
+  pkg_vec_t *all;
+  int i;
+
+  opkg_assert (opkg);
+  opkg_assert (callback);
+
+  all = pkg_vec_alloc ();
+  pkg_hash_fetch_available (&opkg->conf->pkg_hash, all);
+  for (i = 0; i < all->len; i++)
+  {
+    pkg_t *old, *new;
+    int cmp;
+    opkg_package_t *package;
+
+    old = all->pkgs[i];
+    
+    if (old->state_status != SS_INSTALLED)
+      continue;
+
+    new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, old->name);
+    if (new == NULL) {
+      /* XXX: Notice: Assuming locally install package is up to date */
+      continue;
+    }
+          
+    cmp = pkg_compare_versions(old, new);
+
+    if (cmp < 0)
+    {
+      package = OLD_PKG_TO_NEW (new);
+      callback (opkg, package, user_data);
+    }
+  }
+
+  pkg_vec_free (all);
+
+  return 0;
+}
+