コミット: 830553c95213cf9a9fc87c6ceb037bbad327f599 - allura (git)

allura

コミットメタ情報

• リビジョン: 830553c95213cf9a9fc87c6ceb037bbad327f599 (tree)
• 日時: 2011-04-30 05:11:32
• 作者: John Hoffmann <jwh@geek...>
• コミッター: John Hoffmann

ログメッセージ

[#1692] Merge, conflict in requirements-common.txt

Signed-off-by: John Hoffmann <[e-mail]>

変更サマリ

• modified: Allura/allura/command/base.py
• modified: Allura/allura/model/repository.py
• modified: scripts/backup_project.py
• modified: scripts/restore_project.py

差分

--- a/Allura/allura/command/base.py
+++ b/Allura/allura/command/base.py
@@ -12,6 +12,8 @@ from paste.registry import Registry
 import ming
 from allura.config.environment import load_environment
 
+log = None
+
 class EmptyClass(object): pass
 
 class Command(command.Command):

--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -140,14 +140,20 @@ class Repository(Artifact):
     def __init__(self, **kw):
         if 'name' in kw and 'tool' in kw:
             if 'fs_path' not in kw:
-                repos_root = tg.config.get('scm.repos.root', '/')
-                kw['fs_path'] = os.path.join(repos_root,
-                    kw['tool'],
-                    c.project.url()[1:])
+                kw['fs_path'] = self.default_fs_path(c.project, kw['tool'])
             if 'url_path' not in kw:
-                kw['url_path'] = c.project.url()
+                kw['url_path'] = self.default_url_path(c.project, kw['tool'])
         super(Repository, self).__init__(**kw)
 
+    @classmethod
+    def default_fs_path(cls, project, tool):
+        repos_root = tg.config.get('scm.repos.root', '/')
+        return os.path.join(repos_root, tool, project.url()[1:])
+
+    @classmethod
+    def default_url_path(cls, project, tool):
+        return project.url()
+
     def __repr__(self): # pragma no cover
         return '<%s %s>' % (
             self.__class__.__name__,

--- a/scripts/backup_project.py
+++ b/scripts/backup_project.py
@@ -47,7 +47,20 @@ def dump_project(project, dirname):
     c.project = project
     app_config_ids = [
         ac._id for ac in M.AppConfig.query.find(dict(project_id=c.project._id)) ]
+    visited_collections = {}
     for name, cls in MappedClass._registry.iteritems():
+        cname = cls.__mongometa__.name
+        sess = cls.__mongometa__.session
+        if sess is None:
+            log.info('Skipping %s which has no session', cls)
+            continue
+        dbname = sess.impl.db.name
+        fqname = cname + '/' + dbname
+        if fqname in visited_collections:
+            log.info('Skipping %s (already dumped collection %s in %s)',
+                     cls, fqname, visited_collections[fqname])
+            continue
+        visited_collections[fqname] = cls
         if 'project_id' in mapper(cls).property_index:
             # Dump the things directly related to the project
             oq = cls.query.find(dict(project_id=project._id))
@@ -59,8 +72,11 @@ def dump_project(project, dirname):
             continue
         num_objs = oq.count()
         if num_objs == 0: continue
+        if not os.path.exists(os.path.join(dirname, dbname)):
+            os.mkdir(os.path.join(dirname, dbname))
         fname = os.path.join(
             dirname,
+            dbname,
             '%s.bson' % (cls.__mongometa__.name))
         log.info('%s: dumping %s objects to %s',
                  name, num_objs, fname)

--- a/scripts/restore_project.py
+++ b/scripts/restore_project.py
@@ -3,6 +3,7 @@ import sys
 import struct
 import logging
 
+from ming.schema import Invalid
 from ming.orm import state, session, mapper, MappedClass
 from ming.orm.base import instrument, DocumentTracker
 
@@ -36,28 +37,38 @@ def restore_project(dirname, new_shortname, new_unix_group_name):
     project.set_tool_data('sfx', unix_group_name=new_unix_group_name)
     project.deleted = False
     c.project = project
-    for name, cls in MappedClass._registry.iteritems():
-        if session(cls) is None: continue
-        m = mapper(cls)
-        sess = session(cls).impl
-        fname = os.path.join(dirname, '%s.bson' % (cls.__mongometa__.name))
-        if not os.path.exists(fname): continue
-        if ('project_id' not in m.property_index
-            and 'app_config_id' not in m.property_index): continue
-        with open(fname, 'rb') as fp:
-            num_objects = 0
-            while True:
-                doc = _read_bson(fp)
-                if doc is None: break
-                num_objects += 1
-                sess.insert(m.doc_cls(doc))
-        log.info('%s: loaded %s objects from %s',
-                 name, num_objects, fname)
+    conn = M.main_doc_session.db.connection
+    repo_collections = get_repo_collections()
+    for dbname in os.listdir(dirname):
+        if dbname.endswith('.bson'): continue
+        for fname in os.listdir(os.path.join(dirname, dbname)):
+            cname = os.path.splitext(fname)[0]
+            collection = conn[dbname][cname]
+            with open(os.path.join(dirname, dbname, fname), 'rb') as fp:
+                num_objects = 0
+                while True:
+                    doc = _read_bson(fp)
+                    if doc is None: break
+                    if cname in repo_collections:
+                        cls = repo_collections[cname]
+                        doc['fs_path'] = cls.default_fs_path(project, doc['tool'])
+                        doc['url_path'] = cls.default_url_path(project, doc['tool'])
+                    collection.insert(doc)
+                    num_objects += 1
+                log.info('%s: loaded %s objects from %s',
+                         dbname, num_objects, fname)
     session(project).flush()
     reindex= ReindexCommand('reindex')
     reindex.run(['--project', new_shortname])
     return 0
 
+def get_repo_collections():
+    res = {}
+    for name, cls in MappedClass._registry.iteritems():
+        cname = cls.__mongometa__.name
+        if issubclass(cls, M.Repository): res[cname] = cls
+    return res
+
 def _read_bson(fp):
     slen = fp.read(4)
     if not slen: return None