GameSentenceMiner 2.5.1__py3-none-any.whl → 2.5.3__py3-none-any.whl

GameSentenceMiner/anki.py

@@ -15,7 +15,7 @@ from GameSentenceMiner.gametext import get_text_event
 from GameSentenceMiner.model import AnkiCard
 from GameSentenceMiner.utility_gui import utility_window, get_utility_window
 from GameSentenceMiner.obs import get_current_game
-from GameSentenceMiner.util import remove_html_and_cloze_tags
+from GameSentenceMiner.util import remove_html_and_cloze_tags, combine_dialogue
 
 audio_in_anki = None
 screenshot_in_anki = None
@@ -122,15 +122,32 @@ def get_initial_card_info(last_note: AnkiCard, selected_lines):
     game_line = get_text_event(last_note)
 
     if selected_lines and get_config().anki.multi_overwrites_sentence:
-        sentences = "".join([line.text for line in selected_lines])
+        sentences = []
+        sentences_text = ''
         try:
             sentence_in_anki = last_note.get_field(get_config().anki.sentence_field)
-            logger.info(f"Attempting Preserve HTML for multi-line: {remove_html_and_cloze_tags(sentence_in_anki)}, {sentences}, {remove_html_and_cloze_tags(sentence_in_anki) in sentences}")
-            sentences = sentences.replace(remove_html_and_cloze_tags(sentence_in_anki), sentence_in_anki)
+            logger.info(f"Attempting Preserve HTML for multi-line")
+            for line in selected_lines:
+                if remove_html_and_cloze_tags(sentence_in_anki) in line.text:
+                    sentences.append(sentence_in_anki)
+                    logger.info("Found matching line in Anki, Preserving HTML!")
+                else:
+                    sentences.append(line.text)
+
+            logger.info(f"Attempting to Fix Character Dialogue Format")
+            logger.info([f"'{line.text}'" for line in selected_lines])
+            try:
+                combined_lines = combine_dialogue(sentences)
+
+                if combined_lines:
+                    sentences = "".join(combined_lines)
+            except Exception as e:
+                logger.debug(f'Error combining dialogue: {e}, defaulting')
+                pass
         except Exception as e:
             logger.debug(f"Error preserving HTML for multi-line: {e}")
             pass
-        note['fields'][get_config().anki.sentence_field] = sentences
+        note['fields'][get_config().anki.sentence_field] = sentences_text if sentences_text else "<br>".join(sentences)
 
     if get_config().anki.previous_sentence_field and game_line.prev and not \
             last_note.get_field(get_config().anki.previous_sentence_field):
@@ -174,8 +191,14 @@ def get_last_anki_card() -> AnkiCard | dict:
     added_ids = invoke('findNotes', query='added:1')
     if not added_ids:
         return {}
-    last_note = AnkiCard.from_dict(invoke('notesInfo', notes=[added_ids[-1]])[0])
-    return last_note
+
+    card_dict = invoke('notesInfo', notes=[added_ids[-1]])[0]
+    try:
+        return AnkiCard.from_dict(card_dict)
+    except Exception as e:
+        logger.error(f"Error fetching last card: {e}")
+        logger.info(card_dict)
+        raise e
 
 
 def add_wildcards(expression):

GameSentenceMiner/model.py

@@ -88,11 +88,8 @@ class SceneItemsResponse:
 @dataclass
 class AnkiCard:
     noteId: int
-    profile: str
     tags: list[str]
     fields: dict[str, dict[str, str]]
-    modelName: str
-    mod: int
     cards: list[int]
     alternatives = {
         "word_field": ["Front", "Word", "TargetWord", "Expression"],

GameSentenceMiner/util.py

@@ -146,3 +146,35 @@ def is_windows():
 def remove_html_and_cloze_tags(text):
     text = re.sub(r'<.*?>', '', re.sub(r'{{c\d+::(.*?)(::.*?)?}}', r'\1', text))
     return text
+
+
+def combine_dialogue(dialogue_lines, new_lines=None):
+    if not dialogue_lines:  # Handle empty input
+        return []
+
+    if new_lines is None:
+        new_lines = []
+
+    if '「' not in dialogue_lines[0]:
+        new_lines.append(dialogue_lines[0] + "<br>")
+        return new_lines
+
+    character_name = dialogue_lines[0].split("「")[0]
+    text = character_name + "「"
+    next_character = ''
+
+    for i, line in enumerate(dialogue_lines):
+        if not line.startswith(character_name + "「"):
+            text = text + "」<br>"
+            next_character = line.split("「")[0]
+            new_lines.append(text)
+            new_lines.extend(combine_dialogue(dialogue_lines[i:]))
+            break
+        else:
+            text +=  ("<br>" if i > 0 else "") + line.split("「")[1].rstrip("」") + ""
+    else:
+        text = text + "」"
+        new_lines.append(text)
+
+    return new_lines
+

GameSentenceMiner/utility_gui.py

@@ -150,6 +150,7 @@ class UtilityApp:
         #     for checkbox in self.checkboxes:
         #         checkbox.set(False)
 
+
 def init_utility_window(root):
     global utility_window
     utility_window = UtilityApp(root)

{gamesentenceminer-2.5.1.dist-info → gamesentenceminer-2.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.5.1
+Version: 2.5.3
 Summary: A tool for mining sentences from games. Update: Multi-Line Mining! Fixed!
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.5.1.dist-info → gamesentenceminer-2.5.3.dist-info}/RECORD

@@ -1,17 +1,17 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/anki.py,sha256=_jr6q3tOSP-7YGaY9cVz5v3508T_V2JINJjDYbp1YS0,11495
+GameSentenceMiner/anki.py,sha256=1VoWT1f5u98eYbXK7U4l8wpg_uL1nBPviNg4Q1YTCBg,12231
 GameSentenceMiner/config_gui.py,sha256=PzzLX-OwK71U5JSFaxup0ec0oWBWaF6AeCXs0m13HK0,56762
 GameSentenceMiner/configuration.py,sha256=kyvNCkZSZcqXbGjak8lb_GyhhjN8tIfb7eEfusz_M8A,16038
 GameSentenceMiner/electron_messaging.py,sha256=fBk9Ipo0jg2OZwYaKe1Qsm05P2ftrdTRGgFYob7ZA-k,139
 GameSentenceMiner/ffmpeg.py,sha256=2dwKbKxw_9sUXud67pPAx_6dGd1j-D99CdqLFVtbhSk,11479
 GameSentenceMiner/gametext.py,sha256=LORVdE2WEo1CDI8gonc7qxrhbS4KFKXFQVKjhlkpLbc,7368
 GameSentenceMiner/gsm.py,sha256=cWHJwWHyKsdzo0TXTXREG549MUtlQLyect9S37UK56g,20309
-GameSentenceMiner/model.py,sha256=WYLjIS9IEPxaLPwG5c-edfcfBKYzBFpdR3V3Da8MuLg,5277
+GameSentenceMiner/model.py,sha256=bZm-2vkIw4gQCGLB02eDoTtO1Ymb_dnHk0VDJDFO3y8,5228
 GameSentenceMiner/notification.py,sha256=WeFodBsshhbOagcEfjAJ3kxjUGvBuUAQKEJ8Zf0YO04,2267
 GameSentenceMiner/obs.py,sha256=8ImXAVUWa4JdzwcBOEFShlZRZzh1dCvdpD1aEGhQfbU,6566
 GameSentenceMiner/package.py,sha256=YlS6QRMuVlm6mdXx0rlXv9_3erTGS21jaP3PNNWfAH0,1250
-GameSentenceMiner/util.py,sha256=nmp2cmuBN0Azoc91f3zN_dZSh4nK9z21VTfpIbn8Tk4,4761
-GameSentenceMiner/utility_gui.py,sha256=VYuY8Br47AFak_zOVx9R1oUCBvoRjonDyE0oE6FVwJ0,5742
+GameSentenceMiner/util.py,sha256=uDM1E-kNTJODm-eDELHP66uOVUUIivXzXBxr-NmeAPw,5670
+GameSentenceMiner/utility_gui.py,sha256=Ox63XZnj08MezcEG8X5EYJlbHmw-bZitN3CsWgP8lLo,5743
 GameSentenceMiner/downloader/Untitled_json.py,sha256=RUUl2bbbCpUDUUS0fP0tdvf5FngZ7ILdA_J5TFYAXUQ,15272
 GameSentenceMiner/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/downloader/download_tools.py,sha256=mI1u_FGBmBqDIpCH3jOv8DOoZ3obgP5pIf9o9SVfX2Q,8131
@@ -19,9 +19,9 @@ GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 GameSentenceMiner/vad/silero_trim.py,sha256=-thDIZLuTLra3YBj7WR16Z6JeDgSpge2YuahprBvD8I,1585
 GameSentenceMiner/vad/vosk_helper.py,sha256=BI_mg_qyrjNbuEJjXSUDoV0FWEtQtEOAPmrrNixnZ_8,5974
 GameSentenceMiner/vad/whisper_helper.py,sha256=OF4J8TPPoKPJR1uFwrWAZ2Q7v0HJkVvNGmF8l1tACX0,3447
-gamesentenceminer-2.5.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.5.1.dist-info/METADATA,sha256=OjwqqaJ_DG7FR6OLc3z1XlUX6WH6SqsOc4EDXUjbzbQ,5409
-gamesentenceminer-2.5.1.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
-gamesentenceminer-2.5.1.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.5.1.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.5.1.dist-info/RECORD,,
+gamesentenceminer-2.5.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.5.3.dist-info/METADATA,sha256=2FyxGIwSYPDNPlftNrNUJ5T16irg35zuZFhqn3bdIq4,5409
+gamesentenceminer-2.5.3.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
+gamesentenceminer-2.5.3.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.5.3.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.5.3.dist-info/RECORD,,