فهرست منبع

Move internet_archive settings to a specific section

jherve 1 سال پیش
والد
کامیت
e1f4821197
3فایلهای تغییر یافته به همراه10 افزوده شده و 8 حذف شده
  1. 4 2
      settings.toml
  2. 5 2
      src/de_quoi_parle_le_monde/internet_archive.py
  3. 1 4
      src/de_quoi_parle_le_monde/snapshots.py

+ 4 - 2
settings.toml

@@ -1,3 +1,5 @@
 database_url="sqlite:///test.db"
-internet_archive_limiter_max_rate=1.0
-internet_archive_limiter_time_period=1.0
+
+[internet_archive]
+limiter_max_rate=1.0
+limiter_time_period=1.0

+ 5 - 2
src/de_quoi_parle_le_monde/internet_archive.py

@@ -5,6 +5,8 @@ import cattrs
 from aiohttp.client import ClientSession, TCPConnector
 from aiolimiter import AsyncLimiter
 
+from config import settings
+
 
 Timestamp = NewType("Timestamp", datetime)
 datetime_format = "%Y%m%d%H%M%S"
@@ -161,9 +163,10 @@ class InternetArchiveClient:
             return await resp.text()
 
     @staticmethod
-    def create(limiter_max_rate, limiter_time_period):
+    def create():
         conn = RateLimitedConnector(
-            limiter_max_rate=limiter_max_rate, limiter_time_period=limiter_time_period
+            limiter_max_rate=settings.internet_archive.limiter_max_rate,
+            limiter_time_period=settings.internet_archive.limiter_time_period,
         )
         session = ClientSession(connector=conn)
         return InternetArchiveClient(session)

+ 1 - 4
src/de_quoi_parle_le_monde/snapshots.py

@@ -137,10 +137,7 @@ async def main():
     logger.info("Starting snapshot service..")
     jobs = SnapshotJob.create(10, [8, 12, 18, 22])
 
-    async with InternetArchiveClient.create(
-        settings.internet_archive_limiter_max_rate,
-        settings.internet_archive_limiter_time_period,
-    ) as ia:
+    async with InternetArchiveClient.create() as ia:
         worker = SnapshotWorker(storage, ia)
         await asyncio.gather(*[worker.run(job) for job in jobs])
     logger.info("Snapshot service exiting")