zeitgeist team mailing list archive
-
zeitgeist team
-
Mailing list archive
-
Message #01054
[Merge] lp:~mhr3/zeitgeist/mimetypes into lp:zeitgeist
Michal Hruby has proposed merging lp:~mhr3/zeitgeist/mimetypes into lp:zeitgeist.
Requested reviews:
Zeitgeist Framework Team (zeitgeist)
--
https://code.launchpad.net/~mhr3/zeitgeist/mimetypes/+merge/26233
Your team Zeitgeist Framework Team is requested to review the proposed merge of lp:~mhr3/zeitgeist/mimetypes into lp:zeitgeist.
=== modified file '_zeitgeist/loggers/datasources/recent.py'
--- _zeitgeist/loggers/datasources/recent.py 2010-04-29 11:33:01 +0000
+++ _zeitgeist/loggers/datasources/recent.py 2010-05-27 19:34:36 +0000
@@ -24,8 +24,6 @@
from __future__ import with_statement
import os
-import re
-import fnmatch
import urllib
import time
import logging
@@ -34,6 +32,7 @@
from zeitgeist import _config
from zeitgeist.datamodel import Event, Subject, Interpretation, Manifestation, \
DataSource, get_timestamp_for_now
+from zeitgeist.mimetypes import get_interpretation_for_mimetype
from _zeitgeist.loggers.zeitgeist_base import DataProvider
log = logging.getLogger("zeitgeist.logger.datasources.recent")
@@ -51,166 +50,9 @@
else:
enabled = True
-class SimpleMatch(object):
- """ Wrapper around fnmatch.fnmatch which allows to define mimetype
- patterns by using shell-style wildcards.
- """
-
- def __init__(self, pattern):
- self.__pattern = pattern
-
- def match(self, text):
- return fnmatch.fnmatch(text, self.__pattern)
-
- def __repr__(self):
- return "%s(%r)" %(self.__class__.__name__, self.__pattern)
-
-DOCUMENT_MIMETYPES = [
- # Covers:
- # vnd.corel-draw
- # vnd.ms-powerpoint
- # vnd.ms-excel
- # vnd.oasis.opendocument.*
- # vnd.stardivision.*
- # vnd.sun.xml.*
- SimpleMatch(u"application/vnd.*"),
- # Covers: x-applix-word, x-applix-spreadsheet, x-applix-presents
- SimpleMatch(u"application/x-applix-*"),
- # Covers: x-kword, x-kspread, x-kpresenter, x-killustrator
- re.compile(u"application/x-k(word|spread|presenter|illustrator)"),
- u"application/ms-powerpoint",
- u"application/msword",
- u"application/pdf",
- u"application/postscript",
- u"application/ps",
- u"application/rtf",
- u"application/x-abiword",
- u"application/x-gnucash",
- u"application/x-gnumeric",
- SimpleMatch(u"application/x-java*"),
- SimpleMatch(u"*/x-tex"),
- SimpleMatch(u"*/x-latex"),
- SimpleMatch(u"*/x-dvi"),
- u"text/plain"
-]
-
-IMAGE_MIMETYPES = [
- # Covers:
- # vnd.corel-draw
- u"application/vnd.corel-draw",
- # Covers: x-kword, x-kspread, x-kpresenter, x-killustrator
- re.compile(u"application/x-k(word|spread|presenter|illustrator)"),
- SimpleMatch(u"image/*"),
-]
-
-AUDIO_MIMETYPES = [
- SimpleMatch(u"audio/*"),
- u"application/ogg"
-]
-
-VIDEO_MIMETYPES = [
- SimpleMatch(u"video/*"),
- u"application/ogg"
-]
-
-DEVELOPMENT_MIMETYPES = [
- u"application/ecmascript",
- u"application/javascript",
- u"application/x-csh",
- u"application/x-designer",
- u"application/x-desktop",
- u"application/x-dia-diagram",
- u"application/x-fluid",
- u"application/x-glade",
- u"application/xhtml+xml",
- u"application/x-java-archive",
- u"application/x-m4",
- u"application/xml",
- u"application/x-object",
- u"application/x-perl",
- u"application/x-php",
- u"application/x-ruby",
- u"application/x-shellscript",
- u"application/x-sql",
- u"text/css",
- u"text/html",
- u"text/x-c",
- u"text/x-c++",
- u"text/x-chdr",
- u"text/x-copying",
- u"text/x-credits",
- u"text/x-csharp",
- u"text/x-c++src",
- u"text/x-csrc",
- u"text/x-dsrc",
- u"text/x-eiffel",
- u"text/x-gettext-translation",
- u"text/x-gettext-translation-template",
- u"text/x-haskell",
- u"text/x-idl",
- u"text/x-java",
- u"text/x-lisp",
- u"text/x-lua",
- u"text/x-makefile",
- u"text/x-objcsrc",
- u"text/x-ocaml",
- u"text/x-pascal",
- u"text/x-patch",
- u"text/x-python",
- u"text/x-sql",
- u"text/x-tcl",
- u"text/x-troff",
- u"text/x-vala",
- u"text/x-vhdl",
-]
-
-ALL_MIMETYPES = DOCUMENT_MIMETYPES + IMAGE_MIMETYPES + AUDIO_MIMETYPES + \
- VIDEO_MIMETYPES + DEVELOPMENT_MIMETYPES
-
-class MimeTypeSet(set):
- """ Set which allows to match against a string or an object with a
- match() method.
- """
-
- def __init__(self, *items):
- super(MimeTypeSet, self).__init__()
- self.__pattern = set()
- for item in items:
- if isinstance(item, (str, unicode)):
- self.add(item)
- elif hasattr(item, "match"):
- self.__pattern.add(item)
- else:
- raise ValueError("Bad mimetype '%s'" %item)
-
- def __contains__(self, mimetype):
- result = super(MimeTypeSet, self).__contains__(mimetype)
- if not result:
- for pattern in self.__pattern:
- if pattern.match(mimetype):
- return True
- return result
-
- def __len__(self):
- return super(MimeTypeSet, self).__len__() + len(self.__pattern)
-
- def __repr__(self):
- items = ", ".join(sorted(map(repr, self | self.__pattern)))
- return "%s(%s)" %(self.__class__.__name__, items)
-
class RecentlyUsedManagerGtk(DataProvider):
- FILTERS = {
- # dict of name as key and the matching mimetypes as value
- # if the value is None this filter matches all mimetypes
- "DOCUMENT": MimeTypeSet(*DOCUMENT_MIMETYPES),
- "IMAGE": MimeTypeSet(*IMAGE_MIMETYPES),
- "MUSIC": MimeTypeSet(*AUDIO_MIMETYPES),
- "VIDEO": MimeTypeSet(*VIDEO_MIMETYPES),
- "SOURCE_CODE": MimeTypeSet(*DEVELOPMENT_MIMETYPES),
- }
-
def __init__(self, client):
DataProvider.__init__(self,
unique_id="com.zeitgeist-project,datahub,recent",
@@ -269,16 +111,6 @@
pass # file may be a broken symlink (LP: #523761)
return None
- def _get_interpretation_for_mimetype(self, mimetype):
- matching_filter = None
- for filter_name, mimetypes in self.FILTERS.iteritems():
- if mimetype and mimetype in mimetypes:
- matching_filter = filter_name
- break
- if matching_filter:
- return getattr(Interpretation, matching_filter).uri
- return ""
-
def _get_items(self):
# We save the start timestamp to avoid race conditions
last_seen = get_timestamp_for_now()
@@ -297,7 +129,7 @@
subject = Subject.new_for_values(
uri = unicode(uri),
- interpretation = self._get_interpretation_for_mimetype(
+ interpretation = get_interpretation_for_mimetype(
unicode(info.get_mime_type())),
manifestation = Manifestation.FILE_DATA_OBJECT.uri,
text = info.get_display_name(),
=== modified file 'test/engine-test.py'
--- test/engine-test.py 2010-05-15 13:15:44 +0000
+++ test/engine-test.py 2010-05-27 19:34:36 +0000
@@ -10,6 +10,7 @@
from _zeitgeist.engine import constants
from _zeitgeist.engine import get_engine
from zeitgeist.datamodel import *
+from zeitgeist.mimetypes import *
from testutils import import_events
import unittest
@@ -366,7 +367,30 @@
self.assertEquals(2, len(result))
events = self.engine.get_events(result)
-
+ def testMimetypeToInterpretation(self):
+ mimetype = "text/plain"
+ interpretation = get_interpretation_for_mimetype(mimetype)
+
+ event = Event()
+ event.interpretation = Manifestation.USER_ACTIVITY
+ event.manifestation = Interpretation.CREATE_EVENT
+ event.actor = "/usr/share/applications/gnome-about.desktop"
+
+ subject = Subject()
+ subject.uri = "file:///tmp/file.txt"
+ subject.manifestation = Manifestation.FILE_DATA_OBJECT
+ subject.interpretation = interpretation
+ subject.origin = "test://"
+ subject.mimetype = "text/plain"
+ subject.text = "This subject has no text"
+
+ event.append_subject(subject)
+ ids = self.engine.insert_events([event,])
+
+ results = self.engine.get_events([1])
+ self.assertEquals(1, len(results))
+ self.assertEquals(
+ interpretation, results[0].subjects[0].interpretation)
def testDontFindState(self):
# searchin by storage state is currently not implemented
=== added file 'test/test-mimetypes.py'
--- test/test-mimetypes.py 1970-01-01 00:00:00 +0000
+++ test/test-mimetypes.py 2010-05-27 19:34:36 +0000
@@ -0,0 +1,25 @@
+#! /usr/bin/python
+
+# Update python path to use local zeitgeist module
+import sys
+import os
+
+import zeitgeist.mimetypes
+
+# Test the mimetype -> Interpretation conversion
+mimetype = "image/png"
+i = zeitgeist.mimetypes.get_interpretation_for_mimetype(mimetype)
+print "Interpretation for %s: %s" % (mimetype, i)
+
+mimetype = "text/plain"
+i = zeitgeist.mimetypes.get_interpretation_for_mimetype(mimetype)
+print "Interpretation for %s: %s" % (mimetype, i)
+
+mimetype = "application/ogg"
+i = zeitgeist.mimetypes.get_interpretation_for_mimetype(mimetype)
+print "Interpretation for %s: %s" % (mimetype, i)
+
+mimetype = "unknown/invalid"
+i = zeitgeist.mimetypes.get_interpretation_for_mimetype(mimetype)
+print "Interpretation for %s: %s" % (mimetype, i)
+
=== modified file 'zeitgeist/Makefile.am'
--- zeitgeist/Makefile.am 2009-11-27 20:32:54 +0000
+++ zeitgeist/Makefile.am 2010-05-27 19:34:36 +0000
@@ -3,7 +3,8 @@
app_PYTHON = \
__init__.py \
datamodel.py \
- client.py
+ client.py \
+ mimetypes.py
nodist_app_PYTHON = _config.py
=== added file 'zeitgeist/mimetypes.py'
--- zeitgeist/mimetypes.py 1970-01-01 00:00:00 +0000
+++ zeitgeist/mimetypes.py 2010-05-27 19:34:36 +0000
@@ -0,0 +1,194 @@
+# -.- coding: utf-8 -.-
+
+# Zeitgeist
+#
+# Copyright © 2009-2010 Siegfried-Angel Gevatter Pujals <rainct@xxxxxxxxxx>
+# Copyright © 2009 Mikkel Kamstrup Erlandsen <mikkel.kamstrup@xxxxxxxxx>
+# Copyright © 2009 Markus Korn <thekorn@xxxxxx>
+# Copyright © 2010 Michal Hruby <michal.mhr@xxxxxxxxx>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import re
+import fnmatch
+
+from zeitgeist.datamodel import Interpretation
+
+class SimpleMatch(object):
+ """ Wrapper around fnmatch.fnmatch which allows to define mimetype
+ patterns by using shell-style wildcards.
+ """
+
+ def __init__(self, pattern):
+ self.__pattern = pattern
+
+ def match(self, text):
+ return fnmatch.fnmatch(text, self.__pattern)
+
+ def __repr__(self):
+ return "%s(%r)" %(self.__class__.__name__, self.__pattern)
+
+class MimeTypeSet(set):
+ """ Set which allows to match against a string or an object with a
+ match() method.
+ """
+
+ def __init__(self, *items):
+ super(MimeTypeSet, self).__init__()
+ self.__pattern = set()
+ for item in items:
+ if isinstance(item, (str, unicode)):
+ self.add(item)
+ elif hasattr(item, "match"):
+ self.__pattern.add(item)
+ else:
+ raise ValueError("Bad mimetype '%s'" %item)
+
+ def __contains__(self, mimetype):
+ result = super(MimeTypeSet, self).__contains__(mimetype)
+ if not result:
+ for pattern in self.__pattern:
+ if pattern.match(mimetype):
+ return True
+ return result
+
+ def __len__(self):
+ return super(MimeTypeSet, self).__len__() + len(self.__pattern)
+
+ def __repr__(self):
+ items = ", ".join(sorted(map(repr, self | self.__pattern)))
+ return "%s(%s)" %(self.__class__.__name__, items)
+
+DOCUMENT_MIMETYPES = [
+ # Covers:
+ # vnd.corel-draw
+ # vnd.ms-powerpoint
+ # vnd.ms-excel
+ # vnd.oasis.opendocument.*
+ # vnd.stardivision.*
+ # vnd.sun.xml.*
+ SimpleMatch(u"application/vnd.*"),
+ # Covers: x-applix-word, x-applix-spreadsheet, x-applix-presents
+ SimpleMatch(u"application/x-applix-*"),
+ # Covers: x-kword, x-kspread, x-kpresenter, x-killustrator
+ re.compile(u"application/x-k(word|spread|presenter|illustrator)"),
+ u"application/ms-powerpoint",
+ u"application/msword",
+ u"application/pdf",
+ u"application/postscript",
+ u"application/ps",
+ u"application/rtf",
+ u"application/x-abiword",
+ u"application/x-gnucash",
+ u"application/x-gnumeric",
+ SimpleMatch(u"application/x-java*"),
+ SimpleMatch(u"*/x-tex"),
+ SimpleMatch(u"*/x-latex"),
+ SimpleMatch(u"*/x-dvi"),
+ u"text/plain"
+]
+
+IMAGE_MIMETYPES = [
+ # Covers:
+ # vnd.corel-draw
+ u"application/vnd.corel-draw",
+ # Covers: x-kword, x-kspread, x-kpresenter, x-killustrator
+ re.compile(u"application/x-k(word|spread|presenter|illustrator)"),
+ SimpleMatch(u"image/*"),
+]
+
+AUDIO_MIMETYPES = [
+ SimpleMatch(u"audio/*"),
+ u"application/ogg"
+]
+
+VIDEO_MIMETYPES = [
+ SimpleMatch(u"video/*"),
+ u"application/ogg"
+]
+
+DEVELOPMENT_MIMETYPES = [
+ u"application/ecmascript",
+ u"application/javascript",
+ u"application/x-csh",
+ u"application/x-designer",
+ u"application/x-desktop",
+ u"application/x-dia-diagram",
+ u"application/x-fluid",
+ u"application/x-glade",
+ u"application/xhtml+xml",
+ u"application/x-java-archive",
+ u"application/x-m4",
+ u"application/xml",
+ u"application/x-object",
+ u"application/x-perl",
+ u"application/x-php",
+ u"application/x-ruby",
+ u"application/x-shellscript",
+ u"application/x-sql",
+ u"text/css",
+ u"text/html",
+ u"text/x-c",
+ u"text/x-c++",
+ u"text/x-chdr",
+ u"text/x-copying",
+ u"text/x-credits",
+ u"text/x-csharp",
+ u"text/x-c++src",
+ u"text/x-csrc",
+ u"text/x-dsrc",
+ u"text/x-eiffel",
+ u"text/x-gettext-translation",
+ u"text/x-gettext-translation-template",
+ u"text/x-haskell",
+ u"text/x-idl",
+ u"text/x-java",
+ u"text/x-lisp",
+ u"text/x-lua",
+ u"text/x-makefile",
+ u"text/x-objcsrc",
+ u"text/x-ocaml",
+ u"text/x-pascal",
+ u"text/x-patch",
+ u"text/x-python",
+ u"text/x-sql",
+ u"text/x-tcl",
+ u"text/x-troff",
+ u"text/x-vala",
+ u"text/x-vhdl",
+]
+
+ALL_MIMETYPES = DOCUMENT_MIMETYPES + IMAGE_MIMETYPES + AUDIO_MIMETYPES + \
+ VIDEO_MIMETYPES + DEVELOPMENT_MIMETYPES
+
+FILTERS = {
+ # dict of name as key and the matching mimetypes as value
+ # if the value is None this filter matches all mimetypes
+ "DOCUMENT": MimeTypeSet(*DOCUMENT_MIMETYPES),
+ "IMAGE": MimeTypeSet(*IMAGE_MIMETYPES),
+ "AUDIO": MimeTypeSet(*AUDIO_MIMETYPES),
+ "VIDEO": MimeTypeSet(*VIDEO_MIMETYPES),
+ "SOURCE_CODE": MimeTypeSet(*DEVELOPMENT_MIMETYPES),
+}
+
+def get_interpretation_for_mimetype(mimetype):
+ matching_filter = None
+ for filter_name, mimetypes in FILTERS.iteritems():
+ if mimetype and mimetype in mimetypes:
+ matching_filter = filter_name
+ break
+ if matching_filter:
+ return getattr(Interpretation, matching_filter).uri
+ return ""
+
Follow ups
