Fix extracting revisions and uris from repositories, which fixes a problem with automatic reindexing. (#130)

Author: danfrankj

knowledge_repo/app/index.py

@@ -51,6 +51,7 @@ def update_index_required():
 
     seconds = seconds_since_index()
     seconds_check = seconds_since_index_check()
+
     if is_indexing() or (seconds is not None) and (seconds < 5 * 60) and (seconds_check < 5 * 60):
         return False
     try:

knowledge_repo/repositories/dbrepository.py

@@ -64,7 +64,7 @@ def session_end(self):
 
     @property
     def revision(self):
-        return self.session.query(func.max(self.PostRef.created_at))
+        return self.session.query(func.max(self.PostRef.created_at)).first()[0]
 
     def update(self):
         pass

knowledge_repo/repository.py

@@ -97,18 +97,22 @@ def uris(self):
         # {<mountpoint>: <KnowledgeRepositoryInstance>}
         if isinstance(self.uri, str):
             return {'': self.uri}
+
         elif isinstance(self.uri, dict):
             uri_dict = {}
 
-            def add_uris(uri_dict, uris, parent=''):
-                assert isinstance(uris, dict)
-                for mountpoint, uri in uris.items():
-                    if isinstance(uri, (str, KnowledgeRepository)):
-                        uri_dict[posixpath.join(parent, mountpoint)] = uri if isinstance(uri, str) else uri.uri
-                    elif isinstance(uri, dict):
-                        add_uris(uri_dict, uri, parent=posixpath.join(parent, mountpoint))
-                    else:
-                        raise ValueError("Unrecognised uri: {}".format(uri))
+            def add_uris(uri_dict, uri, parent=''):
+                if isinstance(uri, str):
+                    uri_dict[parent] = uri
+                elif isinstance(uri, dict):
+                    for mountpoint, u in uri.items():
+                        add_uris(uri_dict, u, parent=posixpath.join(parent, mountpoint))
+                elif isinstance(uri, KnowledgeRepository):
+                    for mountpoint, u in uri.uris.items():
+                        uri_dict[posixpath.join(parent, mountpoint)] = u
+                else:
+                    raise ValueError("Unrecognised uri: {}".format(uri))
+
             add_uris(uri_dict, self.uri)
             return uri_dict
 
@@ -125,18 +129,18 @@ def revisions(self):
         elif isinstance(self.uri, dict):
             revision_dict = {}
 
-            def add_revisions(revision_dict, uris):
-                assert isinstance(uris, dict)
-                for mountpoint, uri in uris.items():
-                    if isinstance(uri, str):
-                        revision_dict[uri] = KnowledgeRepository.for_uri(uri).revision
-                    elif isinstance(uri, KnowledgeRepository):
-                        revision_dict[uri] = uri.revision
-                    elif isinstance(uri, dict):
-                        add_revisions(revision_dict, uri)
-                    else:
-                        raise ValueError("Unrecognised uri: {}".format(uri))
-            add_revisions(revision_dict, self.uri)
+            def add_revisions(revision_dict, uri):
+                if isinstance(uri, str):
+                    revision_dict[uri] = KnowledgeRepository.for_uri(uri).revision
+                elif isinstance(uri, dict):
+                    for u in uri.values():
+                        add_revisions(revision_dict, u)
+                elif isinstance(uri, KnowledgeRepository):
+                    revision_dict.update(uri.revisions)
+                else:
+                    raise ValueError("Unrecognised uri: {}".format(uri))
+
+            add_revisions(revision_dict, self.uris)
             return revision_dict
 
         raise ValueError("Unrecognised KnowledgeRepository.uri: {}".format(self.uri))