From 88bd9959e469d79c13f0274a9d026298a0c9a2fa Mon Sep 17 00:00:00 2001 From: sashacmc Date: Wed, 1 May 2024 17:34:34 +0200 Subject: [PATCH] Update imports for new folder structure --- src/mmdiary/__init__.py | 0 src/mmdiary/notion/__init__.py | 0 src/mmdiary/notion/cleanup.py | 3 ++- src/mmdiary/notion/uploader.py | 9 ++++---- src/mmdiary/telegrambot/__init__.py | 0 .../telegrambot/telegrambot_service.py | 4 ++-- src/mmdiary/transcriber/__init__.py | 0 src/mmdiary/transcriber/transcriber.py | 22 ++++++++----------- src/mmdiary/transcriber/verifier.py | 7 +++--- src/mmdiary/utils/__init__.py | 0 src/mmdiary/utils/datelib.py | 5 ++--- src/mmdiary/utils/medialib.py | 2 +- src/mmdiary/video/__init__.py | 0 src/mmdiary/video/processor.py | 16 ++++++-------- src/mmdiary/video/uploader.py | 6 ++--- 15 files changed, 35 insertions(+), 39 deletions(-) create mode 100644 src/mmdiary/__init__.py create mode 100644 src/mmdiary/notion/__init__.py create mode 100644 src/mmdiary/telegrambot/__init__.py create mode 100644 src/mmdiary/transcriber/__init__.py create mode 100644 src/mmdiary/utils/__init__.py create mode 100644 src/mmdiary/video/__init__.py diff --git a/src/mmdiary/__init__.py b/src/mmdiary/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/mmdiary/notion/__init__.py b/src/mmdiary/notion/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/mmdiary/notion/cleanup.py b/src/mmdiary/notion/cleanup.py index 4a75c36..f8ffbb6 100755 --- a/src/mmdiary/notion/cleanup.py +++ b/src/mmdiary/notion/cleanup.py @@ -3,10 +3,11 @@ import logging import os -import log from notion.client import NotionClient from notion.collection import CollectionRowBlock +from mmdiary.utils import log + def get_trash(client): query = { diff --git a/src/mmdiary/notion/uploader.py b/src/mmdiary/notion/uploader.py index b2caece..1e5a21a 100755 --- a/src/mmdiary/notion/uploader.py +++ b/src/mmdiary/notion/uploader.py @@ -4,16 +4,17 @@ import argparse import logging import os - -import cachedb -import log -import medialib import progressbar + from notion.block import AudioBlock, CalloutBlock, TextBlock from notion.client import NotionClient from notion.collection import CollectionRowBlock from notion_client import Client +from mmdiary.utils import log, medialib +from mmdiary.notion import cachedb + + MAX_TEXT_SIZE = 2000 diff --git a/src/mmdiary/telegrambot/__init__.py b/src/mmdiary/telegrambot/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/mmdiary/telegrambot/telegrambot_service.py b/src/mmdiary/telegrambot/telegrambot_service.py index 109b871..0768afd 100755 --- a/src/mmdiary/telegrambot/telegrambot_service.py +++ b/src/mmdiary/telegrambot/telegrambot_service.py @@ -6,8 +6,6 @@ from collections import defaultdict from datetime import datetime -import log -import medialib from telegram import InlineKeyboardButton, InlineKeyboardMarkup, Update from telegram.ext import ( Application, @@ -19,6 +17,8 @@ filters, ) +from mmdiary.utils import log, medialib + g_audiofiles = medialib.MediaLib().get_processed() MAX_MESSAGE_SIZE = 1024 diff --git a/src/mmdiary/transcriber/__init__.py b/src/mmdiary/transcriber/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/mmdiary/transcriber/transcriber.py b/src/mmdiary/transcriber/transcriber.py index c15926c..6ae26f8 100755 --- a/src/mmdiary/transcriber/transcriber.py +++ b/src/mmdiary/transcriber/transcriber.py @@ -5,13 +5,15 @@ import os from datetime import datetime -import log -import medialib import progressbar import whisper -from medialib import TIME_OUT_FORMAT from photo_importer import fileprop -from verifier import check_text + +from mmdiary.utils import log +from mmdiary.utils import medialib +from mmdiary.utils.medialib import TIME_OUT_FORMAT + +from mmdiary.transcriber.verifier import check_text class Transcriber: @@ -36,9 +38,7 @@ def extract_caption(self, text): def to_text(self, res): if "segments" in res: - return "\n".join( - [s.get("text", "").strip() for s in res["segments"]] - ) + return "\n".join([s.get("text", "").strip() for s in res["segments"]]) return "" def duration(self, res): @@ -71,9 +71,7 @@ def process(self, file): "type": tp, "source": os.path.split(file.name())[1], "duration": self.duration(res), - "recordtime": prop.time().strftime(TIME_OUT_FORMAT) - if prop.time() is not None - else "", + "recordtime": prop.time().strftime(TIME_OUT_FORMAT) if prop.time() is not None else "", "processtime": datetime.now().strftime(TIME_OUT_FORMAT), } @@ -86,9 +84,7 @@ def __args_parse(): parser = argparse.ArgumentParser() parser.add_argument('inpath', help='Input path') parser.add_argument('-l', '--logfile', help='Log file', default=None) - parser.add_argument( - '-u', '--update', help='Update existing', action='store_true' - ) + parser.add_argument('-u', '--update', help='Update existing', action='store_true') return parser.parse_args() diff --git a/src/mmdiary/transcriber/verifier.py b/src/mmdiary/transcriber/verifier.py index a980055..67912d3 100755 --- a/src/mmdiary/transcriber/verifier.py +++ b/src/mmdiary/transcriber/verifier.py @@ -6,11 +6,12 @@ import os from datetime import datetime -import cachedb -import log -from medialib import JSON_EXT, TIME_OUT_FORMAT from notion.client import NotionClient +from mmdiary.utils import log +from mmdiary.notion import cachedb +from mmdiary.utils.medialib import JSON_EXT, TIME_OUT_FORMAT + CACHE_DB_FILE = "~/.notion_upload.sqlite3" HALLUCINATION_TEXTS = [ diff --git a/src/mmdiary/utils/__init__.py b/src/mmdiary/utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/mmdiary/utils/datelib.py b/src/mmdiary/utils/datelib.py index 6b5a218..ba41e1e 100755 --- a/src/mmdiary/utils/datelib.py +++ b/src/mmdiary/utils/datelib.py @@ -5,9 +5,8 @@ import os import sqlite3 -import log -import medialib -from medialib import get_date_from_timestring +from mmdiary.utils import log, medialib +from mmdiary.utils.medialib import get_date_from_timestring PROCESSED_NONE = 0 PROCESSED_IN_PROCESS = 1 diff --git a/src/mmdiary/utils/medialib.py b/src/mmdiary/utils/medialib.py index 9ecb1a8..2b55bd0 100755 --- a/src/mmdiary/utils/medialib.py +++ b/src/mmdiary/utils/medialib.py @@ -64,7 +64,7 @@ def __str__(self): class MediaLib: def __init__(self, root=None): if root is None: - root = os.getenv("AUDIO_NOTES_ROOT") + root = os.getenv("AUDIO_NOTES_ROOT") # TODO: made proper init self.__root = root self.__supported_exts = [] diff --git a/src/mmdiary/video/__init__.py b/src/mmdiary/video/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/mmdiary/video/processor.py b/src/mmdiary/video/processor.py index 6faecfd..5dbfe99 100755 --- a/src/mmdiary/video/processor.py +++ b/src/mmdiary/video/processor.py @@ -7,11 +7,11 @@ import random from datetime import datetime -import datelib -import log import mixvideoconcat import progressbar -from medialib import TIME_OUT_FORMAT + +from mmdiary.utils import log, datelib +from mmdiary.utils.medialib import TIME_OUT_FORMAT class VideoProcessor: @@ -24,6 +24,8 @@ def __init__(self, update_existing): self.__lib = datelib.DateLib() + logging.debug("Update existing (not used): %s", self.__update_existing) + def __save_json(self, videos_info, processduration, filename): data = { "videos": videos_info, @@ -43,9 +45,7 @@ def __process_date(self, date): resfilename = os.path.join(self.__res_dir, f"{date}.mp4") resfilename_json = os.path.join(self.__res_dir, f"{date}.json") - fileinfos = mixvideoconcat.concat( - fnames, resfilename, self.__work_dir, dry_run=False - ) + fileinfos = mixvideoconcat.concat(fnames, resfilename, self.__work_dir, dry_run=False) videos_info = [] for af, info in zip(afiles, fileinfos): @@ -104,9 +104,7 @@ def __args_parse(): parser = argparse.ArgumentParser() parser.add_argument("dates", nargs="*", help="Date to process") parser.add_argument('-l', '--logfile', help='Log file', default=None) - parser.add_argument( - '-u', '--update', help='Update existing', action='store_true' - ) + parser.add_argument('-u', '--update', help='Update existing', action='store_true') return parser.parse_args() diff --git a/src/mmdiary/video/uploader.py b/src/mmdiary/video/uploader.py index a712160..d1c9a0c 100755 --- a/src/mmdiary/video/uploader.py +++ b/src/mmdiary/video/uploader.py @@ -6,11 +6,11 @@ import os from datetime import datetime -import datelib import googleapiclient.discovery -import log import progressbar -from medialib import TIME_OUT_FORMAT, split_large_text + +from mmdiary.utils import log, datelib +from mmdiary.utils.medialib import TIME_OUT_FORMAT, split_large_text YOUTUBE_MAX_DESCRIPTION = 5000 YOUTUBE_MAX_COMMENT = 5000