Changeset 4808

Timestamp:

11/20/08 11:04:46 (5 years ago)

Author:

tick

Message:

opkg: adding cache support

opkg-cl --cache <cache_directory>

Thank for Werner

Location:

trunk/src/target/opkg/libopkg

Files:

• args.c (modified) (5 diffs)
• args.h (modified) (1 diff)
• opkg.c (modified) (1 diff)
• opkg_conf.c (modified) (3 diffs)
• opkg_conf.h (modified) (1 diff)
• opkg_download.c (modified) (2 diffs)

trunk/src/target/opkg/libopkg/args.c

@@ -43 +43 @@
      ARGS_OPT_VERBOSITY,
      ARGS_OPT_MULTIPLE_PROVIDERS,
-     ARGS_OPT_AUTOREMOVE
+     ARGS_OPT_AUTOREMOVE,
+     ARGS_OPT_CACHE,
 };
 
@@ -93 +94 @@
      free (args->dest);
      free (args->tmp_dir);
+     free (args->cache);
      free(args->conf_file);
      args->conf_file = NULL;
@@ -105 +107 @@
           {"query-all", 0, 0, 'A'},
           {"autoremove", 0, 0, ARGS_OPT_AUTOREMOVE},
+          {"cache", 1, 0, ARGS_OPT_CACHE},
           {"conf-file", 1, 0, 'f'},
           {"conf", 1, 0, 'f'},
@@ -180 +183 @@
           case ARGS_OPT_AUTOREMOVE:
                args->autoremove = 1;
+               break;
+          case ARGS_OPT_CACHE:
+               free(args->cache);
+               args->cache = strdup(optarg);
                break;
           case ARGS_OPT_FORCE_DEFAULTS:
@@ -278 +285 @@
      printf("\t                         3 debug output\n");
      printf("\t-f <conf_file>           Use <conf_file> as the opkg configuration file\n");
+     printf("\t--cache <directory>      Use a package cache\n");
      printf("\t-conf <conf_file>        Default configuration file location\n");
      printf("                           is %s/%s\n", ARGS_DEFAULT_CONF_FILE_DIR, ARGS_DEFAULT_CONF_FILE_NAME);

trunk/src/target/opkg/libopkg/args.h

@@ -43 +43 @@
     char *offline_root_pre_script_cmd;
     char *offline_root_post_script_cmd;
+    char *cache;
 };
 typedef struct args args_t;

trunk/src/target/opkg/libopkg/opkg.c

@@ -272 +272 @@
     if (a->offline_root_post_script_cmd) free (a->offline_root_post_script_cmd);
     a->offline_root_post_script_cmd = strdup (c->offline_root_post_script_cmd);
+  }
+
+  if (c->cache) {
+    if (a->cache)
+        free (a->cache);
+    a->cache = strdup(c->cache);
   }
 

trunk/src/target/opkg/libopkg/opkg_conf.c

@@ -50 +50 @@
 {
      opkg_option_t tmp[] = {
+          { "cache", OPKG_OPT_TYPE_STRING, &conf->cache},
           { "force_defaults", OPKG_OPT_TYPE_BOOL, &conf->force_defaults },
           { "force_depends", OPKG_OPT_TYPE_BOOL, &conf->force_depends },
@@ -271 +272 @@
                                args->offline_root_post_script_cmd);
 
+     opkg_conf_override_string(&conf->cache, args->cache);
+
 /* Pigi: added a flag to disable the checking of structures if the command does not need to 
          read anything from there.
@@ -338 +341 @@
      opkg_conf_free_string(&conf->offline_root_pre_script_cmd);
      opkg_conf_free_string(&conf->offline_root_post_script_cmd);
+
+     opkg_conf_free_string(&conf->cache);
 
      if (conf->verbosity > 1) { 

trunk/src/target/opkg/libopkg/opkg_conf.h

@@ -71 +71 @@
      int verbosity;
      int noaction;
+     char *cache;
 
      /* proxy options */

trunk/src/target/opkg/libopkg/opkg_download.c

@@ -34 +34 @@
 #include "opkg_defines.h"
 
-int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name, curl_progress_func cb, void *data)
+static int do_download(opkg_conf_t *conf, const char *src,
+  const char *dest_file_name, curl_progress_func cb, void *data)
 {
     int err = 0;
@@ -136 +137 @@
 }
 
+int opkg_download(opkg_conf_t *conf, const char *src,
+  const char *dest_file_name, curl_progress_func cb, void *data)
+{
+    char *cache_name = strdup(src);
+    char *cache_location, *p;
+    int err = 0;
+
+    if (!conf->cache || str_starts_with(src, "file:")) {
+        err = do_download(conf, src, dest_file_name, cb, data);
+        goto out1;
+    }
+
+    for (p = cache_name; *p; p++)
+        if (*p == '/')
+            *p = ',';   /* looks nicer than | or # */
+
+    sprintf_alloc(&cache_location, "%s/%s", conf->cache, cache_name);
+    if (file_exists(cache_location))
+        opkg_message(conf, OPKG_NOTICE, "Copying %s\n", cache_location);
+    else {
+        err = do_download(conf, src, cache_location, cb, data);
+        if (err) {
+            (void) unlink(cache_location);
+            goto out2;
+        }
+    }
+
+    err = file_copy(cache_location, dest_file_name);
+
+
+out2:
+    free(cache_location);
+out1:
+    free(cache_name);
+    return err;
+}
+
 int opkg_download_pkg(opkg_conf_t *conf, pkg_t *pkg, const char *dir)
 {