fixed-storages

services/zine/shoutauthor.py

@@ -1,46 +1,49 @@
 import asyncio
+import time
 from base.orm import local_session
-from orm.shout import ShoutAuthor, Shout
+from orm.shout import ShoutAuthor
 
 
 class ShoutAuthorStorage:
     authors_by_shout = {}
     lock = asyncio.Lock()
-    period = 30 * 60  # sec
+    # period = 30 * 60  # sec
 
     @staticmethod
     async def load_captions(session):
         self = ShoutAuthorStorage
-        sas = session.query(ShoutAuthor).join(Shout).all()
+        sas = session.query(ShoutAuthor).all()
         for sa in sas:
-            self.authors_by_shout[sa.shout] = self.authors_by_shout.get(sa.shout, [])
-            self.authors_by_shout[sa.shout].append([sa.user, sa.caption])
+            self.authors_by_shout[sa.shout] = self.authors_by_shout.get(sa.shout, {})
+            self.authors_by_shout[sa.shout][sa.user] = sa.caption
         print("[zine.authors] %d shouts indexed by authors" % len(self.authors_by_shout))
 
-    @staticmethod
-    async def get_authors(shout):
-        self = ShoutAuthorStorage
-        async with self.lock:
-            return self.authors_by_shout.get(shout, [])
-
     @staticmethod
     async def get_author_caption(shout, author):
         self = ShoutAuthorStorage
         async with self.lock:
-            for a in self.authors_by_shout.get(shout, []):
-                if author in a:
-                    return a[1]
-        return {"error": "author caption not found"}
+            return self.authors_by_shout.get(shout, {}).get(author)
+
+    @staticmethod
+    async def set_author_caption(shout, author, caption):
+        self = ShoutAuthorStorage
+        async with self.lock:
+            self.authors_by_shout[shout] = self.authors_by_shout.get(shout, {})
+            self.authors_by_shout[shout][author] = caption
+            return {
+                "error": None,
+            }
 
     @staticmethod
     async def worker():
         self = ShoutAuthorStorage
-        while True:
+        async with self.lock:
+            # while True:
             try:
                 with local_session() as session:
-                    async with self.lock:
-                        await self.load_captions(session)
-                        print("[zine.authors] index by authors was updated")
+                    ts = time.time()
+                    await self.load_captions(session)
+                    print("[zine.authors] load_captions took %fs " % (time.time() - ts))
             except Exception as err:
                 print("[zine.authors] error indexing by author: %s" % (err))
-            await asyncio.sleep(self.period)
+            # await asyncio.sleep(self.period)