Merge lp:~mhr3/libzeitgeist/libzg-mimetypes-import into lp:libzeitgeist

[Michal Hruby]

Adds the ability to generate the zeitgeist-mimetypes source file using the data from Zeitgeist's mimetypes module.

[Seif Lotfy (seif)]

What is the major difference in zeitgeist-mimetypes.c? Should that not be replaced or depend on the mimetypes2c ?

[Seif Lotfy (seif)]

> What is the major difference in zeitgeist-mimetypes.c? Should that not be
> replaced or depend on the mimetypes2c ?

OK understood it now! Forget this comment! Good Job!

[Mikkel Kamstrup Erlandsen (kamstrup)]

Sorry for not reacting earlier, I was very tied up this week. Will look on it Monday!

[Mikkel Kamstrup Erlandsen (kamstrup)]

Very much sorry for the delay! As always, good work Michal! Approved!

review: Approve

=== modified file 'src/zeitgeist-mimetypes.c'
--- src/zeitgeist-mimetypes.c	2010-08-09 14:11:40 +0000
+++ src/zeitgeist-mimetypes.c	2010-09-06 00:12:59 +0000
@@ -240,218 +240,100 @@
 {
   if (mimes_loaded) return;
 
-  /* Star Office and OO.org */
-  zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.text.*",
-                               ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
-  zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.presentation.*",
-                               ZEITGEIST_NFO_PRESENTATION);
-  zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.spreadsheet.*",
-                               ZEITGEIST_NFO_SPREADSHEET);
-  zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.graphics.*",
-                               ZEITGEIST_NFO_VECTOR_IMAGE);
-  zeitgeist_register_mimetype_regex ("application/vnd\\..*",
-                                     ZEITGEIST_NFO_DOCUMENT);
-
-  /* x-applix-* */
-  zeitgeist_register_mimetype ("application/x-applix-word",
-                               ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
-  zeitgeist_register_mimetype ("application/x-applix-spreadsheet",
-                               ZEITGEIST_NFO_SPREADSHEET);
-  zeitgeist_register_mimetype ("application/x-applix-presents",
-                               ZEITGEIST_NFO_PRESENTATION);
-  zeitgeist_register_mimetype_regex ("application/x-applix-.*",
-                                     ZEITGEIST_NFO_DOCUMENT);
-
-  /* x-kword, x-kspread, x-kpresenter, x-killustrator */
-  zeitgeist_register_mimetype ("application/x-kword",
-                               ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
-  zeitgeist_register_mimetype ("application/x-kspread",
-                               ZEITGEIST_NFO_SPREADSHEET);
-  zeitgeist_register_mimetype ("application/x-kpresenter",
-                               ZEITGEIST_NFO_PRESENTATION);
-  zeitgeist_register_mimetype ("application/x-killustrator",
-                               ZEITGEIST_NFO_VECTOR_IMAGE);
-  
-  /* MS */
-  zeitgeist_register_mimetype ("application/ms-powerpoint",
-                               ZEITGEIST_NFO_PRESENTATION);
-  zeitgeist_register_mimetype ("application/vnd.ms-powerpoint",
-                               ZEITGEIST_NFO_PRESENTATION);
-  zeitgeist_register_mimetype ("application/msword",
-                               ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
-  zeitgeist_register_mimetype ("application/msexcel",
-                               ZEITGEIST_NFO_SPREADSHEET);
-  zeitgeist_register_mimetype ("application/ms-excel",
-                               ZEITGEIST_NFO_SPREADSHEET);
-  zeitgeist_register_mimetype ("application/vnd.ms-excel",
-                               ZEITGEIST_NFO_SPREADSHEET);
-  zeitgeist_register_mimetype_regex ("application/vnd.ms-excel.*",
-                               ZEITGEIST_NFO_SPREADSHEET);
-  zeitgeist_register_mimetype_regex ("application/vnd.ms-powerpoint.*",
-                                     ZEITGEIST_NFO_PRESENTATION);
-
-  /* pdf, postscript et al */
-  zeitgeist_register_mimetype ("application/pdf",
-                               ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
-  zeitgeist_register_mimetype ("application/postscript",
-                               ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
-  zeitgeist_register_mimetype ("application/ps",
-                               ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
-  zeitgeist_register_mimetype ("application/rtf",
-                               ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
-
-  /* Gnome office */
-  zeitgeist_register_mimetype ("application/x-abiword",
-                               ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
-  zeitgeist_register_mimetype ("application/x-gnucash",
-                               ZEITGEIST_NFO_SPREADSHEET);
-  zeitgeist_register_mimetype ("application/x-gnumeric",
-                               ZEITGEIST_NFO_SPREADSHEET);
-
-  /* TeX stuff */
-  zeitgeist_register_mimetype ("text/x-tex",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-latex",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype_regex (".*/x-dvi",
-                                     ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
-
-  /* Plain text */
+  zeitgeist_register_mimetype ("application/ogg", ZEITGEIST_NFO_AUDIO);
+  zeitgeist_register_mimetype ("text/x-credits", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-copying", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-perl", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("image/jpeg", ZEITGEIST_NFO_RASTER_IMAGE);
+  zeitgeist_register_mimetype ("application/x-kspread", ZEITGEIST_NFO_SPREADSHEET);
+  zeitgeist_register_mimetype ("application/postscript", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
+  zeitgeist_register_mimetype ("application/x-designer", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("image/png", ZEITGEIST_NFO_RASTER_IMAGE);
+  zeitgeist_register_mimetype ("application/x-gnucash", ZEITGEIST_NFO_SPREADSHEET);
+  zeitgeist_register_mimetype ("application/x-m4", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/ms-powerpoint", ZEITGEIST_NFO_PRESENTATION);
+  zeitgeist_register_mimetype ("image/x-xcf", ZEITGEIST_NFO_RASTER_IMAGE);
+  zeitgeist_register_mimetype ("application/x-java-archive", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-vala", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-python", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-lua", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/pdf", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
+  zeitgeist_register_mimetype ("text/x-csharp", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-gettext-translation-template", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-eiffel", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/xhtml+xml", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/ps", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
+  zeitgeist_register_mimetype ("text/x-java", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-gettext-translation", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-sql", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-killustrator", ZEITGEIST_NFO_VECTOR_IMAGE);
+  zeitgeist_register_mimetype ("application/x-desktop", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("image/svg+xml", ZEITGEIST_NFO_VECTOR_IMAGE);
+  zeitgeist_register_mimetype ("application/x-glade", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-php", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-shellscript", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-abiword", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
+  zeitgeist_register_mimetype ("image/gif", ZEITGEIST_NFO_RASTER_IMAGE);
+  zeitgeist_register_mimetype ("application/javascript", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-c++src", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/xml", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-vhdl", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/vnd.ms-excel", ZEITGEIST_NFO_SPREADSHEET);
+  zeitgeist_register_mimetype ("application/x-gnumeric", ZEITGEIST_NFO_SPREADSHEET);
+  zeitgeist_register_mimetype ("application/x-fluid", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-dsrc", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("image/tiff", ZEITGEIST_NFO_RASTER_IMAGE);
+  zeitgeist_register_mimetype ("text/x-makefile", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-objcsrc", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-haskell", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/vnd.corel-draw", ZEITGEIST_NFO_VECTOR_IMAGE);
+  zeitgeist_register_mimetype ("application/x-object", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-idl", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-ocaml", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-c", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-ruby", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-applix-presents", ZEITGEIST_NFO_PRESENTATION);
+  zeitgeist_register_mimetype ("application/ms-excel", ZEITGEIST_NFO_SPREADSHEET);
+  zeitgeist_register_mimetype ("application/x-kword", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
+  zeitgeist_register_mimetype ("text/x-troff", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-kpresenter", ZEITGEIST_NFO_PRESENTATION);
+  zeitgeist_register_mimetype ("application/rtf", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
+  zeitgeist_register_mimetype ("text/x-lisp", ZEITGEIST_NFO_SOURCE_CODE);
   zeitgeist_register_mimetype ("text/plain", ZEITGEIST_NFO_TEXT_DOCUMENT);
-  
-  /* HTML files on disk are always HTML_DOCUMENTS while online we should
-   * assume them to be WEBSITEs. By default we anticipate local files...  */
-  zeitgeist_register_mimetype ("text/html",
-                               ZEITGEIST_NFO_HTML_DOCUMENT);
-
-  /* Image types */
-  zeitgeist_register_mimetype ("application/vnd.corel-draw",
-                               ZEITGEIST_NFO_VECTOR_IMAGE);
-  zeitgeist_register_mimetype ("image/jpeg",
-                               ZEITGEIST_NFO_RASTER_IMAGE);
-  zeitgeist_register_mimetype ("image/png",
-                               ZEITGEIST_NFO_RASTER_IMAGE);
-  zeitgeist_register_mimetype ("image/tiff",
-                               ZEITGEIST_NFO_RASTER_IMAGE);
-  zeitgeist_register_mimetype ("image/gif",
-                               ZEITGEIST_NFO_RASTER_IMAGE);
-  zeitgeist_register_mimetype ("image/x-xcf",
-                               ZEITGEIST_NFO_RASTER_IMAGE);
-  zeitgeist_register_mimetype ("image/svg+xml",
-                               ZEITGEIST_NFO_VECTOR_IMAGE);
-  zeitgeist_register_mimetype_regex ("image/.*",
-                                     ZEITGEIST_NFO_IMAGE);
-
-  /* Audio */
-  zeitgeist_register_mimetype ("application/ogg",
-                               ZEITGEIST_NFO_AUDIO);
-  zeitgeist_register_mimetype ("audio/x-scpls",
-                               ZEITGEIST_NFO_MEDIA_LIST);
-  zeitgeist_register_mimetype_regex ("audio/.*",
-                                     ZEITGEIST_NFO_AUDIO);
-
-  /* Video */
-  zeitgeist_register_mimetype_regex ("video/.*",
-                                     ZEITGEIST_NFO_VIDEO);
-
-  /* Development files */
-  zeitgeist_register_mimetype ("application/ecmascript",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/javascript",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-csh",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-designer",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-desktop",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-dia-diagram",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-fluid",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-glade",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/xhtml+xml",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-java-archive",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-m4",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/xml",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-object",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-perl",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-php",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-ruby",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-shellscript",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("application/x-sql",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/css",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-c",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-c++",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-chdr",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-copying",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-credits",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-csharp",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-c++src",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-csrc",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-dsrc",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-eiffel",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-gettext-translation",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-gettext-translation-template",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-haskell",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-idl",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-java",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-lisp",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-lua",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-makefile",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-objcsrc",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-ocaml",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-pascal",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-patch",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-python",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-sql",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-tcl",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-troff",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-vala",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-vhdl",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("text/x-m4",
-                               ZEITGEIST_NFO_SOURCE_CODE);
-  
+  zeitgeist_register_mimetype ("text/x-latex", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-applix-word", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
+  zeitgeist_register_mimetype ("text/x-chdr", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/vnd.ms-powerpoint", ZEITGEIST_NFO_PRESENTATION);
+  zeitgeist_register_mimetype ("text/x-m4", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("audio/x-scpls", ZEITGEIST_NFO_MEDIA_LIST);
+  zeitgeist_register_mimetype ("text/html", ZEITGEIST_NFO_HTML_DOCUMENT);
+  zeitgeist_register_mimetype ("text/x-tex", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-dia-diagram", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-tcl", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-applix-spreadsheet", ZEITGEIST_NFO_SPREADSHEET);
+  zeitgeist_register_mimetype ("text/x-sql", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-pascal", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/msexcel", ZEITGEIST_NFO_SPREADSHEET);
+  zeitgeist_register_mimetype ("text/x-patch", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-csrc", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/x-c++", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/x-csh", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/ecmascript", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("text/css", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("application/msword", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
+  zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.text.*", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
+  zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.presentation.*", ZEITGEIST_NFO_PRESENTATION);
+  zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.spreadsheet.*", ZEITGEIST_NFO_SPREADSHEET);
+  zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.graphics.*", ZEITGEIST_NFO_VECTOR_IMAGE);
+  zeitgeist_register_mimetype_regex ("application/vnd\\..*", ZEITGEIST_NFO_DOCUMENT);
+  zeitgeist_register_mimetype_regex ("application/x-applix-.*", ZEITGEIST_NFO_DOCUMENT);
+  zeitgeist_register_mimetype_regex ("application/vnd.ms-excel.*", ZEITGEIST_NFO_SPREADSHEET);
+  zeitgeist_register_mimetype_regex ("application/vnd.ms-powerpoint.*", ZEITGEIST_NFO_PRESENTATION);
+  zeitgeist_register_mimetype_regex (".*/x-dvi", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
+  zeitgeist_register_mimetype_regex ("image/.*", ZEITGEIST_NFO_IMAGE);
+  zeitgeist_register_mimetype_regex ("audio/.*", ZEITGEIST_NFO_AUDIO);
+  zeitgeist_register_mimetype_regex ("video/.*", ZEITGEIST_NFO_VIDEO);
+
   mimes_loaded = TRUE;
 }
 
@@ -465,8 +347,7 @@
   zeitgeist_register_uri_scheme ("https://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
   zeitgeist_register_uri_scheme ("ssh://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
   zeitgeist_register_uri_scheme ("sftp://", ZEITGEIST_NFO_REMOTE_DATA_OBJECT);
-  // FIXME: Define more URI schemess
-  
+
   schemes_loaded = TRUE;
 }
 

=== added file 'tools/mimetypes2c.py'
--- tools/mimetypes2c.py	1970-01-01 00:00:00 +0000
+++ tools/mimetypes2c.py	2010-09-06 00:12:59 +0000
@@ -0,0 +1,88 @@
+#
+# Utility to transcode the Zeitgeist ontology from Python code
+# to a C header file defining a collection of macros for the
+# members of the ontology
+#
+
+import sys
+import re
+import zeitgeist.datamodel as dm
+from zeitgeist.mimetypes import MIMES, MIMES_REGEX, SCHEMES
+
+def caseconv(name):
+	"""
+	Converts CamelCase to CAMEL_CASE
+	"""
+	result = ""
+	for i in range(len(name) - 1) :
+		if name[i].islower() and name[i+1].isupper():
+			result += name[i].upper() + "_"
+		else:
+			result += name[i].upper()
+	result += name[-1].upper()
+	return result
+
+def symbolname (symbol):
+	try:
+		ns, name = symbol[symbol.rfind("/")+1:].split("#")
+		return "ZEITGEIST_%s_%s" % (ns.upper(), caseconv(name))
+	except Exception, e:
+		return symbol.uri.rpartition("#")[2].upper()
+
+def output_load_funcs (mimes_body, schemes_body):
+	mimes_header = """
+static void
+_ensure_mimes_loaded (void)
+{
+  if (mimes_loaded) return;
+
+%s
+
+  mimes_loaded = TRUE;
+}
+"""
+
+	schemes_header = """
+static void
+_ensure_schemes_loaded (void)
+{
+  if (schemes_loaded) return;
+
+%s
+
+  schemes_loaded = TRUE;
+}
+"""
+
+	# indent
+	m = mimes_header[1:] % re.sub(r'(?m)^(.+)$', r'  \1', mimes_body)
+	s = schemes_header[1:] % re.sub(r'(?m)^(.+)$', r'  \1', schemes_body)
+	return '\n'.join([m, s])
+
+def get_mimetypes_calls (simple_mimetypes, regex_mimetypes):
+	calls = []
+	for mimetype, interpretation in simple_mimetypes.items():
+		calls.append('zeitgeist_register_mimetype ("%s", %s);' % (mimetype, symbolname(interpretation)))
+
+	for mimetype_regex, interpretation in regex_mimetypes:
+		mimetype = re.sub(r'\\', '\\' * 4, str(mimetype_regex))
+		calls.append('zeitgeist_register_mimetype_regex ("%s", %s);' % (mimetype, symbolname(interpretation)))
+
+	return calls
+
+def get_schemes_calls (schemes):
+	calls = []
+	for scheme, manifestation in schemes:
+		calls.append('zeitgeist_register_uri_scheme ("%s", %s);' % (scheme, symbolname(manifestation)))
+
+	return calls
+
+if __name__ == "__main__":
+	all_mimes = get_mimetypes_calls(MIMES, MIMES_REGEX)
+	all_schemes = get_schemes_calls(SCHEMES)
+
+	assert(len(all_mimes) > 0 and len(all_schemes) > 0)
+
+	f = open('zeitgeist-mimetypes.template', 'r')
+	print f.read()
+	print output_load_funcs('\n'.join(all_mimes), '\n'.join(all_schemes))

=== added file 'tools/zeitgeist-mimetypes.template'
--- tools/zeitgeist-mimetypes.template	1970-01-01 00:00:00 +0000
+++ tools/zeitgeist-mimetypes.template	2010-09-06 00:12:59 +0000
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 2010 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * version 3.0 as published by the Free Software Foundation.
+ *
+ * This library 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 Lesser General Public License version 3.0 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authored by
+ *             Mikkel Kamstrup Erlandsen <[e-mail]>
+ */
+
+#include "zeitgeist-mimetypes.h"
+#include "zeitgeist-ontology-interpretations.h"
+#include "zeitgeist-ontology-manifestations.h"
+
+static void _ensure_mimes_loaded   (void);
+static void _ensure_schemes_loaded (void);
+
+static gboolean    mimes_loaded   = FALSE;
+static gboolean    schemes_loaded = FALSE;
+static GHashTable *mimes          = NULL;
+static GSList     *mimes_r        = NULL;
+static GSList     *schemes        = NULL;
+
+typedef struct
+{
+  gchar *scheme;
+  gchar *manifestation_uri;
+} UriScheme;
+
+typedef struct
+{
+  GRegex *regex;
+  gchar *interpretation_uri;
+} MimeRegex;
+
+static MimeRegex*
+mime_regex_new (const gchar *mimetype_regex, const gchar *interpretation_uri)
+{
+  MimeRegex *m = g_slice_new (MimeRegex);
+  m->regex = g_regex_new (mimetype_regex, 0, 0, NULL);
+  m->interpretation_uri = g_strdup (interpretation_uri);
+  return m;
+}
+
+/*static void
+mime_regex_free (MimeRegex *m)
+{
+  g_regex_unref (m->regex);
+  g_free (m->interpretation_uri);
+  g_slice_free (MimeRegex, m);
+}*/
+
+static UriScheme*
+uri_scheme_new (const gchar *uri_scheme, const gchar *manifestation_uri)
+{
+  UriScheme *s = g_slice_new (UriScheme);
+  s->scheme = g_strdup (uri_scheme);
+  s->manifestation_uri = g_strdup (manifestation_uri);
+  return s;
+}
+
+/*static void
+uri_scheme_free (UriScheme *s)
+{
+  g_free (s->scheme);
+  g_free (s->manifestation_uri);
+  g_slice_free (UriScheme, s);
+}*/
+
+
+
+/**
+ * zeitgeist_register_mimetype:
+ * @mimetype: A mimetype string. Fx. <emphasis>text/plain</emphasis>
+ * @interpretation_uri: A URI defining the interpretation type to associate with @mimetype
+ *
+ * Associate a mimetype with a given interpretation type. Registered mimetypes
+ * can be looked up with zeitgeist_interpretation_for_mimetype(). You can
+ * register a regular expression as mimetype if you instead of this function
+ * invoke zeitgeist_register_mimetype_regex().
+ *
+ * Mimetypes are first looked up by their exact name and then if none is
+ * found the regular expressions will be checked as fallbacks.
+ *
+ * This library will install a wide range a common mimetypes for you, so unless
+ * you have very specific needs you will normally not have to call this
+ * function.
+ *
+ * See the list of common
+ * <link linkend="zeitgeist-1.0-Interpretation-Ontology">interpretation types</link>.
+ */
+void
+zeitgeist_register_mimetype (const gchar *mimetype,
+                             const gchar *interpretation_uri)
+{
+  if (mimes == NULL)
+    mimes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+
+  g_hash_table_insert (mimes, g_strdup (mimetype),
+                       g_strdup (interpretation_uri));
+}
+
+/**
+ * zeitgeist_register_mimetype_regex:
+ * @mimetype_regex: A regular expression matching a certain range of mimetypes.
+ *                  Fx. <emphasis>text/.*</emphasis> to match all
+ *                 <emphasis>text</emphasis> sub types.
+ * @interpretation_uri: A URI defining the interpretation type to associate with
+ *                     the matched mimetypes
+ *
+ * Associate a range of mimetypes with a given interpretation type.
+ * Registered mimetypes can be looked up with
+ * zeitgeist_interpretation_for_mimetype(). If you only need to register one
+ * specific mimetype it is more efficient if you instead of this function
+ * call zeitgeist_register_mimetype().
+ *
+ * Mimetypes are first looked up by their exact name and then if none is
+ * found the regular expressions will be checked as fallbacks.
+ *
+ * This library will install a wide range a common mimetypes for you, so unless
+ * you have very specific needs you will normally not have to call this
+ * function.
+ *
+ * See the list of common
+ * <link linkend="zeitgeist-1.0-Interpretation-Ontology">interpretation types</link>.
+ */ 
+void
+zeitgeist_register_mimetype_regex (const gchar *mimetype_regex,
+                                    const gchar *interpretation_uri)
+{
+  mimes_r = g_slist_append (mimes_r,
+                            mime_regex_new (mimetype_regex,
+                                            interpretation_uri));
+}
+
+/**
+ * zeitgeist_interpretation_for_mimetype:
+ * @mimetype: A mimetype string. Fx. <emphasis>text/plain</emphasis>
+ *
+ * Look up the interpretation type associated with @mimetype. Please see the
+ * list of common
+ * <link linkend="zeitgeist-1.0-Interpretation-Ontology">interpretation types</link>.
+ *
+ * Returns: A URI defining the interpretation type associated with @mimetype or
+ *          %NULL in case @mimetype is unknown.
+ */ 
+const gchar*
+zeitgeist_interpretation_for_mimetype (const gchar *mimetype)
+{
+  const gchar *result;
+  GSList      *iter;
+  
+  _ensure_mimes_loaded();
+
+  /* First look in our hash table */
+  result = g_hash_table_lookup (mimes,
+                                mimetype);
+  if (result != NULL)
+    return result;
+
+  /* Check our regexes */
+  for (iter = mimes_r; iter; iter = iter->next)
+    {
+      MimeRegex *m = (MimeRegex*) iter->data;
+      if (g_regex_match (m->regex, mimetype, 0, NULL))
+        return m->interpretation_uri;
+    }
+
+  return NULL;
+}
+
+/**
+ * zeitgeist_register_uri_scheme:
+ * @uri_scheme: A URI scheme such as <emphasis>http://</emphasis>
+ * @manifestation_uri: A URI defining the manifestation type to associate with
+ *                     @uri_scheme
+ *
+ * Associate a URI scheme with a given manifestation type.
+ * You can find the manifestation type of a given URI by passing it to
+ * zeitgeist_manifestation_for_uri().
+ *
+ * This library will install a range a common URI schemes for you, so unless
+ * you have very specific needs you will normally not have to call this
+ * function.
+ *
+ * See the list of common
+ * <link linkend="zeitgeist-1.0-Manifestation-Ontology">manifestation types</link>.
+ */
+void
+zeitgeist_register_uri_scheme (const gchar *uri_scheme,
+                               const gchar *manifestation_uri)
+{
+  schemes = g_slist_append (schemes,
+                            uri_scheme_new (uri_scheme, manifestation_uri));
+}
+
+/**
+ * zeitgeist_manifestation_for_uri:
+ * @uri: A URI
+ * 
+ * Look up a manifestation type for a given URI. Eg. if you pass in
+ * <emphasis>file:///tmp/foo.txt</emphasis> you will get back
+ * #ZEITGEIST_NFO_FILE_DATA_OBJECT.
+ *
+ * See the list of common
+ * <link linkend="zeitgeist-1.0-Manifestation-Ontology">manifestation types</link>.
+ *
+ * Returns: A manifestation type for @uri or %NULL in case no suitable
+ *          manifestation type is known
+ */
+const gchar*
+zeitgeist_manifestation_for_uri (const gchar *uri)
+{
+  GSList      *iter;
+  
+  _ensure_schemes_loaded();
+
+  for (iter = schemes; iter; iter = iter->next)
+    {
+      UriScheme *s = (UriScheme*) iter->data;
+      if (g_str_has_prefix (uri, s->scheme))
+        return s->manifestation_uri;
+    }
+
+  return NULL;
+}