Merge pull request #20 from huobos/zh_CN

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

diff --git a/src/download.h b/src/download.h
index 424d28b71dbd6390c651b3da7f811bbdb01b12b6..e2339e279cf2b892243669c790a32d6981d60405 100644 (file)
--- a/src/download.h
+++ b/src/download.h
@@ -76,38 +76,27 @@ typedef struct {
    */
   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_PARAMETERS_ERROR = -8, // Configuration issue
+  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 */
-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, DownloadFileOptions *opt, void *handle );
+DownloadResult_t a_ftp_download_get_url ( const char *hostname, const char *uri, const char *fn, DownloadFileOptions *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 );
-
-/* 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, DownloadFileOptions *options );
 
 G_END_DECLS