Always use local markdown library

This commit is contained in:
Mark Qvist 2025-02-18 13:51:37 +01:00
parent 587773ace4
commit 1bf11aca6f
4 changed files with 15 additions and 7 deletions

View File

@ -197,7 +197,7 @@ if args.daemon:
NewConv = DaemonElement; Telemetry = DaemonElement; ObjectDetails = DaemonElement; Announces = DaemonElement;
Messages = DaemonElement; ts_format = DaemonElement; messages_screen_kv = DaemonElement; plyer = DaemonElement; multilingual_markup = DaemonElement;
ContentNavigationDrawer = DaemonElement; DrawerList = DaemonElement; IconListItem = DaemonElement; escape_markup = DaemonElement;
SoundLoader = DaemonElement; BoxLayout = DaemonElement;
SoundLoader = DaemonElement; BoxLayout = DaemonElement; mdconv = DaemonElement;
else:
apply_ui_scale()
@ -255,6 +255,8 @@ else:
import pyogg
from pydub import AudioSegment
from md2bbcode.main import process_readme as mdconv
from kivymd.utils.set_bars_colors import set_bars_colors
android_api_version = autoclass('android.os.Build$VERSION').SDK_INT
@ -271,6 +273,7 @@ else:
from .ui.messages import Messages, ts_format, messages_screen_kv
from .ui.helpers import ContentNavigationDrawer, DrawerList, IconListItem
from .ui.helpers import multilingual_markup, mdc
from .md2bbcode.main import process_readme as mdconv
import sbapp.pyogg as pyogg
from sbapp.pydub import AudioSegment
@ -1527,7 +1530,6 @@ class SidebandApp(MDApp):
def md_to_bbcode(self, text):
if not hasattr(self, "mdconv"):
from .md2bbcode.main import process_readme as mdconv
self.mdconv = mdconv
converted = self.mdconv(text)
while converted.endswith("\n"):

View File

@ -5,6 +5,7 @@
#standard library
import argparse
import sys
import RNS
# mistune
import mistune
@ -16,10 +17,14 @@ from mistune.plugins.def_list import def_list
from mistune.plugins.abbr import abbr
from mistune.plugins.spoiler import spoiler
# local
from .plugins.merge_lists import merge_ordered_lists
from .renderers.bbcode import BBCodeRenderer
from .html2bbcode import process_html
if RNS.vendor.platformutils.is_android():
from .plugins.merge_lists import merge_ordered_lists
from .renderers.bbcode import BBCodeRenderer
from .html2bbcode import process_html
else:
from sbapp.md2bbcode.plugins.merge_lists import merge_ordered_lists
from sbapp.md2bbcode.renderers.bbcode import BBCodeRenderer
from sbapp.md2bbcode.html2bbcode import process_html
def convert_markdown_to_bbcode(markdown_text, domain):
# Create a Markdown parser instance using the custom BBCode renderer

View File

@ -11,7 +11,7 @@ from mistune.plugins.abbr import abbr
from mistune.plugins.spoiler import spoiler
#local
from md2bbcode.plugins.merge_lists import merge_ordered_lists
from sbapp.md2bbcode.plugins.merge_lists import merge_ordered_lists
def convert_markdown_to_ast(input_filepath, output_filepath):
# Initialize Markdown parser with no renderer to produce an AST

View File

@ -510,6 +510,7 @@ class Messages():
except Exception as e:
RNS.log(f"Message content could not be decoded: {e}", RNS.LOG_DEBUG)
RNS.trace_exception(e)
message_input = b""
if message_input.strip() == b"":