Mapnik library needs full filename for the configuration file.

[andy/viking.git] / src / download.h

diff --git a/src/download.h b/src/download.h
index 7c1eb8474cded9c6eacaa0e58b6c8c5201713af4..39b6db066cf50f681c4c638026254a9869fb17bc 100644 (file)
--- a/src/download.h
+++ b/src/download.h
@@ -2,6 +2,7 @@
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>

+ * Copyright (C) 2007, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -24,12 +25,29 @@
 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

+G_BEGIN_DECLS
+

 /* File content check */
 typedef gboolean (*VikFileContentCheckerFunc) (FILE*);
 gboolean a_check_map_file(FILE*);
 gboolean a_check_html_file(FILE*);
 /* File content check */
 typedef gboolean (*VikFileContentCheckerFunc) (FILE*);
 gboolean a_check_map_file(FILE*);
 gboolean a_check_html_file(FILE*);

+gboolean a_check_kml_file(FILE*);
+// Convert
+void a_try_decompress_file (gchar *name);
+typedef void (*VikFileContentConvertFunc) (gchar*); // filename (temporary)

 
 typedef struct {
 
 typedef struct {

+  /**
+   * Check if the server has a more recent file than the one we have before downloading it
+   * This uses http header If-Modified-Since
+   */
+  gboolean check_file_server_time;
+
+  /**
+   * Set if the server handle ETag
+   */
+  gboolean use_etag;
+

   /**
    * The REFERER string to use.
    * Could be NULL.
   /**
    * The REFERER string to use.
    * Could be NULL.


@@ -46,10 +64,55 @@ typedef struct {
    * File content checker.
    */
   VikFileContentCheckerFunc check_file;
    * File content checker.
    */
   VikFileContentCheckerFunc check_file;

-} DownloadOptions;
+
+  /**
+   * If need to authenticate on download
+   *  format: 'username:password'
+   */
+  gchar *user_pass;
+
+  /**
+   * File manipulation if necessary such as uncompressing the downloaded file.
+   */
+  VikFileContentConvertFunc convert_file;
+
+} DownloadMapOptions;
+
+typedef struct {
+  /**
+   * Time sent to server on header If-Modified-Since
+   */
+  time_t time_condition;
+  /**
+   * Etag sent by server on previous download
+   */
+  char *etag;
+  /**
+   * Etag sent by server on this download
+   */
+  char *new_etag;
+
+} DownloadFileOptions;
+
+void a_download_init(void);
+void a_download_uninit(void);
+
+typedef enum {
+  DOWNLOAD_FILE_WRITE_ERROR = -4, // Can't write downloaded file :(
+  DOWNLOAD_HTTP_ERROR = -2,
+  DOWNLOAD_CONTENT_ERROR = -1,
+  DOWNLOAD_SUCCESS = 0,
+  DOWNLOAD_NOT_REQUIRED = 1, // Also 'successful'. e.g. Because file already exists and no time checks used
+} DownloadResult_t;

 
 /* TODO: convert to Glib */
 
 /* TODO: convert to Glib */

-int a_http_download_get_url ( const char *hostname, const char *uri, const char *fn, DownloadOptions *opt );
-int a_ftp_download_get_url ( const char *hostname, const char *uri, const char *fn, DownloadOptions *opt );
+DownloadResult_t a_http_download_get_url ( const char *hostname, const char *uri, const char *fn, DownloadMapOptions *opt, void *handle );
+DownloadResult_t a_ftp_download_get_url ( const char *hostname, const char *uri, const char *fn, DownloadMapOptions *opt, void *handle );
+void *a_download_handle_init ();
+void a_download_handle_cleanup ( void *handle );
+
+gchar *a_download_uri_to_tmp_file ( const gchar *uri, DownloadMapOptions *options );
+
+G_END_DECLS

 
 #endif
 
 #endif