Local file handling improvements (fetch_file is incomplete and not being used yet)

filetype.c has been changed to get the MIME type of a file from the MIMETYPE tooltype
of the icon or default icon for the file.  The install script will set the basic of
these, and icons for default.css and AdBlock.css have been added to ensure these
always return the correct MIME type.

If the MIMETYPE tooltype is not found, the code will use datatypes.library to identify
the file and make a guess as to what the MIME type is.

svn path=/trunk/netsurf/; revision=5651

amiga/fetch_file.c

@@ -0,0 +1,193 @@
+/*
+ * Copyright 2008 Chris Young <chris@unsatisfactorysoftware.co.uk>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * Fetching of data from a file (implementation).
+ */
+
+#include <string.h>
+#include "content/fetch.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include <proto/dos.h>
+#include <proto/exec.h>
+
+/** Information for a single fetch. */
+struct ami_file_fetch_info {
+	struct fetch *fetch_handle; /**< The fetch handle we're parented by. */
+	BPTR fh;	/** File handle */
+	bool only_2xx;		/**< Only HTTP 2xx responses acceptable. */
+	char *path;
+	char *url;		/**< URL of this fetch. */
+};
+
+static bool ami_fetch_file_initialise(const char *scheme);
+static void ami_fetch_file_finalise(const char *scheme);
+static void * ami_fetch_file_setup(struct fetch *parent_fetch, const char *url,
+		 bool only_2xx, const char *post_urlenc,
+		 struct form_successful_control *post_multipart,
+		 const char **headers);
+static bool ami_fetch_file_start(void *vfetch);
+static void ami_fetch_file_abort(void *vf);
+static void ami_fetch_file_free(void *f);
+static void ami_fetch_file_poll(const char *scheme_ignored);
+
+/**
+ * Initialise the fetcher.
+ *
+ * Must be called once before any other function.
+ */
+
+void ami_fetch_file_register(void)
+{
+	if (!fetch_add_fetcher("file",
+				       ami_fetch_file_initialise,
+				       ami_fetch_file_setup,
+				       ami_fetch_file_start,
+				       ami_fetch_file_abort,
+				       ami_fetch_file_free,
+				       ami_fetch_file_poll,
+				       ami_fetch_file_finalise)) {
+			LOG(("Unable to register Amiga fetcher for file:"));
+	}
+}
+
+
+/**
+ * Initialise a cURL fetcher.
+ */
+
+bool ami_fetch_file_initialise(const char *scheme)
+{
+	LOG(("Initialise Amiga fetcher for %s", scheme));
+	return true; /* Always succeeds */
+}
+
+
+/**
+ * Finalise a cURL fetcher
+ */
+
+void ami_fetch_file_finalise(const char *scheme)
+{
+	LOG(("Finalise Amiga fetcher %s", scheme));
+}
+
+
+/**
+ * Start fetching data for the given URL.
+ *
+ * The function returns immediately. The fetch may be queued for later
+ * processing.
+ *
+ * A pointer to an opaque struct curl_fetch_info is returned, which can be passed to
+ * fetch_abort() to abort the fetch at any time. Returns 0 if memory is
+ * exhausted (or some other fatal error occurred).
+ *
+ * The caller must supply a callback function which is called when anything
+ * interesting happens. The callback function is first called with msg
+ * FETCH_TYPE, with the Content-Type header in data, then one or more times
+ * with FETCH_DATA with some data for the url, and finally with
+ * FETCH_FINISHED. Alternatively, FETCH_ERROR indicates an error occurred:
+ * data contains an error message. FETCH_REDIRECT may replace the FETCH_TYPE,
+ * FETCH_DATA, FETCH_FINISHED sequence if the server sends a replacement URL.
+ *
+ * Some private data can be passed as the last parameter to fetch_start, and
+ * callbacks will contain this.
+ */
+
+void * ami_fetch_file_setup(struct fetch *parent_fetch, const char *url,
+		 bool only_2xx, const char *post_urlenc,
+		 struct form_successful_control *post_multipart,
+		 const char **headers)
+{
+	struct ami_file_fetch_info *fetch;
+
+	fetch = AllocVec(sizeof (*fetch),MEMF_PRIVATE | MEMF_CLEAR);
+	if (!fetch)
+		return 0;
+
+	fetch->fetch_handle = parent_fetch;
+
+	LOG(("fetch %p, url '%s'", fetch, url));
+
+	/* construct a new fetch structure */
+	fetch->fh = 0;
+	fetch->only_2xx = only_2xx;
+//	fetch->url = strdup(url);
+	fetch->path = url_to_path(url);
+
+	return fetch;
+}
+
+
+/**
+ * Dispatch a single job
+ */
+bool ami_fetch_file_start(void *vfetch)
+{
+	struct ami_file_fetch_info *fetch = (struct ami_file_fetch_info*)vfetch;
+
+	fetch->fh = FOpen(fetch->path,MODE_OLDFILE,0);
+
+	if(fetch->fh) return true;
+		else return false;
+}
+
+void ami_fetch_file_abort(void *vf)
+{
+	struct ami_file_fetch_info *fetch = (struct ami_file_fetch_info*)vf;
+
+	if (fetch->fh) {
+		FClose(fetch->fh);
+		fetch->fh = 0;
+//		f->abort = true;
+	} else {
+		fetch_remove_from_queues(fetch->fetch_handle);
+		fetch_free(fetch->fetch_handle);
+	}
+}
+
+
+/**
+ * Free a fetch structure and associated resources.
+ */
+
+void ami_fetch_file_free(void *vf)
+{
+	struct ami_file_fetch_info *fetch = (struct ami_file_fetch_info*)vf;
+
+	if(fetch->fh)
+	{
+		FClose(fetch->fh);
+	}
+
+	FreeVec(fetch);
+}
+
+
+/**
+ * Do some work on current fetches.
+ *
+ * Must be called regularly to make progress on fetches.
+ */
+
+void ami_fetch_file_poll(const char *scheme_ignored)
+{
+}
+

amiga/fetch_file.h

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008 Chris Young <chris@unsatisfactorysoftware.co.uk>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * Fetching of data from a URL (Registration).
+ */
+
+#ifndef AMIGA_FETCH_FILE_H
+#define AMIGA_FETCH_FILE_H
+
+void ami_fetch_file_register(void);
+#endif

amiga/filetype.c

@@ -1,5 +1,4 @@
 /*
- * Copyright 2003 James Bursa <bursa@users.sourceforge.net>
  * Copyright 2008 Chris Young <chris@unsatisfactorysoftware.co.uk>
  *
  * This file is part of NetSurf, http://www.netsurf-browser.org/
@@ -22,6 +21,10 @@
 #include "content/fetch.h"
 #include "utils/log.h"
 #include "utils/utils.h"
+#include <proto/icon.h>
+#include <proto/dos.h>
+#include <proto/datatypes.h>
+#include <workbench/icon.h>
 
 /**
  * filetype -- determine the MIME type of a local file
@@ -29,24 +32,67 @@
 
 const char *fetch_filetype(const char *unix_path)
 {
-	int l;
-	LOG(("unix path %s", unix_path));
-	l = strlen(unix_path);
-	if (2 < l && strcasecmp(unix_path + l - 3, "css") == 0)
-		return "text/css";
-	if (2 < l && strcasecmp(unix_path + l - 3, "jpg") == 0)
-		return "image/jpeg";
-	if (3 < l && strcasecmp(unix_path + l - 4, "jpeg") == 0)
-		return "image/jpeg";
-	if (2 < l && strcasecmp(unix_path + l - 3, "gif") == 0)
-		return "image/gif";
-	if (2 < l && strcasecmp(unix_path + l - 3, "png") == 0)
-		return "image/png";
-	if (2 < l && strcasecmp(unix_path + l - 3, "jng") == 0)
-		return "image/jng";
-	if (2 < l && strcasecmp(unix_path + l - 3, "svg") == 0)
-		return "image/svg";
-	return "text/html";
+	static char mimetype[20];
+	STRPTR ttype = NULL;
+	struct DiskObject *dobj = NULL;
+	BPTR lock = 0;
+    struct DataTypeHeader *dth;
+    struct DataType *dtn;
+
+	/* First try getting a tooltype "MIMETYPE" and use that as the MIME type.  Will fail over
+		to default icons if the file doesn't have a real icon. */
+
+	if(dobj = GetIconTags(unix_path,ICONGETA_FailIfUnavailable,FALSE,
+						TAG_DONE))
+	{
+		ttype = FindToolType(dobj->do_ToolTypes, "MIMETYPE");
+		if(ttype) strcpy(mimetype,ttype);
+		FreeDiskObject(dobj);
+	}
+
+	if(!mimetype)
+	{
+		/* If that didn't work, have a go at guessing it using datatypes.library.  This isn't
+			accurate - the base names differ from those used by MIME and it relies on the
+			user having a datatype installed which can handle the file. */
+
+		if (lock = Lock (unix_path, ACCESS_READ))
+		{
+			if (dtn = ObtainDataTypeA (DTST_FILE, (APTR)lock, NULL))
+			{
+				dth = dtn->dtn_Header;
+
+				switch(dth->dth_GroupID)
+				{
+					case GID_SYSTEM:
+						sprintf(mimetype,"application/%s",dth->dth_BaseName);
+					break;
+					case GID_TEXT:
+					case GID_DOCUMENT:
+						sprintf(mimetype,"text/%s",dth->dth_BaseName);
+					break;
+					case GID_SOUND:
+					case GID_INSTRUMENT:
+					case GID_MUSIC:
+						sprintf(mimetype,"audio/%s",dth->dth_BaseName);
+					break;
+					case GID_PICTURE:
+						sprintf(mimetype,"image/%s",dth->dth_BaseName);
+					break;
+					case GID_ANIMATION:
+					case GID_MOVIE:
+						sprintf(mimetype,"video/%s",dth->dth_BaseName);
+					break;
+				}
+				ReleaseDataType(dtn);
+			}
+			UnLock(lock);
+		}
+	}
+
+	if(!mimetype) strcpy(mimetype,"text/plain"); /* If all else fails */
+
+	return mimetype;
 }