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 591c8919bd0021c0fd3c53a4ff1e4139c2421756..39b6db066cf50f681c4c638026254a9869fb17bc 100644 (file)
--- a/src/download.h
+++ b/src/download.h
@@ -25,11 +25,16 @@
 
 #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*);
 gboolean a_check_kml_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 {
   /**


@@ -60,6 +65,17 @@ typedef struct {
    */
   VikFileContentCheckerFunc check_file;
 
    */
   VikFileContentCheckerFunc check_file;
 

+  /**
+   * 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 {
 } DownloadMapOptions;
 
 typedef struct {


@@ -79,16 +95,24 @@ typedef struct {
 } DownloadFileOptions;
 
 void a_download_init(void);
 } 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, DownloadMapOptions *opt, void *handle );
-int a_ftp_download_get_url ( const char *hostname, const char *uri, const char *fn, DownloadMapOptions *opt, void *handle );
+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 );
 
 void *a_download_handle_init ();
 void a_download_handle_cleanup ( void *handle );
 

-/* Error messages returned by download functions */
-enum { DOWNLOAD_NO_ERROR = 0,
-       DOWNLOAD_NO_NEWER_FILE,
-       DOWNLOAD_ERROR };
+gchar *a_download_uri_to_tmp_file ( const gchar *uri, DownloadMapOptions *options );
+
+G_END_DECLS

 
 #endif
 
 #endif