зеркало из
https://github.com/viginum-datalab/twscrape.git
synced 2025-10-30 13:36:12 +02:00
fix: double escaped json in cli for non raw results
Этот коммит содержится в:
родитель
815189e277
Коммит
020754446e
@ -7,9 +7,12 @@ import json
|
|||||||
import sqlite3
|
import sqlite3
|
||||||
from importlib.metadata import version
|
from importlib.metadata import version
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
|
||||||
from .api import API, AccountsPool
|
from .api import API, AccountsPool
|
||||||
from .db import get_sqlite_version
|
from .db import get_sqlite_version
|
||||||
from .logger import logger, set_log_level
|
from .logger import logger, set_log_level
|
||||||
|
from .models import Tweet, User
|
||||||
from .utils import print_table
|
from .utils import print_table
|
||||||
|
|
||||||
|
|
||||||
@ -28,10 +31,9 @@ def get_fn_arg(args):
|
|||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
|
|
||||||
def to_str(doc):
|
def to_str(doc: httpx.Response | Tweet | User) -> str:
|
||||||
# doc is httpx.Response or twscrape.User / twscrape.Tweet
|
tmp = doc.json()
|
||||||
# both have .json method but with different return type
|
return tmp if isinstance(tmp, str) else json.dumps(tmp, default=str)
|
||||||
return doc if isinstance(doc, str) else json.dumps(doc.json(), default=str)
|
|
||||||
|
|
||||||
|
|
||||||
async def main(args):
|
async def main(args):
|
||||||
|
|||||||
Загрузка…
x
Ссылка в новой задаче
Block a user