Update imports for new folder structure

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 = {

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
 
 

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
 

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()
 
 

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 = [

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

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 = []

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()
 
 

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