Merge lp:~jderose/dmedia/core-api into lp:dmedia

[Jason Gerard DeRose]

This is just for fun so everyone (including myself) can gasp at how many lines this diff is probably going to be.

But *all* the unit tests pass, including that one pesky client => dbus test that has been failing for the last 2 months. I've beat up on this a lot, has been solid. Now it's time for the daily build users to abuse it as best they can. Huge change, sorry. Now I'll get back to saner merges, promise.

Lots of awesome changes, too tired to explain them all right now. Oh, but one cool one... you can now run dmedia against system-wide CouchDB if you want. Just launch `dmedia-service` with the --no-dc option. This wont work with DBus itself launching it, though, must be manual. Will need to add a config file or somesuch.

[James Raymond (jamesmr)]

Retrospective review says "Looks dandy!"

review: Approve

[Jason Gerard DeRose (jderose)]

Thanks James, you deserve to be Knighted for reading through all that!

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2011-03-27 14:12:36 +0000
+++ MANIFEST.in	2011-04-11 12:02:24 +0000
@@ -1,4 +1,5 @@
-include AUTHORS COPYING HACKING.txt README.txt
-include dmedia-service
-include dmedia/webui/data/*
+include AUTHORS COPYING HACKING.txt
+include dmedia/tests/*.py
 include dmedia/tests/data/*
+include dmedia/webui/tests/*.py
+include dmedia/gtkui/tests/*.py

=== modified file 'dmedia-cli'
--- dmedia-cli	2010-12-29 13:58:00 +0000
+++ dmedia-cli	2011-04-11 12:02:24 +0000
@@ -5,7 +5,7 @@
 #   David Green <[e-mail]>
 #
 # dmedia: distributed media library
-# Copyright (C) 2010 Jason Gerard DeRose <[e-mail]>
+# Copyright (C) 2010, 2011 Jason Gerard DeRose <[e-mail]>
 #
 # This file is part of `dmedia`.
 #
@@ -24,174 +24,76 @@
 
 
 """
-WARNING: the dmedia content-hash and schema are *not* yet stable, may change
-wildly and without warning!
-
-This will eventually be turned into a VCS-style script with several commands.
-For now it has a single function, to recursively import media files from a
-directory.  At this point, is is a quick-and-dirty demo of how media files might
-be stored and how their meta-data might be stored.
-
-For example, say we scan all the JPEG images in the '/usr/share/backgrounds'
-directory:
-
-    dmedia /usr/share/backgrounds jpg
-
-Media files are identified by their unique Id which is generated by their
-base32-encoded sha1 content-hash.  In the above example, the
-'Life_by_Paco_Espinoza.jpg' file happens to have a sha1 content-hash of
-'6BRRXCGRM2GKVPTREJPGRNGUR2GF2L4K'.  As such, this file will be stored at:
-
-    ~/.dmedia/6B/RRXCGRM2GKVPTREJPGRNGUR2GF2L4K.jpg
-
-Meta-data for the media files is stored in CouchDB using desktopcouch.  Each
-media file has its own document.  The sha1 content-hash is used as the document
-'_id'.  For example, the 'Life_by_Paco_Espinoza.jpg' file has a document that
-looks like this:
-
-    {
-       "_id": "6BRRXCGRM2GKVPTREJPGRNGUR2GF2L4K",
-       "_rev": "1-c19ea015eb53ede147d63d55f3967d13",
-       "name": "Life_by_Paco_Espinoza.jpg",
-       "record_type": "http://example.com/dmedia",
-       "bytes": 360889,
-       "height": 1500,
-       "shutter": "1/400",
-       "width": 2000,
-       "ext": "jpg",
-       "camera": "DSC-H5",
-       "iso": 125,
-       "focal_length": "6.0 mm",
-       "mtime": 1284394022,
-       "aperture": 4
-    }
-
-All media files will have the following fields:
-
-    bytes - File size in bytes
-    mtime - Value of path.getmtime() at time of import
-    name - The path.basename() part of the original source file
-    ext - The extension of the original source file, normalized to lower-case
-
-Additional fields depend upon the type of media file.  For example, image and
-video files will always have 'width' and 'height', whereas video and audio files
-will always have a 'duration'.
-
-You can browse through the dmedia database using a standard web-browser, like
-this:
-
-  xdg-open ~/.local/share/desktop-couch/couchdb.html
-
-Note that the sha1 hash is only being used as a stop-gap.  dmedia will use the
-Skein hash after its final constant tweaks are made.  See:
-
-  http://blog.novacut.com/2010/09/how-about-that-skein-hash.html
+Command line tool for talking to dmedia DBus services.
 """
 
 from __future__ import print_function
 
-import sys
-import os
-from os import path
-import optparse
-import xdg.BaseDirectory
-import gobject
+import argparse
+import json
+
 import dmedia
-from dmedia.client import Client
-
-script = path.basename(sys.argv[0])
-
-parser = optparse.OptionParser(
-    version=dmedia.__version__,
-    usage='Usage: %s DIRECTORY [EXTENSIONS...]' % script,
-    epilog='Example: %s /media/EOS_DIGITAL jpg cr2 mov' % script,
-)
-parser.add_option('--kill',
-    action='store_true',
-    default=False,
-    help='shutdown dmedia-service daemon and exit',
-)
-parser.add_option('--quick',
-    dest='extract',
-    action='store_false',
-    default=True,
-    help='import without metadata extraction or thumbnail generation',
-)
-parser.add_option('--type',
-    action='append',
-    default=[],
-    help='import all files of TYPE ("video", "audio", or "image")'
-)
-(options, args) = parser.parse_args()
-
-
-# Check if they just want us to kill the daemon
-if options.kill:
-    print('Telling dmedia-service daemon to shutdown...')
-    Client().kill()
-    print('Shutdown.')
-    sys.exit()
-
-
-if len(args) < 1:
-    parser.print_usage()
-    sys.exit('ERROR: must provide DIRECTORY')
-base = path.abspath(args[0])
-if not path.isdir(base):
-    parser.print_usage()
-    sys.exit('ERROR: not a directory: %r' % base)
-
-
-extensions = list(a.lower().strip('.') for a in args[1:])
-
-
-class CLI(object):
-    def __init__(self, base):
-        self.base = base
-        self.mainloop = gobject.MainLoop()
-        self.client = Client()
-        self.client.connect('import_started', self.on_import_started)
-        self.client.connect('import_count', self.on_import_count)
-        self.client.connect('import_progress', self.on_import_progress)
-        self.client.connect('import_finished', self.on_import_finished)
-
-    def on_import_started(self, client, base, import_id):
-        if base != self.base:
-            return
-        print('Started import of %s' % base)
-        print ('  import_id = %s' % import_id)
-
-    def on_import_count(self, client, base, import_id, total):
-        if base != self.base:
-            return
-        print('Found %d files' % total)
-
-    def on_import_progress(self, c, base, import_id, completed, total, info):
-        if base != self.base:
-            return
-        print('  %(action)s %(src)s' % info)
-
-    def on_import_finished(self, c, base, import_id, stats):
-        if base != self.base:
-            return
-        print('-' * 80)
-        for key in sorted(stats):
-            print('%s=%d' % (key, stats[key]))
-        self.mainloop.quit()
-
-    def run(self, options):
-        try:
-            self.client.start_import(self.base, options.extract)
-            self.mainloop.run()
-        except KeyboardInterrupt:
-            self.client.stop_import(self.base)
-            print('\nImport stopped')
-
-        couchdb_data_path = xdg.BaseDirectory.save_data_path('desktop-couch')
-        dc = path.join(couchdb_data_path, 'couchdb.html')
-        print('\nBrowse the `dmedia` database in CouchDB:')
-        print('  file://%s\n' % dc)
-
-
-cli = CLI(base)
-cli.run(options)
+from dmedia.constants import BUS
+
+
+parser = argparse.ArgumentParser(
+    description='Execute methods on dmedia DBus services',
+)
+parser.add_argument('--version', action='version', version=dmedia.__version__)
+parser.add_argument('--bus',
+    help='DBus bus name; default is %(default)r',
+    default=BUS,
+)
+
+subparsers = parser.add_subparsers(
+    title='Commands from {!r}'.format(BUS)
+)
+
+
+p_version = subparsers.add_parser('version',
+    help='get version of running dmedia service',
+)
+def do_version(dm, args):
+    print(
+        '{} {}'.format(args.bus, dm.version())
+    )
+p_version.set_defaults(func=do_version)
+
+
+p_kill = subparsers.add_parser('kill',
+    help='kill `dmedia-service`',
+)
+def do_kill(dm, args):
+    print('Killing {}...'.format(args.bus))
+    dm.kill()
+p_kill.set_defaults(func=do_kill)
+
+
+p_get_env = subparsers.add_parser('get-env',
+    help='echo out JSON encoded env dict',
+)
+def do_get_env(dm, args):
+    print(json.dumps(dm.get_env(), sort_keys=True, indent=2))
+p_get_env.set_defaults(func=do_get_env)
+
+
+p_get_auth_url = subparsers.add_parser('get-auth-url',
+    help='echo desktopcouch basic auth URL',
+)
+def do_get_auth_url(dm, args):
+    print(dm.get_auth_url())
+p_get_auth_url.set_defaults(func=do_get_auth_url)
+
+
+p_has_app = subparsers.add_parser('has-app',
+    help='show whether the WebUI app is available',
+)
+def do_has_app(dm, args):
+    print(bool(dm.has_app()))
+p_has_app.set_defaults(func=do_has_app)
+
+
+args = parser.parse_args()
+from dmedia.api import DMedia
+dm = DMedia(args.bus)
+args.func(dm, args)

=== modified file 'dmedia-gtk'
--- dmedia-gtk	2011-03-28 21:55:42 +0000
+++ dmedia-gtk	2011-04-11 12:02:24 +0000
@@ -4,7 +4,7 @@
 #   Jason Gerard DeRose <[e-mail]>
 #
 # dmedia: distributed media library
-# Copyright (C) 2010 Jason Gerard DeRose <[e-mail]>
+# Copyright (C) 2010, 2011 Jason Gerard DeRose <[e-mail]>
 #
 # This file is part of `dmedia`.
 #
@@ -21,48 +21,58 @@
 # You should have received a copy of the GNU Affero General Public License along
 # with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
-from subprocess import check_call
-import optparse
+from __future__ import print_function
+
+import argparse
+from gettext import gettext as _
+
 import dmedia
-
-parser = optparse.OptionParser(
-    version=dmedia.__version__,
+from dmedia.constants import BUS
+from dmedia.api import DMedia
+
+
+BROWSER = 'dmedia/app/browser'
+
+parser = argparse.ArgumentParser(
+    description='Manage media files in your dmedia library',
 )
-parser.add_option('--browser',
+parser.add_argument('--version', action='version', version=dmedia.__version__)
+parser.add_argument('--browser',
+    help='open dmedia HTML5 UI in default browser',
     action='store_true',
     default=False,
-    help='open dmedia HTML5 UI in default browser',
-)
-(options, args) = parser.parse_args()
-
-from dmedia.webui.app import App
-from dmedia.abstractcouch import get_env
-from dmedia.metastore import MetaStore
-
-app = App()
-env = get_env()
-store = MetaStore(env)
-store.update(app.get_doc())
-
-
-if options.browser:
-    uri = store.get_auth_uri() + '/dmedia/app/browser'
-    check_call(['xdg-open', uri])
-    sys.exit()
-
-uri = store.get_uri() + '/dmedia/app/browser'
-
+)
+parser.add_argument('--bus',
+    help='DBus bus name; default is %(default)r',
+    default=BUS,
+)
+parser.add_argument('--att',
+    help='CouchDB attachment path; default is %(default)r',
+    default=BROWSER,
+)
+
+args = parser.parse_args()
+dm = DMedia(args.bus)
+
+if not dm.has_app():
+    print('Oops, cannot import dmedia.webui.app!')
+    raise SystemExit(2)
+
+
+if args.browser:
+    url = dm.get_auth_url() + args.att
+    import subprocess
+    subprocess.check_call(['/usr/bin/xdg-open', url])
+    raise SystemExit()
+
+
+env = dm.get_env()
 
 from dmedia.gtkui.widgets import CouchView
 from gi.repository import Gtk, GObject
 
-
-GObject.threads_init()
-
-
 window = Gtk.Window()
-window.set_title('test')
+window.set_title(_('Media Browser'))
 window.set_default_size(960, 540)
 window.connect('destroy', Gtk.main_quit)
 
@@ -70,11 +80,10 @@
 scroll.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 window.add(scroll)
 
-view = CouchView(env['url'], env['oauth'])
+view = CouchView(env['url'], env.get('oauth'))
 scroll.add(view)
 
 window.show_all()
-view.load_uri(uri)
-
+view.load_uri(env['url'] + args.att)
 
 Gtk.main()

=== renamed file 'dmedia-service' => 'dmedia-importer-service'
--- dmedia-service	2011-03-27 10:45:13 +0000
+++ dmedia-importer-service	2011-04-11 12:02:24 +0000
@@ -21,53 +21,54 @@
 # You should have received a copy of the GNU Affero General Public License along
 # with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
-import optparse
-
-import dbus
-from dbus.mainloop.glib import DBusGMainLoop
-
-DBusGMainLoop(set_as_default=True)
+"""
+dmedia importer DBus service at "org.freedesktop.DMedia.Importer".
+"""
+
+import argparse
+import json
+import time
 
 import dmedia
-from dmedia.constants import BUS, DBNAME
-from dmedia.abstractcouch import get_env
-
-
-parser = optparse.OptionParser(version=dmedia.__version__)
-parser.add_option('--bus',
-    default=BUS,
-    help='D-Bus bus name; default is %r' % BUS,
-)
-parser.add_option('--dbname',
-    metavar='DIR',
-    default=DBNAME,
-    help='CouchDB database; default is %r' % DBNAME,
-)
-parser.add_option('--no-gui',
+from dmedia.constants import BUS, IMPORT_BUS
+
+
+parser = argparse.ArgumentParser(
+    description='DBus service @{}'.format(IMPORT_BUS),
+)
+parser.add_argument('--version', action='version', version=dmedia.__version__)
+parser.add_argument('--no-gui',
+    help='run without NotifyOSD and Application Indicators',
     action='store_true',
     default=False,
-    help='run without NotifyOSD and Application Indicators',
-)
-
-
-def exit(msg, code=1):
-    parser.print_help()
-    print('ERROR: ' + msg)
-    sys.exit(code)
-
-
-if __name__ == '__main__':
-    (options, args) = parser.parse_args()
-
-    dmedia.configure_logging('service')
-
-    env = get_env(options.dbname)
-    env['bus'] = options.bus
-    env['no_gui'] = options.no_gui
-
-    from dmedia.gtkui import service
-    from gi.repository import GObject
-    mainloop = GObject.MainLoop()
-    obj = service.DMedia(env, mainloop.quit)
-    mainloop.run()
+)
+parser.add_argument('--bus',
+    help='DBus bus name; default is %(default)r',
+    default=IMPORT_BUS,
+)
+parser.add_argument('--env',
+    help='dmedia environment as JSON serialized string',
+    metavar='JSON',
+)
+
+args = parser.parse_args()
+dmedia.configure_logging('importer')
+
+from dbus.mainloop.glib import DBusGMainLoop
+DBusGMainLoop(set_as_default=True)
+
+from gi.repository import GObject
+GObject.threads_init()
+
+from dmedia import api
+dm = api.DMedia()
+
+env = dm.get_env(args.env)
+if args.no_gui:
+    env['no_gui'] = True
+
+from dmedia.gtkui.service import DMedia
+
+mainloop = GObject.MainLoop()
+obj = DMedia(env, args.bus, mainloop.quit)
+mainloop.run()

=== added file 'dmedia-service'
--- dmedia-service	1970-01-01 00:00:00 +0000
+++ dmedia-service	2011-04-11 12:02:24 +0000
@@ -0,0 +1,72 @@
+#!/usr/bin/env python
+
+# Authors:
+#   Jason Gerard DeRose <[e-mail]>
+#
+# dmedia: distributed media library
+# Copyright (C) 2011 Jason Gerard DeRose <[e-mail]>
+#
+# This file is part of `dmedia`.
+#
+# `dmedia` is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# `dmedia` 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 Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along
+# with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Core dmedia DBus service at "org.freedesktop.DMedia".
+"""
+
+import argparse
+import time
+
+import dmedia
+from dmedia.constants import BUS, DBNAME
+
+
+parser = argparse.ArgumentParser(
+    description='DBus service @{}'.format(BUS),
+)
+parser.add_argument('--version', action='version', version=dmedia.__version__)
+parser.add_argument('--no-dc',
+    action='store_true',
+    default=False,
+    help='Use system-wide CouchDB instead of desktopcouch',
+)
+parser.add_argument('--bus',
+    default=BUS,
+    help='DBus bus name; default is %(default)r',
+)
+parser.add_argument('--dbname',
+    metavar='DB',
+    default=DBNAME,
+    help='CouchDB database; default is %(default)r',
+)
+parser.add_argument('--env',
+    help='dmedia environment as JSON serialized string',
+    metavar='JSON',
+)
+
+args = parser.parse_args()
+dmedia.configure_logging('service')
+
+from dbus.mainloop.glib import DBusGMainLoop
+DBusGMainLoop(set_as_default=True)
+
+from gi.repository import GObject
+GObject.threads_init()
+
+from dmedia.service import DMedia
+
+mainloop = GObject.MainLoop()
+couchargs = (args.dbname, args.no_dc, args.env)
+obj = DMedia(couchargs, args.bus, mainloop.quit, start=time.time())
+mainloop.run()

=== modified file 'dmedia/__init__.py'
--- dmedia/__init__.py	2011-04-01 01:28:38 +0000
+++ dmedia/__init__.py	2011-04-11 12:02:24 +0000
@@ -58,3 +58,4 @@
         level=logging.DEBUG,
         format='\t'.join(format),
     )
+    logging.info('dmedia %s, namespace=%r', __version__, namespace)

=== modified file 'dmedia/abstractcouch.py'
--- dmedia/abstractcouch.py	2011-02-21 11:49:14 +0000
+++ dmedia/abstractcouch.py	2011-04-11 12:02:24 +0000
@@ -37,6 +37,7 @@
     https://bugs.launchpad.net/dmedia/+bug/722035
 """
 
+import json
 import logging
 
 from couchdb import Server, ResourceNotFound
@@ -44,15 +45,12 @@
     from desktopcouch.records.http import OAuthSession
 except ImportError:
     OAuthSession = None
-if OAuthSession is not None:
-    from desktopcouch.application.platform import find_port
-    from desktopcouch.application.local_files import get_oauth_tokens
 
 
 log = logging.getLogger()
 
 
-def get_couchdb_server(env):
+def get_server(env):
     """
     Return `couchdb.Server` for desktopcouch or system-wide CouchDB.
 
@@ -98,11 +96,9 @@
     The goal is to have all the needed information is one easily serialized
     piece of data (important for testing across multiple processes).
     """
-    url = env.get('url', 'http://localhost:5984/')
+    url = env['url']
     log.info('CouchDB server is %r', url)
-    if env.get('oauth') is None:
-        session = None
-    else:
+    if 'oauth' in env:
         if OAuthSession is None:
             raise ValueError(
                 "provided env['oauth'] but OAuthSession not available: %r" %
@@ -110,29 +106,27 @@
             )
         log.info('Using desktopcouch `OAuthSession`')
         session = OAuthSession(credentials=env['oauth'])
+    else:
+        session = None
     return Server(url, session=session)
 
 
-def get_dmedia_db(env, server=None):
+def get_db(env, server=None):
     """
-    Return the dmedia database specified by *env*.
+    Return the CouchDB database specified by *env*.
 
-    The database name is determined by ``env['dbname']``.  If the ``"dbname"``
-    key is missing or is ``None``, the default database name ``"dmedia"`` is
-    used.
+    The database name is determined by ``env['dbname']``.
 
     If the database does not exist, it will be created.
 
     If *server* is ``None``, one is created based on *env* by calling
-    `get_couchdb_server()`.
+    `get_server()`.
 
     Returns a ``couchdb.Database`` instance.
     """
     if server is None:
-        server = get_couchdb_server(env)
-    dbname = env.get('dbname')
-    if dbname is None:
-        dbname = 'dmedia'
+        server = get_server(env)
+    dbname = env['dbname']
     log.info('CouchDB database is %r', dbname)
     try:
         return server[dbname]
@@ -140,19 +134,13 @@
         return server.create(dbname)
 
 
-def get_env(dbname=None):
-    """
-    Return default *env*.
-
-    This will return an appropriate *env* based on whether desktopcouch is
-    available.  Not a perfect solution, but works for now.
-    """
-    if OAuthSession is None:
-        return {'dbname': dbname}
-    port = find_port()
-    return {
-        'port': port,
-        'url': 'http://localhost:%d/' % port,
-        'oauth': get_oauth_tokens(),
-        'dbname': dbname,
-    }
+def load_env(env_s):
+    env = json.loads(env_s)
+    # FIXME: hack to work-around for Python oauth not working with unicode,
+    # which is what we get when the env is retrieved over D-Bus as JSON
+    if 'oauth' in env:
+        env['oauth'] = dict(
+            (k.encode('ascii'), v.encode('ascii'))
+            for (k, v) in env['oauth'].iteritems()
+        )
+    return env

=== added file 'dmedia/api.py'
--- dmedia/api.py	1970-01-01 00:00:00 +0000
+++ dmedia/api.py	2011-04-11 12:02:24 +0000
@@ -0,0 +1,87 @@
+# Authors:
+#   Jason Gerard DeRose <[e-mail]>
+#
+# dmedia: distributed media library
+# Copyright (C) 2011 Jason Gerard DeRose <[e-mail]>
+#
+# This file is part of `dmedia`.
+#
+# `dmedia` is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# `dmedia` 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 Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along
+# with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Python convenience API for talking to dmedia components over DBus.
+"""
+
+import json
+
+import dbus
+
+from dmedia.constants import BUS
+
+# On my system, this takes around 0.15 seconds, almost all because of
+# >>> from desktopcouch.records.http import OAuthSession
+#
+#from dmedia.abstractcouch import load_env
+
+
+def load_env(env_s):
+    env = json.loads(env_s)
+    # FIXME: hack to work-around for Python oauth not working with unicode,
+    # which is what we get when the env is retrieved over D-Bus as JSON
+    if 'oauth' in env:
+        env['oauth'] = dict(
+            (k.encode('ascii'), v.encode('ascii'))
+            for (k, v) in env['oauth'].iteritems()
+        )
+    return env
+
+
+class DMedia(object):
+    """
+    Talk to "org.freedesktop.DMedia".
+    """
+    def __init__(self, bus=BUS):
+        self.bus = bus
+        self.conn = dbus.SessionBus()
+        self._proxy = None
+
+    @property
+    def proxy(self):
+        if self._proxy is None:
+            self._proxy = self.conn.get_object(self.bus, '/')
+        return self._proxy
+
+    def version(self):
+        return self.proxy.Version()
+
+    def kill(self):
+        self.proxy.Kill()
+        self._proxy = None
+
+    def get_env(self, env_s=None):
+        if not env_s:
+            env_s = self.proxy.GetEnv()
+        return load_env(env_s)
+
+    def get_auth_url(self):
+        return self.proxy.GetAuthURL()
+
+    def has_app(self):
+        return self.proxy.HasApp()
+
+
+class DMediaImporter(object):
+    """
+    Talk to "org.freedesktop.DMediaImporter".
+    """

=== modified file 'dmedia/constants.py'
--- dmedia/constants.py	2011-02-25 16:38:29 +0000
+++ dmedia/constants.py	2011-04-11 12:02:24 +0000
@@ -48,7 +48,9 @@
 
 # D-Bus releated:
 BUS = 'org.freedesktop.DMedia'
-INTERFACE = BUS
+IFACE = BUS
+IMPORT_BUS = 'org.freedesktop.DMediaImporter'
+IMPORT_IFACE = IMPORT_BUS
 DC_BUS = 'org.desktopcouch.CouchDB'
 DC_INTERFACE = DC_BUS
 

=== added file 'dmedia/core.py'
--- dmedia/core.py	1970-01-01 00:00:00 +0000
+++ dmedia/core.py	2011-04-11 12:02:24 +0000
@@ -0,0 +1,195 @@
+# Authors:
+#   Jason Gerard DeRose <[e-mail]>
+#
+# dmedia: distributed media library
+# Copyright (C) 2011 Jason Gerard DeRose <[e-mail]>
+#
+# This file is part of `dmedia`.
+#
+# `dmedia` is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# `dmedia` 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 Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along
+# with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Core dmedia entry-point/API - start here!
+
+For background, please see:
+
+    https://bugs.launchpad.net/dmedia/+bug/753260
+
+
+Security note on /dmedia/_local/dmedia
+======================================
+
+When `DMedia.init_filestores()` is called, it creates `FileStore` instances
+based solely on information in the non-replicated /dmedia/_local/dmedia
+document... despite the fact that the exact same information is also available
+in the corresponding 'dmedia/store' documents.
+
+When it comes to deciding what files dmedia will read and write, it's prudent to
+assume that replicated documents are untrustworthy.
+
+The dangerous approach would be to use a view to get all the 'dmedia/store'
+documents with a machine_id that matches this machine_id, and initialize those `FileStore`.  But the problem is that if an attacker gained control of just one
+of your replicating peers or services, they could insert arbitrary
+'dmedia/store' documents, and have dmedia happily initialize `FileStore` at
+those mount points.  And that would be "a bad thing".
+
+So although the corresponding 'dmedia/store' records are created (if they don't
+already exists), they are completely ignored when it comes to deciding what
+filestores and mount points are configured.
+"""
+
+import logging
+from copy import deepcopy
+import os
+from os import path
+
+from couchdb import ResourceNotFound
+try:
+    import desktopcouch
+    from desktopcouch.application.platform import find_port
+    from desktopcouch.application.local_files import get_oauth_tokens
+except ImportError:
+    desktopcouch = None
+
+try:
+    from dmedia.webui.app import App
+except ImportError:
+    App = None
+
+from .constants import DBNAME
+from .abstractcouch import get_server, get_db, load_env
+from .schema import random_id, create_machine, create_store
+from .views import init_views
+
+
+log = logging.getLogger()
+
+
+def get_env(dbname=DBNAME, no_dc=False):
+    """
+    Return default CouchDB environment.
+
+    This will return an appropriate environment based on whether desktopcouch is
+    available.  If you supply ``no_dc=True``, the environment for the default
+    system wide CouchDB will be returned, even if desktopcouch is available.
+
+    For example:
+
+    >>> get_env(no_dc=True)
+    {'url': 'http://localhost:5984/', 'dbname': 'dmedia', 'port': 5984}
+    >>> get_env(dbname='foo', no_dc=True)
+    {'url': 'http://localhost:5984/', 'dbname': 'foo', 'port': 5984}
+
+    Not a perfect solution, but works for now.
+    """
+    if desktopcouch is None or no_dc:
+        return {
+            'dbname': dbname,
+            'port': 5984,
+            'url': 'http://localhost:5984/',
+        }
+    port = find_port()
+    return {
+        'dbname': dbname,
+        'port': port,
+        'url': 'http://localhost:%d/' % port,
+        'oauth': get_oauth_tokens(),
+    }
+
+
+class LocalStores(object):
+    def by_id(self, _id):
+        pass
+
+    def by_path(self, parentdir):
+        pass
+
+    def by_device(self, device):
+        pass
+
+
+class Core(object):
+    def __init__(self, dbname=DBNAME, no_dc=False, env_s=None):
+        if env_s:
+            self.env = load_env(env_s)
+        else:
+            self.env = get_env(dbname, no_dc)
+        self.home = path.abspath(os.environ['HOME'])
+        if not path.isdir(self.home):
+            raise ValueError('HOME is not a dir: {!}'.format(self.home))
+        self.server = get_server(self.env)
+        self.db = get_db(self.env, self.server)
+        self._has_app = None
+
+    def bootstrap(self):
+        (self.local, self.machine) = self.init_local()
+        self.machine_id = self.machine['_id']
+        self.env['machine_id'] = self.machine_id
+        store = self.init_filestores()
+        self.env['filestore'] = {'_id': store['_id'], 'path': store['path']}
+        init_views(self.db)
+
+    def init_local(self):
+        """
+        Get the /dmedia/_local/dmedia document, creating it if needed.
+        """
+        local_id = '_local/dmedia'
+        try:
+            local = self.db[local_id]
+        except ResourceNotFound:
+            machine = create_machine()
+            local = {
+                '_id': local_id,
+                'machine': deepcopy(machine),
+                'filestores': {},
+            }
+            self.db.save(local)
+            self.db.save(machine)
+        else:
+            try:
+                machine = self.db[local['machine']['_id']]
+            except ResourceNotFound:
+                machine = deepcopy(local['machine'])
+                self.db.save(machine)
+        return (local, machine)
+
+    def init_filestores(self):
+        if not self.local['filestores']:
+            store = create_store(self.home, self.machine_id)
+            self.local['filestores'][store['_id']] = deepcopy(store)
+            self.local['default_filestore'] = store['_id']
+            self.db.save(self.local)
+            self.db.save(store)
+        return self.local['filestores'][self.local['default_filestore']]
+
+    def init_app(self):
+        if App is None:
+            log.info('init_app(): `dmedia.webui.app` not available')
+            return False
+        log.info('init_app(): creating /dmedia/app document')
+        doc = App().get_doc()
+        _id = doc['_id']
+        assert '_rev' not in doc
+        try:
+            old = self.db[_id]
+            doc['_rev'] = old['_rev']
+            self.db.save(doc)
+        except ResourceNotFound:
+            self.db.save(doc)
+        return True
+
+    def has_app(self):
+        if self._has_app is None:
+            self._has_app = self.init_app()
+        return self._has_app

=== modified file 'dmedia/filestore.py'
--- dmedia/filestore.py	2011-04-06 20:56:54 +0000
+++ dmedia/filestore.py	2011-04-11 12:02:24 +0000
@@ -164,7 +164,6 @@
 from threading import Thread
 from Queue import Queue
 
-from .schema import create_store
 from .errors import AmbiguousPath, FileStoreTraversal
 from .errors import DuplicateFile, IntegrityError
 from .constants import LEAF_SIZE, TYPE_ERROR, EXT_PAT
@@ -559,7 +558,7 @@
     To create a `FileStore`, you give it the directory that will be its base on
     the filesystem:
 
-    >>> fs = FileStore('/home/jderose/.dmedia')  #doctest: +SKIP
+    >>> fs = FileStore('/home/jderose')  #doctest: +SKIP
     >>> fs.base  #doctest: +SKIP
     '/home/jderose/.dmedia'
 
@@ -567,7 +566,7 @@
 
     >>> fs = FileStore()
     >>> fs.base  #doctest: +ELLIPSIS
-    '/tmp/store...'
+    '/tmp/.../.dmedia'
 
     You can add files to the store using `FileStore.import_file()`:
 
@@ -580,7 +579,7 @@
     path of the file using `FileStore.path()`:
 
     >>> fs.path('HIGJPQWY4PI7G7IFOB2G4TKY6PMTJSI7', 'mov')  #doctest: +ELLIPSIS
-    '/tmp/store.../HI/GJPQWY4PI7G7IFOB2G4TKY6PMTJSI7.mov'
+    '/tmp/.../.dmedia/HI/GJPQWY4PI7G7IFOB2G4TKY6PMTJSI7.mov'
 
     As the files are assumed to be read-only and unchanging, moving a file into
     its canonical location must be atomic.  There are 2 scenarios that must be
@@ -601,35 +600,31 @@
     `fallocate()` function, which calls the Linux ``fallocate`` command.
     """
 
-    def __init__(self, base=None, machine_id=None):
-        if base is None:
-            base = tempfile.mkdtemp(prefix='store.')
-        self.base = safe_path(base)
+    def __init__(self, parent=None, dotdir='.dmedia'):
+        if parent is None:
+            parent = tempfile.mkdtemp(prefix='store.')
+        self.parent = safe_path(parent)
+        if not path.isdir(self.parent):
+            raise ValueError('%s.parent not a directory: %r' %
+                (self.__class__.__name__, parent)
+            )
+        self.base = path.join(self.parent, dotdir)
         try:
-            os.makedirs(self.base)
+            os.mkdir(self.base)
         except OSError:
             pass
         if not path.isdir(self.base):
             raise ValueError('%s.base not a directory: %r' %
                 (self.__class__.__name__, self.base)
             )
-
-        # FIXME: This is too high-level for FileStore, should instead be deault
-        # with by the core API entry point as FileStore are first initialized
-        self.record = path.join(self.base, 'store.json')
-        try:
-            fp = open(self.record, 'rb')
-            doc = json.load(fp)
-        except IOError:
-            fp = open(self.record, 'wb')
-            doc = create_store(self.base, machine_id)
-            json.dump(doc, fp, sort_keys=True, indent=4)
-        fp.close()
-        self._doc = doc
-        self._id = doc['_id']
+        if path.islink(self.base):
+            raise ValueError('{!r} is symlink to {!r}'.format(
+                    self.base, os.readlink(self.base)
+                )
+            )
 
     def __repr__(self):
-        return '%s(%r)' % (self.__class__.__name__, self.base)
+        return '%s(%r)' % (self.__class__.__name__, self.parent)
 
     ############################################
     # Methods to prevent path traversals attacks
@@ -656,7 +651,7 @@
 
         >>> fs = FileStore()
         >>> fs.join('NW', 'BNVXVK5DQGIOW7MYR4K3KA5K22W7NW')  #doctest: +ELLIPSIS
-        '/tmp/store.../NW/BNVXVK5DQGIOW7MYR4K3KA5K22W7NW'
+        '/tmp/.../.dmedia/NW/BNVXVK5DQGIOW7MYR4K3KA5K22W7NW'
 
         However, a `FileStoreTraversal` is raised if *parts* cause a path
         traversal outside of the `FileStore` base directory:
@@ -664,14 +659,14 @@
         >>> fs.join('../ssh')  #doctest: +ELLIPSIS
         Traceback (most recent call last):
           ...
-        FileStoreTraversal: '/tmp/ssh' outside base '/tmp/store...'
+        FileStoreTraversal: '/tmp/.../ssh' outside base '/tmp/.../.dmedia'
 
         Or Likewise if an absolute path is included in *parts*:
 
         >>> fs.join('NW', '/etc', 'ssh')  #doctest: +ELLIPSIS
         Traceback (most recent call last):
           ...
-        FileStoreTraversal: '/etc/ssh' outside base '/tmp/store...'
+        FileStoreTraversal: '/etc/ssh' outside base '/tmp/.../.dmedia'
 
         Also see `FileStore.create_parent()`.
         """
@@ -689,14 +684,14 @@
         >>> fs.create_parent('/foo/my.ogv')  #doctest: +ELLIPSIS
         Traceback (most recent call last):
           ...
-        FileStoreTraversal: '/foo/my.ogv' outside base '/tmp/store...'
+        FileStoreTraversal: '/foo/my.ogv' outside base '/tmp/.../.dmedia'
 
         It also protects against malicious filenames like this:
 
         >>> fs.create_parent('/foo/../bar/my.ogv')  #doctest: +ELLIPSIS
         Traceback (most recent call last):
           ...
-        FileStoreTraversal: '/bar/my.ogv' outside base '/tmp/store...'
+        FileStoreTraversal: '/bar/my.ogv' outside base '/tmp/.../.dmedia'
 
         If doesn't already exists, the directory containing *filename* is
         created.  Returns the directory containing *filename*.
@@ -747,12 +742,12 @@
 
         >>> fs = FileStore()
         >>> fs.path('NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW')  #doctest: +ELLIPSIS
-        '/tmp/store.../NW/BNVXVK5DQGIOW7MYR4K3KA5K22W7NW'
+        '/tmp/.../.dmedia/NW/BNVXVK5DQGIOW7MYR4K3KA5K22W7NW'
 
         Or with a file extension:
 
         >>> fs.path('NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW', 'txt')  #doctest: +ELLIPSIS
-        '/tmp/store.../NW/BNVXVK5DQGIOW7MYR4K3KA5K22W7NW.txt'
+        '/tmp/.../.dmedia/NW/BNVXVK5DQGIOW7MYR4K3KA5K22W7NW.txt'
 
         If called with ``create=True``, the parent directory is created with
         `FileStore.create_parent()`.
@@ -854,12 +849,12 @@
 
         >>> fs = FileStore()
         >>> fs.tmp('NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW')  #doctest: +ELLIPSIS
-        '/tmp/store.../transfers/NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW'
+        '/tmp/.../.dmedia/transfers/NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW'
 
         Or with a file extension:
 
         >>> fs.tmp('NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW', 'txt')  #doctest: +ELLIPSIS
-        '/tmp/store.../transfers/NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW.txt'
+        '/tmp/.../.dmedia/transfers/NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW.txt'
 
         If called with ``create=True``, the parent directory is created with
         `FileStore.create_parent()`.
@@ -979,7 +974,7 @@
         >>> tmp_fp = open(fs.join('foo.mov'), 'wb')
         >>> chash = 'ZR765XWSF6S7JQHLUI4GCG5BHGPE252O'
         >>> fs.tmp_move(tmp_fp, chash, 'mov')  #doctest: +ELLIPSIS
-        '/tmp/store.../ZR/765XWSF6S7JQHLUI4GCG5BHGPE252O.mov'
+        '/tmp/.../.dmedia/ZR/765XWSF6S7JQHLUI4GCG5BHGPE252O.mov'
 
         Note, however, that this method does *not* verify the content hash of
         the temporary file!  This is by design as many operations will compute
@@ -1081,7 +1076,7 @@
         >>> fs = FileStore()
         >>> tmp = fs.tmp('TGX33XXWU3EVHEEY5J7NBOJGKBFXLEBK', 'mov', create=True)
         >>> tmp  #doctest: +ELLIPSIS
-        '/tmp/store.../transfers/TGX33XXWU3EVHEEY5J7NBOJGKBFXLEBK.mov'
+        '/tmp/.../.dmedia/transfers/TGX33XXWU3EVHEEY5J7NBOJGKBFXLEBK.mov'
 
         Then the downloader will write to the temporary file as it's being
         downloaded:
@@ -1102,7 +1097,7 @@
 
         >>> dst = fs.tmp_verify_move('TGX33XXWU3EVHEEY5J7NBOJGKBFXLEBK', 'mov')
         >>> dst  #doctest: +ELLIPSIS
-        '/tmp/store.../TG/X33XXWU3EVHEEY5J7NBOJGKBFXLEBK.mov'
+        '/tmp/.../.dmedia/TG/X33XXWU3EVHEEY5J7NBOJGKBFXLEBK.mov'
 
         The return value is the absolute path of the canonical file.
 

=== modified file 'dmedia/gtkui/client.py'
--- dmedia/gtkui/client.py	2011-03-27 10:45:13 +0000
+++ dmedia/gtkui/client.py	2011-04-11 12:02:24 +0000
@@ -27,7 +27,7 @@
 import dbus.mainloop.glib
 from gi.repository import GObject
 from gi.repository.GObject import TYPE_PYOBJECT
-from dmedia.constants import BUS, INTERFACE, EXTENSIONS
+from dmedia.constants import IMPORT_BUS, IMPORT_IFACE, EXTENSIONS
 
 
 # We need mainloop integration to test signals:
@@ -122,7 +122,7 @@
 
     def __init__(self, bus=None):
         super(Client, self).__init__()
-        self._bus = (BUS if bus is None else bus)
+        self._bus = (IMPORT_BUS if bus is None else bus)
         self._conn = dbus.SessionBus()
         self._proxy = None
 
@@ -137,27 +137,27 @@
         return self._proxy
 
     def _call(self, name, *args):
-        method = self.proxy.get_dbus_method(name, dbus_interface=INTERFACE)
+        method = self.proxy.get_dbus_method(name, dbus_interface=IMPORT_IFACE)
         return method(*args)
 
     def _connect_signals(self):
         self.proxy.connect_to_signal(
-            'BatchStarted', self._on_BatchStarted, INTERFACE
-        )
-        self.proxy.connect_to_signal(
-            'BatchFinished', self._on_BatchFinished, INTERFACE
-        )
-        self.proxy.connect_to_signal(
-            'ImportStarted', self._on_ImportStarted, INTERFACE
-        )
-        self.proxy.connect_to_signal(
-            'ImportCount', self._on_ImportCount, INTERFACE
-        )
-        self.proxy.connect_to_signal(
-            'ImportProgress', self._on_ImportProgress, INTERFACE
-        )
-        self.proxy.connect_to_signal(
-            'ImportFinished', self._on_ImportFinished, INTERFACE
+            'BatchStarted', self._on_BatchStarted, IMPORT_IFACE
+        )
+        self.proxy.connect_to_signal(
+            'BatchFinished', self._on_BatchFinished, IMPORT_IFACE
+        )
+        self.proxy.connect_to_signal(
+            'ImportStarted', self._on_ImportStarted, IMPORT_IFACE
+        )
+        self.proxy.connect_to_signal(
+            'ImportCount', self._on_ImportCount, IMPORT_IFACE
+        )
+        self.proxy.connect_to_signal(
+            'ImportProgress', self._on_ImportProgress, IMPORT_IFACE
+        )
+        self.proxy.connect_to_signal(
+            'ImportFinished', self._on_ImportFinished, IMPORT_IFACE
         )
 
     def _on_BatchStarted(self, batch_id):

=== modified file 'dmedia/gtkui/service.py'
--- dmedia/gtkui/service.py	2011-03-28 12:38:29 +0000
+++ dmedia/gtkui/service.py	2011-04-11 12:02:24 +0000
@@ -22,7 +22,11 @@
 # with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Makes dmedia functionality avaible over D-Bus.
+D-Bus service implementing Pro File Import UX.
+
+For details, please see:
+
+  https://wiki.ubuntu.com/AyatanaDmediaLovefest
 """
 
 from os import path
@@ -35,9 +39,8 @@
 import dbus.mainloop.glib
 
 from dmedia import __version__
-from dmedia.constants import BUS, INTERFACE, DBNAME, EXT_MAP
+from dmedia.constants import IMPORT_BUS, IMPORT_IFACE, EXT_MAP
 from dmedia.importer import ImportManager
-from dmedia.metastore import MetaStore
 
 from .util import NotifyManager, Timer, import_started, batch_finished
 
@@ -71,11 +74,12 @@
         'ImportFinished',
     ])
 
-    def __init__(self, env, killfunc=None):
+    def __init__(self, env, bus, killfunc):
+        assert callable(killfunc)
         self._env = env
+        self._bus = bus
         self._killfunc = killfunc
-        self._bus = env.get('bus', BUS)
-        self._dbname = env.get('dbname', DBNAME)
+        self._bus = bus
         self._no_gui = env.get('no_gui', False)
         log.info('Starting service on %r', self._bus)
         self._conn = dbus.SessionBus()
@@ -120,21 +124,12 @@
             self._indicator.set_menu(self._menu)
             self._indicator.set_status(AppIndicator.IndicatorStatus.ACTIVE)
 
-        self._metastore = None
         self._manager = None
 
     @property
-    def metastore(self):
-        if self._metastore is None:
-            self._metastore = MetaStore(self._env)
-        return self._metastore
-
-    @property
     def manager(self):
         if self._manager is None:
-            self._manager = ImportManager(
-                self.metastore.get_env(), self._on_signal
-            )
+            self._manager = ImportManager(self._env, self._on_signal)
             self._manager.start()
         return self._manager
 
@@ -164,7 +159,7 @@
         except Exception:
             log.exception('Could not open dmedia database in Futon')
 
-    @dbus.service.signal(INTERFACE, signature='s')
+    @dbus.service.signal(IMPORT_IFACE, signature='s')
     def BatchStarted(self, batch_id):
         """
         Fired at transition from idle to at least one active import.
@@ -181,7 +176,7 @@
             self._indicator.set_menu(self._menu)
             self._timer.start()
 
-    @dbus.service.signal(INTERFACE, signature='sa{sx}')
+    @dbus.service.signal(IMPORT_IFACE, signature='sa{sx}')
     def BatchFinished(self, batch_id, stats):
         """
         Fired at transition from at least one active import to idle.
@@ -201,7 +196,7 @@
         self._timer.stop()
         self._current.hide()
 
-    @dbus.service.signal(INTERFACE, signature='ss')
+    @dbus.service.signal(IMPORT_IFACE, signature='ss')
     def ImportStarted(self, base, import_id):
         """
         Fired when card is inserted.
@@ -219,19 +214,19 @@
         # via FireWire or USB
         self._notify.replace(summary, body, 'notification-device-usb')
 
-    @dbus.service.signal(INTERFACE, signature='ssx')
+    @dbus.service.signal(IMPORT_IFACE, signature='ssx')
     def ImportCount(self, base, import_id, total):
         pass
 
-    @dbus.service.signal(INTERFACE, signature='ssiia{ss}')
+    @dbus.service.signal(IMPORT_IFACE, signature='ssiia{ss}')
     def ImportProgress(self, base, import_id, completed, total, info):
         pass
 
-    @dbus.service.signal(INTERFACE, signature='ssa{sx}')
+    @dbus.service.signal(IMPORT_IFACE, signature='ssa{sx}')
     def ImportFinished(self, base, import_id, stats):
         pass
 
-    @dbus.service.method(INTERFACE, in_signature='', out_signature='')
+    @dbus.service.method(IMPORT_IFACE, in_signature='', out_signature='')
     def Kill(self):
         """
         Kill the dmedia service process.
@@ -243,14 +238,14 @@
             log.info('Calling killfunc()')
             self._killfunc()
 
-    @dbus.service.method(INTERFACE, in_signature='', out_signature='s')
+    @dbus.service.method(IMPORT_IFACE, in_signature='', out_signature='s')
     def Version(self):
         """
         Return dmedia version.
         """
         return __version__
 
-    @dbus.service.method(INTERFACE, in_signature='as', out_signature='as')
+    @dbus.service.method(IMPORT_IFACE, in_signature='as', out_signature='as')
     def GetExtensions(self, types):
         """
         Get a list of extensions based on broad categories in *types*.
@@ -267,7 +262,7 @@
                 extensions.update(EXT_MAP[key])
         return sorted(extensions)
 
-    @dbus.service.method(INTERFACE, in_signature='sb', out_signature='s')
+    @dbus.service.method(IMPORT_IFACE, in_signature='sb', out_signature='s')
     def StartImport(self, base, extract):
         """
         Start import of card mounted at *base*.
@@ -289,7 +284,7 @@
             return 'started'
         return 'already_running'
 
-    @dbus.service.method(INTERFACE, in_signature='s', out_signature='s')
+    @dbus.service.method(IMPORT_IFACE, in_signature='s', out_signature='s')
     def StopImport(self, base):
         """
         In running, stop the import of directory or file at *base*.
@@ -298,7 +293,7 @@
             return 'stopped'
         return 'not_running'
 
-    @dbus.service.method(INTERFACE, in_signature='', out_signature='as')
+    @dbus.service.method(IMPORT_IFACE, in_signature='', out_signature='as')
     def ListImports(self):
         """
         Return list of currently running imports.

=== modified file 'dmedia/gtkui/tests/test_client.py'
--- dmedia/gtkui/tests/test_client.py	2011-03-27 10:45:13 +0000
+++ dmedia/gtkui/tests/test_client.py	2011-04-11 12:02:24 +0000
@@ -27,6 +27,7 @@
 from os import path
 from subprocess import Popen
 import time
+import json
 
 import dbus
 from dbus.proxies import ProxyObject
@@ -44,7 +45,7 @@
 
 tree = path.dirname(path.dirname(path.abspath(dmedia.__file__)))
 assert path.isfile(path.join(tree, 'setup.py'))
-script = path.join(tree, 'dmedia-service')
+script = path.join(tree, 'dmedia-importer-service')
 assert path.isfile(script)
 
 
@@ -73,7 +74,7 @@
             self.handlers[name] = callback
 
 
-class test_Client(CouchCase):
+class TestClient(CouchCase):
     klass = client.Client
 
     def setUp(self):
@@ -87,17 +88,17 @@
         How do people usually unit test dbus services?  This works, but not sure
         if there is a better idiom in common use.  --jderose
         """
-        super(test_Client, self).setUp()
+        super(TestClient, self).setUp()
         self.bus = random_bus()
         cmd = [script, '--no-gui',
-            '--dbname', self.dbname,
             '--bus', self.bus,
+            '--env', json.dumps(self.env),
         ]
         self.service = Popen(cmd)
         time.sleep(1)  # Give dmedia-service time to start
 
     def tearDown(self):
-        super(test_Client, self).tearDown()
+        super(TestClient, self).tearDown()
         try:
             self.service.terminate()
             self.service.wait()
@@ -112,7 +113,7 @@
     def test_init(self):
         # Test with no bus
         inst = self.klass()
-        self.assertEqual(inst._bus, 'org.freedesktop.DMedia')
+        self.assertEqual(inst._bus, 'org.freedesktop.DMediaImporter')
         self.assertTrue(isinstance(inst._conn, dbus.SessionBus))
         self.assertTrue(inst._proxy is None)
 
@@ -243,19 +244,19 @@
         self.assertEqual(
             signals.messages[3],
             ('import_progress', inst, base, import_id, 1, 3,
-                dict(action='imported', src=src1, _id=mov_hash)
+                dict(action='imported', src=src1)
             )
         )
         self.assertEqual(
             signals.messages[4],
             ('import_progress', inst, base, import_id, 2, 3,
-                dict(action='imported', src=src2, _id=thm_hash)
+                dict(action='imported', src=src2)
             )
         )
         self.assertEqual(
             signals.messages[5],
             ('import_progress', inst, base, import_id, 3, 3,
-                dict(action='skipped', src=dup1, _id=mov_hash)
+                dict(action='skipped', src=dup1)
             )
         )
         self.assertEqual(

=== removed file 'dmedia/gtkui/tests/test_service.py'
--- dmedia/gtkui/tests/test_service.py	2011-03-27 09:56:34 +0000
+++ dmedia/gtkui/tests/test_service.py	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-# Authors:
-#   Jason Gerard DeRose <[e-mail]>
-#
-# dmedia: distributed media library
-# Copyright (C) 2010 Jason Gerard DeRose <[e-mail]>
-#
-# This file is part of `dmedia`.
-#
-# `dmedia` is free software: you can redistribute it and/or modify it under the
-# terms of the GNU Affero General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option) any
-# later version.
-#
-# `dmedia` 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 Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along
-# with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
-
-"""
-Unit tests for `dmedia.metastore` module.
-"""
-
-from unittest import TestCase
-
-from dmedia.tests.helpers import TempDir, random_bus
-from dmedia.tests.couch import CouchCase
-from dmedia import importer
-from dmedia.gtkui import service
-
-
-class test_DMedia(CouchCase):
-    klass = service.DMedia
-
-    def test_init(self):
-        bus = random_bus()
-        self.env['bus'] = bus
-        self.env['no_gui'] = True
-        def kill():
-            pass
-        inst = self.klass(self.env, killfunc=kill)
-        self.assertTrue(inst._killfunc is kill)
-        self.assertTrue(inst._bus is bus)
-        self.assertTrue(inst._dbname is self.dbname)
-        self.assertTrue(inst._no_gui)
-        self.assertEqual(inst._manager, None)
-
-        m = inst.manager
-        self.assertTrue(inst._manager is m)
-        self.assertTrue(isinstance(m, importer.ImportManager))
-        self.assertEqual(m._callback, inst._on_signal)

=== modified file 'dmedia/importer.py'
--- dmedia/importer.py	2011-04-08 20:59:58 +0000
+++ dmedia/importer.py	2011-04-11 12:02:24 +0000
@@ -40,8 +40,6 @@
 )
 from .filestore import FileStore, quick_id, safe_open, safe_ext, pack_leaves
 from .extractor import merge_metadata
-from .abstractcouch import get_env, get_couchdb_server, get_dmedia_db
-
 
 mimetypes.init()
 DOTDIR = '.dmedia'
@@ -165,15 +163,8 @@
     def __init__(self, env, q, key, args):
         super(ImportWorker, self).__init__(env, q, key, args)
         (self.base, self.extract) = args
-        self.home = path.abspath(os.environ['HOME'])
-        self.filestore = FileStore(
-            path.join(self.home, DOTDIR),
-            self.env.get('machine_id')
-        )
-        try:
-            self.db.save(self.filestore._doc)
-        except couchdb.ResourceConflict:
-            pass
+        self.filestore = FileStore(self.env['filestore']['path'])
+        self.filestore_id = self.env['filestore']['_id']
 
         self.filetuples = None
         self._processed = []
@@ -269,8 +260,8 @@
 
         try:
             doc = self.db[chash]
-            if self.filestore._id not in doc['stored']:
-                doc['stored'][self.filestore._id] =  {
+            if self.filestore_id not in doc['stored']:
+                doc['stored'][self.filestore_id] =  {
                     'copies': 1,
                     'time': time.time(),
                 }
@@ -279,7 +270,7 @@
         except couchdb.ResourceNotFound as e:
             pass
 
-        doc = create_file(stat.st_size, leaves, self.filestore._id,
+        doc = create_file(stat.st_size, leaves, self.filestore_id,
             copies=1, ext=ext
         )
         assert doc['_id'] == chash

=== modified file 'dmedia/schema.py'
--- dmedia/schema.py	2011-04-07 03:03:07 +0000
+++ dmedia/schema.py	2011-04-11 12:02:24 +0000
@@ -315,6 +315,8 @@
 from base64 import b32encode, b32decode, b64encode
 import re
 import time
+import socket
+import platform
 
 from .constants import TYPE_ERROR, EXT_PAT
 
@@ -1284,7 +1286,7 @@
         'bytes': file_size,
         'ext': ext,
         'origin': origin,
-        'stored': {
+            'stored': {
             store: {
                 'copies': copies,
                 'time': ts,
@@ -1293,7 +1295,21 @@
     }
 
 
-def create_store(base, machine_id, copies=1):
+def create_machine():
+    """
+    Create a 'dmedia/machine' document.
+    """
+    return {
+        '_id': random_id(),
+        'ver': 0,
+        'type': 'dmedia/machine',
+        'time': time.time(),
+        'hostname': socket.gethostname(),
+        'distribution': list(platform.linux_distribution()),
+    }
+
+
+def create_store(parentdir, machine_id, copies=1):
     """
     Create a 'dmedia/store' document.
     """
@@ -1304,7 +1320,7 @@
         'time': time.time(),
         'plugin': 'filestore',
         'copies': copies,
-        'path': base,
+        'path': parentdir,
         'machine_id': machine_id,
     }
 

=== added directory 'dmedia/service'
=== added file 'dmedia/service/__init__.py'
--- dmedia/service/__init__.py	1970-01-01 00:00:00 +0000
+++ dmedia/service/__init__.py	2011-04-11 12:02:24 +0000
@@ -0,0 +1,94 @@
+# Authors:
+#   Jason Gerard DeRose <[e-mail]>
+#
+# dmedia: distributed media library
+# Copyright (C) 2011 Jason Gerard DeRose <[e-mail]>
+#
+# This file is part of `dmedia`.
+#
+# `dmedia` is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# `dmedia` 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 Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along
+# with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Core dmedia DBus service at org.freedesktop.DMedia.
+"""
+
+import logging
+import json
+import time
+
+import gnomekeyring
+import dbus
+import dbus.service
+
+from dmedia import __version__
+from dmedia.constants import IFACE
+from dmedia.core import Core
+
+
+log = logging.getLogger()
+
+
+class DMedia(dbus.service.Object):
+    def __init__(self, couchargs, bus, killfunc, start=None):
+        self._bus = bus
+        self._killfunc = killfunc
+        log.info('Starting dmedia core service on %r', bus)
+        self._conn = dbus.SessionBus()
+        super(DMedia, self).__init__(self._conn, object_path='/')
+        self._busname = dbus.service.BusName(bus, self._conn)
+        self._core = Core(*couchargs)
+        self._core.bootstrap()
+        self._env_s = json.dumps(self._core.env)
+        if start is not None:
+            log.info('Started service in %.3f seconds', time.time() - start)
+
+    @dbus.service.method(IFACE, in_signature='', out_signature='s')
+    def Version(self):
+        """
+        Return dmedia version.
+        """
+        return __version__
+
+    @dbus.service.method(IFACE, in_signature='', out_signature='')
+    def Kill(self):
+        """
+        Kill the `dmedia-service` process.
+        """
+        log.info('Killing dmedia core service on %r', self._bus)
+        self._killfunc()
+
+    @dbus.service.method(IFACE, in_signature='', out_signature='s')
+    def GetEnv(self):
+        """
+        Return dmedia env as JSON string.
+        """
+        return self._env_s
+
+    @dbus.service.method(IFACE, in_signature='', out_signature='s')
+    def GetAuthURL(self):
+        """
+        Get URL with basic auth user and password.
+        """
+        data = gnomekeyring.find_items_sync(
+            gnomekeyring.ITEM_GENERIC_SECRET,
+            {'desktopcouch': 'basic'}
+        )
+        (user, password) = data[0].secret.split(':')
+        return 'http://{user}:{password}@localhost:{port}/'.format(
+            user=user, password=password, port=self._core.env['port']
+        )
+
+    @dbus.service.method(IFACE, in_signature='', out_signature='b')
+    def HasApp(self):
+        return self._core.has_app()

=== modified file 'dmedia/tests/couch.py'
--- dmedia/tests/couch.py	2011-03-27 09:56:34 +0000
+++ dmedia/tests/couch.py	2011-04-11 12:02:24 +0000
@@ -27,7 +27,8 @@
 
 import couchdb
 
-from dmedia.abstractcouch import get_env, get_couchdb_server
+from dmedia.core import get_env
+from dmedia.abstractcouch import get_server
 from dmedia.schema import random_id
 
 from .helpers import TempHome
@@ -48,15 +49,16 @@
 
     def setUp(self):
         self.home = TempHome()
-        self.dbname = 'dmedia_test'
+        self.dbname = 'test_dmedia'
         self.env = get_env(self.dbname)
-        server = get_couchdb_server(self.env)
+        server = get_server(self.env)
         try:
             del server[self.dbname]
         except couchdb.ResourceNotFound:
             pass
         self.machine_id = random_id()
         self.env['machine_id'] = self.machine_id
+        self.env['filestore'] = {'_id': random_id(), 'path': self.home.path}
 
     def tearDown(self):
         self.home = None

=== modified file 'dmedia/tests/test_abstractcouch.py'
--- dmedia/tests/test_abstractcouch.py	2011-02-21 10:55:29 +0000
+++ dmedia/tests/test_abstractcouch.py	2011-04-11 12:02:24 +0000
@@ -24,8 +24,10 @@
 """
 
 from unittest import TestCase
+import json
 
 import couchdb
+from couchdb import ResourceNotFound
 from desktopcouch.application.platform import find_port
 from desktopcouch.application.local_files import get_oauth_tokens
 from desktopcouch.records.http import OAuthSession
@@ -34,29 +36,34 @@
 
 from .helpers import raises
 
+
+def dc_env(dbname='test_dmedia'):
+    """
+    Create desktopcouch environment.
+    """
+    port = find_port()
+    return {
+        'dbname': dbname,
+        'port': port,
+        'url': 'http://localhost:%d/' % port,
+        'oauth': get_oauth_tokens(),
+    }
+
+
+def json_env(dbname='test_dmedia'):
+    """
+    For testing with dc env that has gone though json.dumps() + json.loads().
+    """
+    return json.loads(json.dumps(dc_env(dbname)))
+
+
 class test_functions(TestCase):
     def tearDown(self):
         if abstractcouch.OAuthSession is None:
             abstractcouch.OAuthSession = OAuthSession
 
-    def dc_env(self):
-        """
-        Create an *env* for desktopcouch.
-        """
-        port = find_port()
-        return {
-            'port': port,
-            'url': 'http://localhost:%d/' % port,
-            'oauth': get_oauth_tokens(),
-        }
-
-    def test_get_couchdb_server(self):
-        f = abstractcouch.get_couchdb_server
-
-        # Test with empty env
-        s = f({})
-        self.assertTrue(isinstance(s, couchdb.Server))
-        self.assertEqual(repr(s), "<Server 'http://localhost:5984/'>")
+    def test_get_server(self):
+        f = abstractcouch.get_server
 
         # Test with only url
         s = f({'url': 'http://localhost:5984/'})
@@ -64,7 +71,7 @@
         self.assertEqual(repr(s), "<Server 'http://localhost:5984/'>")
 
         # Test with desktopcouch
-        env = self.dc_env()
+        env = dc_env()
         s = f(env)
         self.assertTrue(isinstance(s, couchdb.Server))
         self.assertEqual(
@@ -81,127 +88,49 @@
         )
 
         # Test when OAuthSession is not imported, oauth not provided
-        s = f({})
-        self.assertTrue(isinstance(s, couchdb.Server))
-        self.assertEqual(repr(s), "<Server 'http://localhost:5984/'>")
-        s = f({'url': 'http://localhost:5984/'})
-        self.assertTrue(isinstance(s, couchdb.Server))
-        self.assertEqual(repr(s), "<Server 'http://localhost:5984/'>")
-
-    def test_get_dmedia_db(self):
-        f = abstractcouch.get_dmedia_db
-
-        # Test when server is not provided
-        env = self.dc_env()
-
-        assert 'dmedia' not in env
-        d = f(env)
-        self.assertTrue(isinstance(d, couchdb.Database))
-        self.assertEqual(repr(d), "<Database 'dmedia'>")
-        self.assertEqual(d.info()['db_name'], 'dmedia')
-
-        env['dbname'] = None
-        d = f(env)
-        self.assertTrue(isinstance(d, couchdb.Database))
-        self.assertEqual(repr(d), "<Database 'dmedia'>")
-        self.assertEqual(d.info()['db_name'], 'dmedia')
-
-        env['dbname'] = 'dmedia'
-        d = f(env)
-        self.assertTrue(isinstance(d, couchdb.Database))
-        self.assertEqual(repr(d), "<Database 'dmedia'>")
-        self.assertEqual(d.info()['db_name'], 'dmedia')
-
-        env['dbname'] = 'dmedia_test'
-        d = f(env)
-        self.assertTrue(isinstance(d, couchdb.Database))
-        self.assertEqual(repr(d), "<Database 'dmedia_test'>")
-        self.assertEqual(d.info()['db_name'], 'dmedia_test')
-
-
-        # Test when server *is* provided
-        env = self.dc_env()
-        server = abstractcouch.get_couchdb_server(env)
-
-        assert 'dmedia' not in env
-        d = f(env, server)
-        self.assertTrue(isinstance(d, couchdb.Database))
-        self.assertEqual(repr(d), "<Database 'dmedia'>")
-        self.assertEqual(d.info()['db_name'], 'dmedia')
-
-        env['dbname'] = None
-        d = f(env, server)
-        self.assertTrue(isinstance(d, couchdb.Database))
-        self.assertEqual(repr(d), "<Database 'dmedia'>")
-        self.assertEqual(d.info()['db_name'], 'dmedia')
-
-        env['dbname', server] = 'dmedia'
-        d = f(env)
-        self.assertTrue(isinstance(d, couchdb.Database))
-        self.assertEqual(repr(d), "<Database 'dmedia'>")
-        self.assertEqual(d.info()['db_name'], 'dmedia')
-
-        env['dbname'] = 'dmedia_test'
-        d = f(env, server)
-        self.assertTrue(isinstance(d, couchdb.Database))
-        self.assertEqual(repr(d), "<Database 'dmedia_test'>")
-        self.assertEqual(d.info()['db_name'], 'dmedia_test')
-
-
-        # Test when server=None is explicitly provided
-        env = self.dc_env()
-
-        assert 'dmedia' not in env
-        d = f(env, server=None)
-        self.assertTrue(isinstance(d, couchdb.Database))
-        self.assertEqual(repr(d), "<Database 'dmedia'>")
-        self.assertEqual(d.info()['db_name'], 'dmedia')
-
-        env['dbname'] = None
-        d = f(env, server=None)
-        self.assertTrue(isinstance(d, couchdb.Database))
-        self.assertEqual(repr(d), "<Database 'dmedia'>")
-        self.assertEqual(d.info()['db_name'], 'dmedia')
-
-        env['dbname'] = 'dmedia'
-        d = f(env, server=None)
-        self.assertTrue(isinstance(d, couchdb.Database))
-        self.assertEqual(repr(d), "<Database 'dmedia'>")
-        self.assertEqual(d.info()['db_name'], 'dmedia')
-
-        env['dbname'] = 'dmedia_test'
-        d = f(env, server=None)
-        self.assertTrue(isinstance(d, couchdb.Database))
-        self.assertEqual(repr(d), "<Database 'dmedia_test'>")
-        self.assertEqual(d.info()['db_name'], 'dmedia_test')
-
-    def test_get_env(self):
-        f = abstractcouch.get_env
-        port = find_port()
-        url = 'http://localhost:%d/' % port
-        oauth = get_oauth_tokens()
-
-        # Test when OAuthSession is available
-        self.assertEqual(
-            f(),
-            {'port': port, 'url': url, 'oauth': oauth, 'dbname': None}
-        )
-        self.assertEqual(
-            f(dbname=None),
-            {'port': port, 'url': url, 'oauth': oauth, 'dbname': None}
-        )
-        self.assertEqual(
-            f(dbname='dmedia'),
-            {'port': port, 'url': url, 'oauth': oauth, 'dbname': 'dmedia'}
-        )
-        self.assertEqual(
-            f(dbname='dmedia_test'),
-            {'port': port, 'url': url, 'oauth': oauth, 'dbname': 'dmedia_test'}
-        )
-
-        # Test when OAuthSession is *not* available
-        abstractcouch.OAuthSession = None
-        self.assertEqual(f(), {'dbname': None})
-        self.assertEqual(f(dbname=None), {'dbname': None})
-        self.assertEqual(f(dbname='dmedia'), {'dbname': 'dmedia'})
-        self.assertEqual(f(dbname='dmedia_test'), {'dbname': 'dmedia_test'})
+        s = f({'url': 'http://localhost:666/'})
+        self.assertTrue(isinstance(s, couchdb.Server))
+        self.assertEqual(repr(s), "<Server 'http://localhost:666/'>")
+
+
+    def test_get_db(self):
+        f = abstractcouch.get_db
+        env = dc_env('test_dmedia')
+        server = abstractcouch.get_server(env)
+
+        # Make sure database doesn't exist:
+        try:
+            server.delete('test_dmedia')
+        except ResourceNotFound:
+            pass
+
+        # Test when db does not exist, server not provided
+        self.assertNotIn('test_dmedia', server)
+        db = f(env)
+        self.assertTrue(isinstance(db, couchdb.Database))
+        self.assertEqual(repr(db), "<Database 'test_dmedia'>")
+        self.assertEqual(db.info()['db_name'], 'test_dmedia')
+        self.assertIn('test_dmedia', server)
+
+        # Test when db exists, server not provided
+        db = f(env)
+        self.assertTrue(isinstance(db, couchdb.Database))
+        self.assertEqual(repr(db), "<Database 'test_dmedia'>")
+        self.assertEqual(db.info()['db_name'], 'test_dmedia')
+        self.assertIn('test_dmedia', server)
+
+        # Test when db does not exist, server *is* provided
+        server.delete('test_dmedia')
+        self.assertNotIn('test_dmedia', server)
+        db = f(env, server=server)
+        self.assertTrue(isinstance(db, couchdb.Database))
+        self.assertEqual(repr(db), "<Database 'test_dmedia'>")
+        self.assertEqual(db.info()['db_name'], 'test_dmedia')
+        self.assertIn('test_dmedia', server)
+
+        # Test when db exists, server *is* provided
+        db = f(env, server=server)
+        self.assertTrue(isinstance(db, couchdb.Database))
+        self.assertEqual(repr(db), "<Database 'test_dmedia'>")
+        self.assertEqual(db.info()['db_name'], 'test_dmedia')
+        self.assertIn('test_dmedia', server)

=== added file 'dmedia/tests/test_api.py'
--- dmedia/tests/test_api.py	1970-01-01 00:00:00 +0000
+++ dmedia/tests/test_api.py	2011-04-11 12:02:24 +0000
@@ -0,0 +1,125 @@
+# Authors:
+#   Jason Gerard DeRose <[e-mail]>
+#
+# dmedia: distributed media library
+# Copyright (C) 2011 Jason Gerard DeRose <[e-mail]>
+#
+# This file is part of `dmedia`.
+#
+# `dmedia` is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# `dmedia` 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 Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along
+# with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Unit tests for `dmedia.api` module.
+"""
+
+import os
+from os import path
+from subprocess import Popen
+import json
+import time
+
+import gnomekeyring
+
+import dmedia
+from dmedia.abstractcouch import get_db
+from dmedia import api
+
+from .couch import CouchCase
+from .helpers import random_bus
+
+
+tree = path.dirname(path.dirname(path.abspath(dmedia.__file__)))
+assert path.isfile(path.join(tree, 'setup.py'))
+script = path.join(tree, 'dmedia-service')
+assert path.isfile(script)
+
+
+def get_auth():
+    data = gnomekeyring.find_items_sync(
+        gnomekeyring.ITEM_GENERIC_SECRET,
+        {'desktopcouch': 'basic'}
+    )
+    (user, password) = data[0].secret.split(':')
+    return (user, password)
+
+
+class TestDMedia(CouchCase):
+    klass = api.DMedia
+
+    def setUp(self):
+        """
+        Launch dmedia dbus service using a random bus name.
+
+        This will launch dmedia-service with a random bus name like this:
+
+            dmedia-service --bus org.test3ISHAWZVSWVN5I5S.DMedia
+
+        How do people usually unit test dbus services?  This works, but not sure
+        if there is a better idiom in common use.  --jderose
+        """
+        super(TestDMedia, self).setUp()
+        self.bus = random_bus()
+        cmd = [script,
+            '--bus', self.bus,
+            '--env', json.dumps(self.env),
+        ]
+        self.service = Popen(cmd)
+        time.sleep(1)  # Give dmedia-service time to start
+
+    def tearDown(self):
+        super(TestDMedia, self).tearDown()
+        try:
+            self.service.terminate()
+            self.service.wait()
+        except OSError:
+            pass
+        finally:
+            self.service = None
+
+    def test_all(self):
+        inst = self.klass(self.bus)
+
+        # DMedia.Version()
+        self.assertEqual(inst.version(), dmedia.__version__)
+
+        # DMedia.GetEnv()
+        env = inst.get_env()
+        self.assertEqual(env['oauth'], self.env['oauth'])
+        self.assertEqual(env['port'], self.env['port'])
+        self.assertEqual(env['url'], self.env['url'])
+        self.assertEqual(env['dbname'], self.env['dbname'])
+
+        # DMedia.GetAuthURL()
+        (user, password) = get_auth()
+        self.assertEqual(
+            inst.get_auth_url(),
+            'http://{user}:{password}@localhost:{port}/'.format(
+                user=user, password=password, port=self.env['port']
+            )
+        )
+
+        # DMedia.HasApp()
+        db = get_db(self.env)
+        self.assertNotIn('app', db)
+        self.assertTrue(inst.has_app())
+        self.assertTrue(db['app']['_rev'].startswith('1-'))
+        self.assertTrue(inst.has_app())
+        self.assertTrue(db['app']['_rev'].startswith('1-'))
+
+        # DMedia.Kill()
+        self.assertIsNone(self.service.poll(), None)
+        inst.kill()
+        self.assertTrue(inst._proxy is None)
+        time.sleep(1)  # Give dmedia-service time to shutdown
+        self.assertEqual(self.service.poll(), 0)

=== added file 'dmedia/tests/test_core.py'
--- dmedia/tests/test_core.py	1970-01-01 00:00:00 +0000
+++ dmedia/tests/test_core.py	2011-04-11 12:02:24 +0000
@@ -0,0 +1,336 @@
+# Authors:
+#   Jason Gerard DeRose <[e-mail]>
+#
+# dmedia: distributed media library
+# Copyright (C) 2011 Jason Gerard DeRose <[e-mail]>
+#
+# This file is part of `dmedia`.
+#
+# `dmedia` is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# `dmedia` 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 Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along
+# with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Unit tests for `dmedia.core` module.
+"""
+
+from unittest import TestCase
+import json
+
+import couchdb
+import desktopcouch
+from desktopcouch.application.platform import find_port
+from desktopcouch.application.local_files import get_oauth_tokens
+
+from dmedia.webui.app import App
+from dmedia.schema import random_id
+from dmedia import core
+
+from .couch import CouchCase
+
+
+def dc_env(dbname):
+    """
+    Create desktopcouch environment.
+    """
+    port = find_port()
+    return {
+        'dbname': dbname,
+        'port': port,
+        'url': 'http://localhost:%d/' % port,
+        'oauth': get_oauth_tokens(),
+    }
+
+
+class TestFunctions(TestCase):
+    def tearDown(self):
+        if core.desktopcouch is None:
+            core.desktopcouch = desktopcouch
+
+    def test_get_env(self):
+        f = core.get_env
+
+        # Test when desktopcouch is available
+        self.assertEqual(f(), dc_env('dmedia'))
+        self.assertEqual(f('foo'), dc_env('foo'))
+        self.assertEqual(f(dbname='bar'), dc_env('bar'))
+
+        # Test when desktopcouch is available but no_dc=True
+        self.assertEqual(
+            f(no_dc=True),
+            {
+                'dbname': 'dmedia',
+                'port': 5984,
+                'url': 'http://localhost:5984/',
+            }
+        )
+        self.assertEqual(
+            f(dbname='foo', no_dc=True),
+            {
+                'dbname': 'foo',
+                'port': 5984,
+                'url': 'http://localhost:5984/',
+            }
+        )
+        self.assertEqual(
+            f('bar', True),
+            {
+                'dbname': 'bar',
+                'port': 5984,
+                'url': 'http://localhost:5984/',
+            }
+        )
+
+        # Test when desktopcouch is *not* available
+        core.desktopcouch = None
+        self.assertEqual(
+            f(),
+            {
+                'dbname': 'dmedia',
+                'port': 5984,
+                'url': 'http://localhost:5984/',
+            }
+        )
+        self.assertEqual(
+            f('foo'),
+            {
+                'dbname': 'foo',
+                'port': 5984,
+                'url': 'http://localhost:5984/',
+            }
+        )
+        self.assertEqual(
+            f(dbname='bar'),
+            {
+                'dbname': 'bar',
+                'port': 5984,
+                'url': 'http://localhost:5984/',
+            }
+        )
+
+
+class TestCore(CouchCase):
+    klass = core.Core
+
+    def tearDown(self):
+        super(TestCore, self).tearDown()
+        if core.App is None:
+            core.App = App
+
+    def test_init(self):
+        inst = self.klass(self.dbname)
+        self.assertNotEqual(inst.env, self.env)
+        self.assertEqual(
+            set(inst.env),
+            set(['port', 'url', 'dbname', 'oauth'])
+        )
+        self.assertEqual(inst.env['dbname'], self.dbname)
+        self.assertEqual(inst.env['port'], self.env['port'])
+        self.assertEqual(inst.env['url'], self.env['url'])
+        self.assertEqual(inst.env['oauth'], self.env['oauth'])
+        self.assertEqual(inst.home, self.home.path)
+        self.assertIsInstance(inst.db, couchdb.Database)
+
+        inst = self.klass(env_s=json.dumps(self.env))
+        self.assertEqual(inst.env, self.env)
+
+    def test_bootstrap(self):
+        inst = self.klass(self.dbname)
+        self.assertNotIn('machine_id', inst.env)
+        self.assertIsNone(inst.bootstrap())
+        self.assertEqual(inst.env['machine_id'], inst.machine_id)
+
+    def test_init_local(self):
+        inst = self.klass(self.dbname)
+
+        # Test when _local/dmedia doesn't exist:
+        (local, machine) = inst.init_local()
+
+        self.assertIsInstance(local, dict)
+        self.assertEqual(
+            set(local),
+            set([
+                '_id',
+                '_rev',
+                'machine',
+                'filestores',
+            ])
+        )
+        self.assertEqual(local['filestores'], {})
+        self.assertEqual(local, inst.db['_local/dmedia'])
+
+        self.assertIsInstance(machine, dict)
+        self.assertEqual(
+            set(machine),
+            set([
+                '_id',
+                '_rev',
+                'ver',
+                'type',
+                'time',
+                'hostname',
+                'distribution',
+            ])
+        )
+        self.assertEqual(machine, inst.db[local['machine']['_id']])
+
+        # Test when _local/machine exists but 'dmedia/machine' doc doesn't:
+        inst.db.delete(machine)
+        (local2, machine2) = inst.init_local()
+        self.assertEqual(local2, local)
+        self.assertTrue(machine2['_rev'].startswith('3-'))
+        self.assertNotEqual(machine2['_rev'], machine['_rev'])
+        d = dict(machine2)
+        d.pop('_rev')
+        self.assertEqual(d, local['machine'])
+
+        # Test when both _local/dmedia and 'dmedia/machine' doc exist:
+        local3 = {
+            '_id': '_local/dmedia',
+            '_rev': local2['_rev'],
+            'machine': {
+                '_id': 'foobar',
+                'hello': 'world',
+            }
+        }
+        inst.db.save(local3)
+        machine3 = {
+            '_id': 'foobar',
+            '_rev': machine2['_rev'],
+            'hello': 'naughty nurse',
+        }
+        inst.db.save(machine3)
+        (local4, machine4) = inst.init_local()
+        self.assertEqual(local4, local3)
+        self.assertEqual(machine4, machine3)
+
+    def test_init_filestores(self):
+        inst = self.klass(self.dbname)
+        (inst.local, inst.machine) = inst.init_local()
+        inst.machine_id = inst.machine['_id']
+        inst.env['machine_id'] = inst.machine_id
+
+        self.assertEqual(inst.local['filestores'], {})
+        self.assertNotIn('default_filestore', inst.local)
+        lstore = inst.init_filestores()
+        self.assertEqual(inst.local, inst.db['_local/dmedia'])
+        self.assertEqual(len(inst.local['filestores']), 1)
+        _id = inst.local['default_filestore']
+        self.assertEqual(inst.local['filestores'][_id], lstore)
+        self.assertEqual(
+            set(lstore),
+            set([
+                '_id',
+                'ver',
+                'type',
+                'time',
+                'plugin',
+                'copies',
+                'path',
+                'machine_id',
+            ])
+        )
+        self.assertEqual(lstore['ver'], 0)
+        self.assertEqual(lstore['type'], 'dmedia/store')
+        self.assertEqual(lstore['plugin'], 'filestore')
+        self.assertEqual(lstore['copies'], 1)
+        self.assertEqual(lstore['path'], self.home.path)
+        self.assertEqual(lstore['machine_id'], inst.machine_id)
+
+        store = inst.db[_id]
+        self.assertTrue(store['_rev'].startswith('1-'))
+        store.pop('_rev')
+        self.assertEqual(store, lstore)
+
+        # Try again when docs already exist:
+        self.assertEqual(inst.init_filestores(), lstore)
+
+    def test_init_app(self):
+        inst = self.klass(self.dbname)
+
+        # App is available
+        self.assertNotIn('app', inst.db)
+        self.assertIs(inst.init_app(), True)
+        self.assertIn('app', inst.db)
+        self.assertIs(inst.init_app(), True)
+
+        # App is not available
+        core.App = None
+        self.assertIs(inst.init_app(), False)
+
+        # App is available again (make sure there is no state)
+        core.App = App
+        self.assertIs(inst.init_app(), True)
+        self.assertIs(inst.init_app(), True)
+
+    def test_has_app(self):
+        class Sub(self.klass):
+            _calls = 0
+
+            def init_app(self):
+                self._calls += 1
+                return 'A' * self._calls
+
+        inst = Sub(self.dbname)
+        self.assertIsNone(inst._has_app)
+
+        inst._has_app = 'foo'
+        self.assertEqual(inst.has_app(), 'foo')
+        self.assertEqual(inst._calls, 0)
+
+        inst._has_app = None
+        self.assertEqual(inst.has_app(), 'A')
+        self.assertEqual(inst._calls, 1)
+        self.assertEqual(inst._has_app, 'A')
+
+        self.assertEqual(inst.has_app(), 'A')
+        self.assertEqual(inst._calls, 1)
+        self.assertEqual(inst._has_app, 'A')
+
+        inst._has_app = None
+        self.assertEqual(inst.has_app(), 'AA')
+        self.assertEqual(inst._calls, 2)
+        self.assertEqual(inst._has_app, 'AA')
+
+        self.assertEqual(inst.has_app(), 'AA')
+        self.assertEqual(inst._calls, 2)
+        self.assertEqual(inst._has_app, 'AA')
+
+
+        # Test the real thing, no App
+        core.App = None
+        inst = self.klass(self.dbname)
+        self.assertIs(inst.has_app(), False)
+        self.assertIs(inst._has_app, False)
+        self.assertNotIn('app', inst.db)
+
+
+        # Test the real thing, App available
+        core.App = App
+        inst = self.klass(self.dbname)
+
+        self.assertNotIn('app', inst.db)
+        self.assertIs(inst.has_app(), True)
+        self.assertIs(inst._has_app, True)
+        rev = inst.db['app']['_rev']
+        self.assertTrue(rev.startswith('1-'))
+
+        self.assertIs(inst.has_app(), True)
+        self.assertIs(inst._has_app, True)
+        self.assertEqual(inst.db['app']['_rev'], rev)
+
+        inst._has_app = None
+        self.assertIs(inst.has_app(), True)
+        self.assertIs(inst._has_app, True)
+        rev2 = inst.db['app']['_rev']
+        self.assertNotEqual(rev2, rev)
+        self.assertTrue(rev2.startswith('2-'))

=== modified file 'dmedia/tests/test_downloader.py'
--- dmedia/tests/test_downloader.py	2011-02-22 14:07:47 +0000
+++ dmedia/tests/test_downloader.py	2011-04-11 12:02:24 +0000
@@ -175,8 +175,8 @@
         tmp = TempDir()
         fs = FileStore(tmp.path)
         inst = self.klass('', fs, mov_hash, 'mov')
-        d = tmp.join('transfers')
-        f = tmp.join('transfers', mov_hash + '.mov')
+        d = tmp.join('.dmedia', 'transfers')
+        f = tmp.join('.dmedia', 'transfers', mov_hash + '.mov')
         self.assertFalse(path.exists(d))
         self.assertFalse(path.exists(f))
         self.assertEqual(inst.get_tmp(), f)
@@ -187,8 +187,8 @@
         tmp = TempDir()
         fs = FileStore(tmp.path)
         inst = self.klass('', fs, mov_hash)
-        d = tmp.join('transfers')
-        f = tmp.join('transfers', mov_hash)
+        d = tmp.join('.dmedia', 'transfers')
+        f = tmp.join('.dmedia', 'transfers', mov_hash)
         self.assertFalse(path.exists(d))
         self.assertFalse(path.exists(f))
         self.assertEqual(inst.get_tmp(), f)
@@ -200,10 +200,10 @@
         fs = FileStore(tmp.path)
         inst = self.klass('', fs, mov_hash, 'mov')
 
-        src_d = tmp.join('transfers')
-        src = tmp.join('transfers', mov_hash + '.mov')
-        dst_d = tmp.join(mov_hash[:2])
-        dst = tmp.join(mov_hash[:2], mov_hash[2:] + '.mov')
+        src_d = tmp.join('.dmedia', 'transfers')
+        src = tmp.join('.dmedia', 'transfers', mov_hash + '.mov')
+        dst_d = tmp.join('.dmedia', mov_hash[:2])
+        dst = tmp.join('.dmedia', mov_hash[:2], mov_hash[2:] + '.mov')
 
         # Test when transfers/ dir doesn't exist:
         e = raises(IOError, inst.finalize)

=== modified file 'dmedia/tests/test_filestore.py'
--- dmedia/tests/test_filestore.py	2011-02-27 03:47:55 +0000
+++ dmedia/tests/test_filestore.py	2011-04-11 12:02:24 +0000
@@ -39,7 +39,7 @@
 from dmedia.errors import AmbiguousPath, FileStoreTraversal
 from dmedia.errors import DuplicateFile, IntegrityError
 from dmedia.filestore import HashList
-from dmedia import filestore, constants, schema
+from dmedia import filestore, constants
 from dmedia.constants import TYPE_ERROR, EXT_PAT, LEAF_SIZE
 
 
@@ -60,7 +60,6 @@
         # Test with normalized absolute path:
         self.assertEqual(f('/home/jderose/.dmedia'), '/home/jderose/.dmedia')
 
-
     def test_safe_open(self):
         f = filestore.safe_open
         tmp = TempDir()
@@ -501,43 +500,66 @@
         self.assertEqual(e.pathname, '/foo/bar/../../root')
         self.assertEqual(e.abspath, '/root')
 
-        # Test when base is a file
+        # Test when parent does not exist
+        tmp = TempDir()
+        parent = tmp.join('foo')
+        e = raises(ValueError, self.klass, parent)
+        self.assertEqual(
+            str(e),
+            'FileStore.parent not a directory: %r' % parent
+        )
+
+        # Test when parent is a file
+        tmp = TempDir()
+        parent = tmp.touch('foo')
+        e = raises(ValueError, self.klass, parent)
+        self.assertEqual(
+            str(e),
+            'FileStore.parent not a directory: %r' % parent
+        )
+
+        # Test when parent=None
+        inst = self.klass()
+        self.assertTrue(path.isdir(inst.parent))
+        self.assertTrue(inst.parent.startswith('/tmp/store.'))
+        base = path.join(inst.parent, '.dmedia')
+        self.assertTrue(path.isdir(base))
+
+        # Test when base does not exist
+        tmp = TempDir()
+        base = tmp.join('.dmedia')
+        inst = self.klass(tmp.path)
+        self.assertEqual(inst.parent, tmp.path)
+        self.assertEqual(inst.base, base)
+        self.assertTrue(path.isdir(inst.base))
+
+        # Test when base exists and is a directory
+        tmp = TempDir()
+        base = tmp.makedirs('.dmedia')
+        inst = self.klass(tmp.path)
+        self.assertEqual(inst.parent, tmp.path)
+        self.assertEqual(inst.base, base)
+        self.assertTrue(path.isdir(inst.base))
+
+        # Test when base exists and is a file
         tmp = TempDir()
         base = tmp.touch('.dmedia')
-        e = raises(ValueError, self.klass, base)
+        e = raises(ValueError, self.klass, tmp.path)
         self.assertEqual(
             str(e),
             'FileStore.base not a directory: %r' % base
         )
 
-        # Test when base does not exist
+        # Test when base exists and is a symlink to a dir
         tmp = TempDir()
+        d = tmp.makedirs('foo')
         base = tmp.join('.dmedia')
-        record = tmp.join('.dmedia', 'store.json')
-        inst = self.klass(base)
-        self.assertEqual(inst.base, base)
-        self.assertTrue(path.isdir(inst.base))
-        self.assertEqual(inst.record, record)
-        self.assertTrue(path.isfile(record))
-        store_s = open(record, 'rb').read()
-        doc = json.loads(store_s)
-        self.assertEqual(schema.check_dmedia_store(doc), None)
-        self.assertEqual(inst._doc, doc)
-        self.assertEqual(inst._id, doc['_id'])
-
-        # Test when base exists and is a directory
-        inst = self.klass(base)
-        self.assertEqual(inst.base, base)
-        self.assertTrue(path.isdir(inst.base))
-        self.assertEqual(inst.record, record)
-        self.assertTrue(path.isfile(record))
-        self.assertEqual(open(record, 'rb').read(), store_s)
-
-        # Test when base=None
-        inst = self.klass()
-        self.assertTrue(path.isdir(inst.base))
-        self.assertTrue(inst.base.startswith('/tmp/store.'))
-        self.assertEqual(inst.record, path.join(inst.base, 'store.json'))
+        os.symlink(d, base)
+        e = raises(ValueError, self.klass, tmp.path)
+        self.assertEqual(
+            str(e),
+            '{!r} is symlink to {!r}'.format(base, d)
+        )
 
     def test_repr(self):
         tmp = TempDir()
@@ -551,29 +573,31 @@
     # Methods to prevent path traversals attacks
     def test_check_path(self):
         tmp = TempDir()
-        base = tmp.join('foo', 'bar')
-        inst = self.klass(base)
+        parent = tmp.makedirs('foo')
+        base = tmp.join('foo', '.dmedia')
+        inst = self.klass(parent)
 
-        bad = tmp.join('foo', 'barNone', 'stuff')
+        bad = tmp.join('foo', '.dmedia2', 'stuff')
         e = raises(FileStoreTraversal, inst.check_path, bad)
         self.assertEqual(e.pathname, bad)
         self.assertEqual(e.abspath, bad)
         self.assertEqual(e.base, base)
 
-        bad = tmp.join('foo', 'bar', '..', 'barNone')
+        bad = tmp.join('foo', '.dmedia', '..', '.dmedia2')
         assert '..' in bad
         e = raises(FileStoreTraversal, inst.check_path, bad)
         self.assertEqual(e.pathname, bad)
-        self.assertEqual(e.abspath, tmp.join('foo', 'barNone'))
+        self.assertEqual(e.abspath, tmp.join('foo', '.dmedia2'))
         self.assertEqual(e.base, base)
 
-        good = tmp.join('foo', 'bar', 'stuff')
+        good = tmp.join('foo', '.dmedia', 'stuff')
         self.assertEqual(inst.check_path(good), good)
 
     def test_join(self):
         tmp = TempDir()
-        base = tmp.join('foo', 'bar')
-        inst = self.klass(base)
+        parent = tmp.makedirs('foo')
+        base = tmp.join('foo', '.dmedia')
+        inst = self.klass(parent)
 
         # Test with an absolute path in parts:
         e = raises(FileStoreTraversal, inst.join, 'dmedia', '/root')
@@ -585,31 +609,32 @@
         e = raises(FileStoreTraversal, inst.join, 'NW', '..', '..', '.ssh')
         self.assertEqual(
             e.pathname,
-            tmp.join('foo', 'bar', 'NW', '..', '..', '.ssh')
+            tmp.join('foo', '.dmedia', 'NW', '..', '..', '.ssh')
         )
         self.assertEqual(e.abspath, tmp.join('foo', '.ssh'))
         self.assertEqual(e.base, base)
 
         # Test for former security issue!  See:
         # https://bugs.launchpad.net/dmedia/+bug/708663
-        e = raises(FileStoreTraversal, inst.join, '..', 'barNone', 'stuff')
+        e = raises(FileStoreTraversal, inst.join, '..', '.dmedia2', 'stuff')
         self.assertEqual(
             e.pathname,
-            tmp.join('foo', 'bar', '..', 'barNone', 'stuff')
+            tmp.join('foo', '.dmedia', '..', '.dmedia2', 'stuff')
         )
-        self.assertEqual(e.abspath, tmp.join('foo', 'barNone', 'stuff'))
+        self.assertEqual(e.abspath, tmp.join('foo', '.dmedia2', 'stuff'))
         self.assertEqual(e.base, base)
 
         # Test with some correct parts:
         self.assertEqual(
             inst.join('NW', 'BNVXVK5DQGIOW7MYR4K3KA5K22W7NW'),
-            tmp.join('foo', 'bar', 'NW', 'BNVXVK5DQGIOW7MYR4K3KA5K22W7NW')
+            tmp.join('foo', '.dmedia', 'NW', 'BNVXVK5DQGIOW7MYR4K3KA5K22W7NW')
         )
 
     def test_create_parent(self):
         tmp = TempDir()
         tmp2 = TempDir()
         inst = self.klass(tmp.path)
+        base = tmp.join('.dmedia')
 
         # Test with a normpath but outside of base:
         f = tmp2.join('foo', 'bar')
@@ -619,7 +644,7 @@
         e = raises(FileStoreTraversal, inst.create_parent, f)
         self.assertEqual(e.pathname, f)
         self.assertEqual(e.abspath, f)
-        self.assertEqual(e.base, tmp.path)
+        self.assertEqual(e.base, base)
         self.assertFalse(path.exists(f))
         self.assertFalse(path.exists(d))
 
@@ -632,13 +657,13 @@
         e = raises(FileStoreTraversal, inst.create_parent, f)
         self.assertEqual(e.pathname, f)
         self.assertEqual(e.abspath, tmp2.join('baz', 'f'))
-        self.assertEqual(e.base, tmp.path)
+        self.assertEqual(e.base, base)
         self.assertFalse(path.exists(f))
         self.assertFalse(path.exists(d))
 
         # Test with some correct parts:
-        f = tmp.join('NW', 'BNVXVK5DQGIOW7MYR4K3KA5K22W7NW')
-        d = tmp.join('NW')
+        f = tmp.join('.dmedia', 'NW', 'BNVXVK5DQGIOW7MYR4K3KA5K22W7NW')
+        d = tmp.join('.dmedia', 'NW')
         self.assertFalse(path.exists(f))
         self.assertFalse(path.exists(d))
         self.assertEqual(inst.create_parent(f), d)
@@ -649,8 +674,8 @@
         self.assertTrue(path.isdir(d))
 
         # Confirm that it's using os.makedirs(), not os.mkdir()
-        f = tmp.join('OM', 'LU', 'WE', 'IP')
-        d = tmp.join('OM', 'LU', 'WE')
+        f = tmp.join('.dmedia', 'OM', 'LU', 'WE', 'IP')
+        d = tmp.join('.dmedia', 'OM', 'LU', 'WE')
         self.assertFalse(path.exists(f))
         self.assertFalse(path.exists(d))
         self.assertEqual(inst.create_parent(f), d)
@@ -661,18 +686,19 @@
         self.assertTrue(path.isdir(d))
 
         # Test with 1-deep:
-        f = tmp.join('woot')
+        f = tmp.join('.dmedia', 'woot')
         self.assertFalse(path.exists(f))
-        self.assertEqual(inst.create_parent(f), tmp.path)
+        self.assertEqual(inst.create_parent(f), base)
         self.assertFalse(path.exists(f))
 
         # Test for former security issue!  See:
         # https://bugs.launchpad.net/dmedia/+bug/708663
         tmp = TempDir()
-        base = tmp.join('foo', 'bar')
-        bad = tmp.join('foo', 'barNone', 'stuff')
-        baddir = tmp.join('foo', 'barNone')
-        inst = self.klass(base)
+        parent = tmp.makedirs('foo')
+        base = tmp.join('foo', '.dmedia')
+        bad = tmp.join('foo', '.dmedia2', 'stuff')
+        baddir = tmp.join('foo', '.dmedia2')
+        inst = self.klass(parent)
         e = raises(FileStoreTraversal, inst.create_parent, bad)
         self.assertEqual(e.pathname, bad)
         self.assertEqual(e.abspath, bad)
@@ -717,16 +743,17 @@
 
     def test_path(self):
         tmp = TempDir()
-        base = tmp.join('foo', 'bar')
-        inst = self.klass(base)
+        parent = tmp.makedirs('foo')
+        base = tmp.join('foo', '.dmedia')
+        inst = self.klass(parent)
 
         self.assertEqual(
             inst.path('NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW'),
-            tmp.join('foo', 'bar', 'NW', 'BNVXVK5DQGIOW7MYR4K3KA5K22W7NW')
+            tmp.join('foo', '.dmedia', 'NW', 'BNVXVK5DQGIOW7MYR4K3KA5K22W7NW')
         )
         self.assertEqual(
             inst.path('NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW', ext='ogv'),
-            tmp.join('foo', 'bar', 'NW', 'BNVXVK5DQGIOW7MYR4K3KA5K22W7NW.ogv')
+            tmp.join('foo', '.dmedia', 'NW', 'BNVXVK5DQGIOW7MYR4K3KA5K22W7NW.ogv')
         )
 
         # Test to make sure hashes are getting checked with safe_b32():
@@ -755,8 +782,8 @@
         tmp = TempDir()
         inst = self.klass(tmp.path)
 
-        f = tmp.join('NW', 'BNVXVK5DQGIOW7MYR4K3KA5K22W7NW')
-        d = tmp.join('NW')
+        f = tmp.join('.dmedia', 'NW', 'BNVXVK5DQGIOW7MYR4K3KA5K22W7NW')
+        d = tmp.join('.dmedia', 'NW')
         self.assertFalse(path.exists(f))
         self.assertFalse(path.exists(d))
         self.assertEqual(
@@ -780,7 +807,7 @@
         self.assertFalse(inst.exists(mov_hash, 'mov'))
 
         # File exists
-        tmp.touch(mov_hash[:2], mov_hash[2:] + '.mov')
+        tmp.touch('.dmedia', mov_hash[:2], mov_hash[2:] + '.mov')
         self.assertTrue(inst.exists(mov_hash, 'mov'))
 
     def test_open(self):
@@ -834,7 +861,7 @@
         self.assertEqual(e.errno, 2)
 
         # File exists
-        f = tmp.touch(mov_hash[:2], mov_hash[2:] + '.mov')
+        f = tmp.touch('.dmedia', mov_hash[:2], mov_hash[2:] + '.mov')
         self.assertTrue(path.isfile(f))
         inst.remove(mov_hash, 'mov')
         self.assertFalse(path.exists(f))
@@ -880,11 +907,13 @@
 
         self.assertEqual(
             inst.tmp('NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW'),
-            tmp.join('transfers', 'NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW')
+            tmp.join('.dmedia', 'transfers', 'NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW')
         )
         self.assertEqual(
             inst.tmp('NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW', ext='ogv'),
-            tmp.join('transfers', 'NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW.ogv')
+            tmp.join(
+                '.dmedia', 'transfers', 'NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW.ogv'
+            )
         )
 
         # Test to make sure hashes are getting checked with safe_b32():
@@ -913,8 +942,8 @@
         tmp = TempDir()
         inst = self.klass(tmp.path)
 
-        f = tmp.join('transfers', 'NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW')
-        d = tmp.join('transfers')
+        f = tmp.join('.dmedia', 'transfers', 'NWBNVXVK5DQGIOW7MYR4K3KA5K22W7NW')
+        d = tmp.join('.dmedia', 'transfers')
         self.assertFalse(path.exists(f))
         self.assertFalse(path.exists(d))
         self.assertEqual(
@@ -935,7 +964,7 @@
 
         tmp = TempDir()
         inst = self.klass(tmp.path)
-        filename = tmp.join('transfers', chash)
+        filename = tmp.join('.dmedia', 'transfers', chash)
 
         # Test when file dosen't yet exist
         fp = inst.allocate_for_transfer(2311, chash)
@@ -965,7 +994,7 @@
 
         tmp = TempDir()
         inst = self.klass(tmp.path)
-        filename = tmp.join('transfers', chash + '.mov')
+        filename = tmp.join('.dmedia', 'transfers', chash + '.mov')
 
         # Test when file dosen't yet exist
         fp = inst.allocate_for_transfer(2311, chash, ext='mov')
@@ -992,7 +1021,7 @@
 
     def test_allocate_for_import(self):
         tmp = TempDir()
-        imports = tmp.join('imports')
+        imports = tmp.join('.dmedia', 'imports')
 
         inst = self.klass(tmp.path)
         self.assertFalse(path.isdir(imports))
@@ -1020,7 +1049,7 @@
 
     def test_allocate_for_write(self):
         tmp = TempDir()
-        writes = tmp.join('writes')
+        writes = tmp.join('.dmedia', 'writes')
 
         inst = self.klass(tmp.path)
         self.assertFalse(path.isdir(writes))
@@ -1052,7 +1081,7 @@
         base = tmp.join('.dmedia')
         dst_d = tmp.join('.dmedia', mov_hash[:2])
         dst = tmp.join('.dmedia', mov_hash[:2], mov_hash[2:] + '.mov')
-        inst = self.klass(base)
+        inst = self.klass(tmp.path)
 
         # Test with wrong tmp_fp type
         e = raises(TypeError, inst.tmp_move, 17, mov_hash, 'mov')
@@ -1157,10 +1186,10 @@
         tmp = TempDir()
         inst = self.klass(tmp.path)
 
-        src_d = tmp.join('transfers')
-        src = tmp.join('transfers', mov_hash + '.mov')
-        dst_d = tmp.join(mov_hash[:2])
-        dst = tmp.join(mov_hash[:2], mov_hash[2:] + '.mov')
+        src_d = tmp.join('.dmedia', 'transfers')
+        src = tmp.join('.dmedia', 'transfers', mov_hash + '.mov')
+        dst_d = tmp.join('.dmedia', mov_hash[:2])
+        dst = tmp.join('.dmedia', mov_hash[:2], mov_hash[2:] + '.mov')
 
         # Test when transfers/ dir doesn't exist:
         e = raises(IOError, inst.tmp_verify_move, mov_hash, 'mov')
@@ -1235,7 +1264,7 @@
         dst = tmp.join('.dmedia', mov_hash[:2], mov_hash[2:] + '.mov')
         shutil.copy(sample_mov, src)
 
-        inst = self.klass(base)
+        inst = self.klass(tmp.path)
         self.assertTrue(path.isfile(src))
         self.assertTrue(path.isdir(base))
         self.assertFalse(path.exists(dst))

=== modified file 'dmedia/tests/test_importer.py'
--- dmedia/tests/test_importer.py	2011-04-06 12:35:49 +0000
+++ dmedia/tests/test_importer.py	2011-04-11 12:02:24 +0000
@@ -40,7 +40,7 @@
 from dmedia.filestore import FileStore
 from dmedia.schema import random_id
 from dmedia import importer, schema
-from dmedia.abstractcouch import get_env, get_dmedia_db
+from dmedia.abstractcouch import get_db
 from .helpers import TempDir, TempHome, raises
 from .helpers import DummyQueue, DummyCallback, prep_import_source
 from .helpers import sample_mov, sample_thm
@@ -203,8 +203,8 @@
         self.assertTrue(isinstance(inst.server, couchdb.Server))
         self.assertTrue(isinstance(inst.db, couchdb.Database))
 
-        self.assertEqual(inst.home, self.home.path)
         self.assertTrue(isinstance(inst.filestore, FileStore))
+        self.assertEqual(inst.filestore.parent, self.home.path)
         self.assertEqual(inst.filestore.base, self.home.join('.dmedia'))
 
         # Test with extract = False
@@ -302,7 +302,7 @@
         self.assertTrue(inst.doc is None)
         _id = inst.start()
         self.assertEqual(len(_id), 24)
-        db = get_dmedia_db(self.env)
+        db = get_db(self.env)
         self.assertEqual(inst.doc, db[_id])
         self.assertEqual(
             set(inst.doc),
@@ -459,7 +459,7 @@
         old['stored'] = {rid: {'copies': 2, 'time': 1234567890}}
         inst.db.save(old)
         (action, doc) = inst._import_file(src2)
-        fid = inst.filestore._id
+        fid = inst.filestore_id
         self.assertEqual(action, 'skipped')
         self.assertEqual(set(doc['stored']), set([rid, fid]))
         t = doc['stored'][fid]['time']

=== modified file 'dmedia/tests/test_transcoder.py'
--- dmedia/tests/test_transcoder.py	2011-02-27 13:29:05 +0000
+++ dmedia/tests/test_transcoder.py	2011-04-11 12:02:24 +0000
@@ -224,13 +224,13 @@
         self.assertEqual(inst.src_fp.mode, 'rb')
         self.assertEqual(
             inst.src_fp.name,
-            self.tmp.join(mov_hash[:2], mov_hash[2:] + '.mov')
+            self.tmp.join('.dmedia', mov_hash[:2], mov_hash[2:] + '.mov')
         )
 
         self.assertTrue(isinstance(inst.dst_fp, file))
         self.assertEqual(inst.dst_fp.mode, 'r+b')
         self.assertTrue(
-            inst.dst_fp.name.startswith(self.tmp.join('writes'))
+            inst.dst_fp.name.startswith(self.tmp.join('.dmedia', 'writes'))
         )
         self.assertTrue(inst.dst_fp.name.endswith('.ogv'))
 

=== renamed file 'dmedia/tests/test_metastore.py' => 'dmedia/tests/test_views.py'
--- dmedia/tests/test_metastore.py	2011-02-20 19:18:43 +0000
+++ dmedia/tests/test_views.py	2011-04-11 12:02:24 +0000
@@ -2,7 +2,7 @@
 #   Jason Gerard DeRose <[e-mail]>
 #
 # dmedia: distributed media library
-# Copyright (C) 2010 Jason Gerard DeRose <[e-mail]>
+# Copyright (C) 2010, 2011 Jason Gerard DeRose <[e-mail]>
 #
 # This file is part of `dmedia`.
 #
@@ -20,150 +20,79 @@
 # with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Unit tests for `dmedia.metastore` module.
+Unit tests for `dmedia.views` module.
 """
 
 from unittest import TestCase
-import os
-import shutil
-import socket
-import platform
-
-import couchdb
-
-from dmedia import metastore
-from .helpers import TempDir, TempHome
+
+from dmedia.abstractcouch import get_db
+from dmedia import views
+
 from .couch import CouchCase
 
 
 class test_functions(TestCase):
     def test_build_design_doc(self):
-        f = metastore.build_design_doc
-        views = (
+        f = views.build_design_doc
+        views_ = (
             ('bytes', 'foo', '_sum'),
             ('mtime', 'bar', None),
         )
-        self.assertEqual(f('file', views),
-            (
-                '_design/file',
-                {
-                    '_id': '_design/file',
-                    'language': 'javascript',
-                    'views': {
-                        'bytes': {
-                            'map': 'foo',
-                            'reduce': '_sum',
-                        },
-                        'mtime': {
-                            'map': 'bar',
-                        },
-                    }
+        self.assertEqual(f('file', views_),
+            {
+                '_id': '_design/file',
+                'language': 'javascript',
+                'views': {
+                    'bytes': {
+                        'map': 'foo',
+                        'reduce': '_sum',
+                    },
+                    'mtime': {
+                        'map': 'bar',
+                    },
                 }
-            )
-        )
-
-    def test_create_machine(self):
-        f = metastore.create_machine
-        doc = f()
-        self.assertTrue(isinstance(doc, dict))
-        self.assertEqual(
-            set(doc),
-            set([
-                '_id',
-                'machine_id',
-                'type',
-                'time',
-                'hostname',
-                'distribution',
-            ])
-        )
-        self.assertEqual(doc['type'], 'dmedia/machine')
-        self.assertEqual(doc['_id'], '_local/machine')
-        self.assertEqual(doc['hostname'], socket.gethostname())
-        self.assertEqual(doc['distribution'], platform.linux_distribution())
-
-
-class test_MetaStore(CouchCase):
-    klass = metastore.MetaStore
-
-    def new(self):
-        return self.klass(self.env)
-
-    def test_init(self):
-        inst = self.new()
-        self.assertEqual(inst.env, self.env)
-        self.assertTrue(isinstance(inst.server, couchdb.Server))
-        self.assertTrue(isinstance(inst.db, couchdb.Database))
-
-    def update(self):
-        inst = self.new()
-        '_local/app'
-        inst.update(dict(_id=_id, foo='bar'))
-        old = inst.db[_id]
-        inst.update(dict(_id=_id, foo='bar'))
-        self.assertEqual(inst.db[_id]['_rev'], old['_rev'])
-        inst.update(dict(_id=_id, foo='baz'))
-        self.assertNotEqual(inst.db[_id]['_rev'], old['_rev'])
-
-    def test_create_machine(self):
-        inst = self.new()
-        self.assertFalse('_local/machine' in inst.db)
-        _id = inst.create_machine()
-        self.assertTrue('_local/machine' in inst.db)
-        self.assertTrue(_id in inst.db)
-        loc = inst.db['_local/machine']
-        doc = inst.db[_id]
-        self.assertEqual(set(loc), set(doc))
-        self.assertEqual(loc['machine_id'], doc['machine_id'])
-        self.assertEqual(loc['time'], doc['time'])
-
-        self.assertEqual(inst._machine_id, None)
-        self.assertEqual(inst.machine_id, _id)
-        self.assertEqual(inst._machine_id, _id)
-
-    def test_total_bytes(self):
-        inst = self.new()
-        self.assertEqual(inst.total_bytes(), 0)
-        total = 0
-        for exp in xrange(20, 31):
-            size = 2 ** exp + 1
-            total += size
-            inst.db.create({'bytes': size, 'type': 'dmedia/file'})
-            self.assertEqual(inst.total_bytes(), total)
-
-    def test_extensions(self):
-        inst = self.new()
-        self.assertEqual(list(inst.extensions()), [])
-        for i in xrange(17):
-            inst.db.create({'ext': 'mov', 'type': 'dmedia/file'})
-            inst.db.create({'ext': 'jpg', 'type': 'dmedia/file'})
-            inst.db.create({'ext': 'cr2', 'type': 'dmedia/file'})
-        self.assertEqual(
-            list(inst.extensions()),
-            [
-                ('cr2', 17),
-                ('jpg', 17),
-                ('mov', 17),
-            ]
-        )
-        for i in xrange(27):
-            inst.db.create({'ext': 'mov', 'type': 'dmedia/file'})
-            inst.db.create({'ext': 'jpg', 'type': 'dmedia/file'})
-        self.assertEqual(
-            list(inst.extensions()),
-            [
-                ('cr2', 17),
-                ('jpg', 44),
-                ('mov', 44),
-            ]
-        )
-        for i in xrange(25):
-            inst.db.create({'ext': 'mov', 'type': 'dmedia/file'})
-        self.assertEqual(
-            list(inst.extensions()),
-            [
-                ('cr2', 17),
-                ('jpg', 44),
-                ('mov', 69),
-            ]
-        )
+            }
+        )
+
+
+class TestCouchFunctions(CouchCase):
+    def test_update_design_doc(self):
+        f = views.update_design_doc
+        db = get_db(self.env)
+
+        # Test when design doesn't exist:
+        doc = views.build_design_doc('user',
+            [('video', views.user_video, None)]
+        )
+        self.assertEqual(f(db, doc), 'new')
+        self.assertTrue(db['_design/user']['_rev'].startswith('1-'))
+
+        # Test when design is same:
+        doc = views.build_design_doc('user',
+            [('video', views.user_video, None)]
+        )
+        self.assertEqual(f(db, doc), 'same')
+        self.assertTrue(db['_design/user']['_rev'].startswith('1-'))
+
+        # Test when design is changed:
+        doc = views.build_design_doc('user',
+            [('video', views.user_audio, None)]
+        )
+        self.assertEqual(f(db, doc), 'changed')
+        self.assertTrue(db['_design/user']['_rev'].startswith('2-'))
+
+        # Again test when design is same:
+        doc = views.build_design_doc('user',
+            [('video', views.user_audio, None)]
+        )
+        self.assertEqual(f(db, doc), 'same')
+        self.assertTrue(db['_design/user']['_rev'].startswith('2-'))
+
+    def test_init_views(self):
+        db = get_db(self.env)
+        views.init_views(db)
+        for (name, views_) in views.designs:
+            doc = views.build_design_doc(name, views_)
+            saved = db[doc['_id']]
+            doc['_rev'] = saved['_rev']
+            self.assertEqual(saved, doc)

=== renamed file 'dmedia/metastore.py' => 'dmedia/views.py'
--- dmedia/metastore.py	2011-04-06 18:27:00 +0000
+++ dmedia/views.py	2011-04-11 12:02:24 +0000
@@ -2,7 +2,7 @@
 #   Jason Gerard DeRose <[e-mail]>
 #
 # dmedia: distributed media library
-# Copyright (C) 2010 Jason Gerard DeRose <[e-mail]>
+# Copyright (C) 2010, 2011 Jason Gerard DeRose <[e-mail]>
 #
 # This file is part of `dmedia`.
 #
@@ -20,19 +20,15 @@
 # with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Store meta-data in desktop-couch.
+Defines the dmedia CouchDB views.
 """
 
-from os import path
-import time
-import socket
-import platform
-
-import gnomekeyring
-from couchdb import ResourceNotFound, ResourceConflict
-
-from .abstractcouch import get_couchdb_server, get_dmedia_db
-from .schema import random_id
+import logging
+
+from couchdb import ResourceNotFound
+
+
+log = logging.getLogger()
 
 
 _sum = '_sum'
@@ -189,156 +185,74 @@
 """
 
 
+designs = (
+    ('type', (
+        ('type', type_type, _count),
+    )),
+
+    ('batch', (
+        ('time', batch_time, None),
+    )),
+
+    ('import', (
+        ('time', import_time, None),
+    )),
+
+    ('file', (
+        ('stored', file_stored, _sum),
+        ('import_id', file_import_id, None),
+        ('bytes', file_bytes, _sum),
+        ('ext', file_ext, _count),
+        ('mime', file_mime, _count),
+        ('mtime', file_mtime, None),
+    )),
+
+    ('user', (
+        ('copies', user_copies, None),
+        ('media', user_media, _count),
+        ('tags', user_tags, _count),
+        ('all', user_all, None),
+        ('video', user_video, None),
+        ('image', user_image, None),
+        ('audio', user_audio, None),
+    )),
+)
+
+
+def iter_views(views):
+    for (name, map_, reduce_) in views:
+        if reduce_ is None:
+            yield (name, {'map': map_.strip()})
+        else:
+            yield (name, {'map': map_.strip(), 'reduce': reduce_.strip()})
+
+
 def build_design_doc(design, views):
-    _id = '_design/' + design
-    d = {}
-    for (view, map_, reduce_) in views:
-        d[view] = {'map': map_.strip()}
-        if reduce_ is not None:
-            d[view]['reduce'] = reduce_.strip()
     doc = {
-        '_id': _id,
+        '_id': '_design/' + design,
         'language': 'javascript',
-        'views': d,
-    }
-    return (_id, doc)
-
-
-def create_machine():
-    # FIXME: this '_local/machine' business probably isn't a very good approach.
-    # Plus this doesn't directly conform with schema.check_dmedia()
-    return {
-        '_id': '_local/machine',
-        'machine_id': random_id(),
-        'type': 'dmedia/machine',
-        'time': time.time(),
-        'hostname': socket.gethostname(),
-        'distribution': platform.linux_distribution(),
-    }
-
-
-def docs_equal(doc, old):
-    if old is None:
-        return False
-    doc['_rev'] = old['_rev']
-    doc_att = doc.get('_attachments', {})
-    old_att = old.get('_attachments', {})
-    for key in old_att:
-        if key in doc_att:
-            doc_att[key]['revpos'] = old_att[key]['revpos']
-    return doc == old
-
-
-
-class MetaStore(object):
-    designs = (
-        ('type', (
-            ('type', type_type, _count),
-        )),
-
-        ('batch', (
-            ('time', batch_time, None),
-        )),
-
-        ('import', (
-            ('time', import_time, None),
-        )),
-
-        ('file', (
-            ('stored', file_stored, _sum),
-            ('import_id', file_import_id, None),
-            ('bytes', file_bytes, _sum),
-            ('ext', file_ext, _count),
-            ('mime', file_mime, _count),
-            ('mtime', file_mtime, None),
-        )),
-
-        ('user', (
-            ('copies', user_copies, None),
-            ('media', user_media, _count),
-            ('tags', user_tags, _count),
-            ('all', user_all, None),
-            ('video', user_video, None),
-            ('image', user_image, None),
-            ('audio', user_audio, None),
-        )),
-    )
-
-    def __init__(self, env):
-        self.env = env
-        self.server = get_couchdb_server(env)
-        self.db = get_dmedia_db(env, self.server)
-        self.create_views()
-        self._machine_id = None
-
-    def get_env(self):
-        env = dict(self.env)
-        env['machine_id'] = self.machine_id
-        return env
-
-    def get_basic_auth(self):
-        data = gnomekeyring.find_items_sync(
-            gnomekeyring.ITEM_GENERIC_SECRET,
-            {'desktopcouch': 'basic'}
-        )
-        (user, password) = data[0].secret.split(':')
-        return (user, password)
-
-    def get_port(self):
-        return self.env.get('port')
-
-    def get_uri(self):
-        return 'http://localhost:%s' % self.get_port()
-
-    def get_auth_uri(self):
-        (user, password) = self.get_basic_auth()
-        return 'http://%s:%s@localhost:%s' % (
-            user, password, self.get_port()
-        )
-
-    def create_machine(self):
-        try:
-            loc = self.db['_local/machine']
-        except ResourceNotFound:
-            loc = self.sync(create_machine())
-        doc = dict(loc)
-        doc['_id'] = doc['machine_id']
-        try:
-            self.db[doc['_id']] = doc
-        except ResourceConflict:
-            pass
-        return loc['machine_id']
-
-    @property
-    def machine_id(self):
-        if self._machine_id is None:
-            self._machine_id = self.create_machine()
-        return self._machine_id
-
-    def update(self, doc):
-        """
-        Create *doc* if it doesn't exists, update doc only if different.
-        """
-        _id = doc['_id']
-        old = self.db.get(_id, attachments=True)
-        if not docs_equal(doc, old):
-            self.db[_id] = doc
-
-    def sync(self, doc):
-        _id = doc['_id']
-        self.db[_id] = doc
-        return self.db[_id]
-
-    def create_views(self):
-        for (name, views) in self.designs:
-            (_id, doc) = build_design_doc(name, views)
-            self.update(doc)
-
-    def total_bytes(self):
-        for row in self.db.view('_design/file/_view/bytes'):
-            return row.value
-        return 0
-
-    def extensions(self):
-        for row in self.db.view('_design/file/_view/ext', group=True):
-            yield (row.key, row.value)
+        'views': dict(iter_views(views)),
+    }
+    return doc
+
+
+def update_design_doc(db, doc):
+    assert '_rev' not in doc
+    try:
+        old = db[doc['_id']]
+        doc['_rev'] = old['_rev']
+        if doc != old:
+            db.save(doc)
+            return 'changed'
+        else:
+            return 'same'
+    except ResourceNotFound:
+        db.save(doc)
+        return 'new'
+
+
+def init_views(db):
+    log.info('Initializing views in %r', db)
+    for (name, views) in designs:
+        doc = build_design_doc(name, views)
+        update_design_doc(db, doc)

=== modified file 'dmedia/workers.py'
--- dmedia/workers.py	2011-02-20 18:54:27 +0000
+++ dmedia/workers.py	2011-04-11 12:02:24 +0000
@@ -30,7 +30,7 @@
 import logging
 
 from .constants import TYPE_ERROR
-from .abstractcouch import get_couchdb_server, get_dmedia_db
+from .abstractcouch import get_server, get_db
 
 
 log = logging.getLogger()
@@ -101,7 +101,7 @@
         inst = klass(env, q, key, args)
         inst.run()
     except Exception as e:
-        log.exception('exception in procces %d, worker=%r', pid)
+        log.exception('exception in procces %d, worker=%r', pid, worker)
         q.put(dict(
             signal='error',
             args=(key, exception_name(e), str(e)),
@@ -159,8 +159,8 @@
 class CouchWorker(Worker):
     def __init__(self, env, q, key, args):
         super(CouchWorker, self).__init__(env, q, key, args)
-        self.server = get_couchdb_server(env)
-        self.db = get_dmedia_db(env, self.server)
+        self.server = get_server(env)
+        self.db = get_db(env, self.server)
 
 
 class Manager(object):
@@ -272,5 +272,5 @@
 class CouchManager(Manager):
     def __init__(self, env, callback=None):
         super(CouchManager, self).__init__(env, callback)
-        self.server = get_couchdb_server(env)
-        self.db = get_dmedia_db(env, self.server)
+        self.server = get_server(env)
+        self.db = get_db(env, self.server)

=== modified file 'setup.py'
--- setup.py	2011-03-27 14:12:36 +0000
+++ setup.py	2011-04-11 12:02:24 +0000
@@ -133,31 +133,54 @@
     license='AGPLv3+',
     cmdclass={'test': Test},
 
-    scripts=['dmedia-cli', 'dmedia-import', 'dmedia-gtk'],
-    packages=['dmedia', 'dmedia.webui', 'dmedia.gtkui'],
-    package_data={'dmedia.webui': ['data/*']},
-
+    scripts=[
+        'dmedia-cli',
+        'dmedia-import',
+        'dmedia-gtk',
+    ],
+    packages=[
+        'dmedia',
+        'dmedia.service',
+        'dmedia.webui',
+        'dmedia.gtkui',
+    ],
+    package_data={
+        'dmedia.webui': ['data/*']
+    },
     data_files=[
-        ('share/man/man1', ['data/dmedia-cli.1']),
-        ('share/applications', ['data/dmedia-import.desktop']),
-        #^ this enables Nautilus to use dmedia-import as a handler for
-        #media devices such as cameras. `sudo update-desktop-database`
-        #may need to run for this to show up in the Nautilus
-        #media handling preferences.
-        ('share/pixmaps', ['data/dmedia.svg']),
+        ('share/man/man1',
+            ['share/dmedia-cli.1']
+        ),
+        ('share/applications',
+            ['share/dmedia-import.desktop']
+        ),
+        ('share/pixmaps',
+            ['share/dmedia.svg']
+        ),
         ('share/pixmaps/dmedia',
             [
-                'data/indicator-rendermenu.svg',
-                'data/indicator-rendermenu-att.svg',
-            ]
-        ),
-        ('share/icons/hicolor/scalable/status/',
-            [
-                'data/indicator-rendermenu.svg',
-                'data/indicator-rendermenu-att.svg',
-            ]
-        ), #enables status icons to be referenced by icon name
-        ('share/dbus-1/services', ['data/org.freedesktop.DMedia.service']),
-        ('lib/dmedia', ['dmedia-service', 'dummy-client']),
+                'share/indicator-rendermenu.svg',
+                'share/indicator-rendermenu-att.svg',
+            ]
+        ),
+        ('share/icons/hicolor/scalable/status',
+            [
+                'share/indicator-rendermenu.svg',
+                'share/indicator-rendermenu-att.svg',
+            ]
+        ),
+        ('share/dbus-1/services',
+            [
+                'share/org.freedesktop.DMedia.service',
+                'share/org.freedesktop.DMediaImporter.service',
+            ]
+        ),
+        ('lib/dmedia',
+            [
+                'dmedia-service',
+                'dmedia-importer-service',
+                'dummy-client',
+            ]
+        ),
     ],
 )

=== renamed directory 'data' => 'share'
=== added file 'share/org.freedesktop.DMedia.service'
--- share/org.freedesktop.DMedia.service	1970-01-01 00:00:00 +0000
+++ share/org.freedesktop.DMedia.service	2011-04-11 12:02:24 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.DMedia
+Exec=/usr/lib/dmedia/dmedia-service

=== renamed file 'data/org.freedesktop.DMedia.service' => 'share/org.freedesktop.DMediaImporter.service'
--- data/org.freedesktop.DMedia.service	2011-02-01 06:00:48 +0000
+++ share/org.freedesktop.DMediaImporter.service	2011-04-11 12:02:24 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.DMedia
-Exec=/usr/lib/dmedia/dmedia-service
+Name=org.freedesktop.DMediaImporter
+Exec=/usr/lib/dmedia/dmedia-importer-service