Merge pull request #1 from sentenzo/dev

`dev` => `master`
sentenzo · Sep 21, 2022 · 6e2e8d5 · 6e2e8d5
2 parents 6cf2f20 + c02ac8b
commit 6e2e8d5
Show file tree

Hide file tree

Showing 27 changed files with 515 additions and 330 deletions.
diff --git a/Makefile b/Makefile
@@ -7,4 +7,7 @@ run:
 	poetry run python -m narrator
 
 test:
+	poetry run python -m pytest -m "not slow" --verbosity=2 --showlocals --log-level=DEBUG
+
+test-all:
 	poetry run python -m pytest --verbosity=2 --showlocals --log-level=DEBUG
diff --git a/config.yml b/config.yml
@@ -9,3 +9,19 @@ utils:
     path: c:\bin\balcon.exe
   ffmpeg:
     path: c:\bin\ffmpeg.exe
+  blb2txt:
+    path: c:\bin\blb2txt.exe
+
+to_txt:
+  max_input_size: 5242880 # 5 * 2 ^ 20 == 5 MiB 
+
+url_parser:
+  sites:
+    habr:
+      url_re: https\://habr\.com/..(/company/[-\w]+/blog|/post)/\d+
+      lang: ru
+      re:
+        title: main h1[data-test-id="articleTitle"] span
+        author: main a.tm-user-info__username
+        publication_date: main div.tm-article-snippet__meta time
+        text: "#post-content-body"
diff --git a/narrator/__main__.py b/narrator/__main__.py
@@ -1,6 +1,6 @@
 import asyncio
 
-from narrator.bot import dispatcher, narrator_bot
+from narrator.telegram.bot import dispatcher, narrator_bot
 
 
 async def main():

diff --git a/narrator/article.py b/narrator/article.py
diff --git a/narrator/bot.py b/narrator/bot.py
diff --git a/narrator/exceptions.py b/narrator/exceptions.py
@@ -0,0 +1,20 @@
+class NarratorException(Exception):
+    """
+    Base class for any Narrator exception
+    """
+
+
+class UrlParserException(NarratorException):
+    pass
+
+
+class UrlInvalid(UrlParserException):
+    pass
+
+
+class UrlUnreachable(UrlParserException):
+    pass
+
+
+class TxtTransformerException(NarratorException):
+    pass
diff --git a/narrator/reader/__init__.py b/narrator/reader/__init__.py
diff --git a/narrator/reader/base_reader.py b/narrator/reader/base_reader.py
diff --git a/narrator/reader/file/__init__.py b/narrator/reader/file/__init__.py
diff --git a/narrator/reader/file/base_file_reader.py b/narrator/reader/file/base_file_reader.py
diff --git a/narrator/reader/file/txt_reader.py b/narrator/reader/file/txt_reader.py
diff --git a/narrator/reader/url/__init__.py b/narrator/reader/url/__init__.py
diff --git a/narrator/reader/url/base_url_reader.py b/narrator/reader/url/base_url_reader.py
diff --git a/narrator/reader/url/habr_reader.py b/narrator/reader/url/habr_reader.py
diff --git a/narrator/speaker/__init__.py b/narrator/speaker/__init__.py
diff --git a/narrator/speaker/speaker.py b/narrator/speaker/speaker.py