From 723feddac5ef9049b4ed281e7325fa7008d7403e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilhem=20Faur=C3=A9?= Date: Tue, 25 Apr 2023 09:33:02 +0200 Subject: [PATCH] database params in CONFIG + clean --- spip2md/SpipDatabase.py | 7 ++++--- spip2md/config.py | 8 +++++++- spip2md/content.py | 38 -------------------------------------- spip2md/spip2md.py | 1 - 4 files changed, 11 insertions(+), 43 deletions(-) diff --git a/spip2md/SpipDatabase.py b/spip2md/SpipDatabase.py index d9bc631..85601d9 100644 --- a/spip2md/SpipDatabase.py +++ b/spip2md/SpipDatabase.py @@ -1,13 +1,14 @@ +from config import CONFIG from peewee import * db = MySQLDatabase( - "spip", + CONFIG["db"], **{ "charset": "utf8", "sql_mode": "PIPES_AS_CONCAT", "use_unicode": True, - "user": "spip", - "password": "password", + "user": CONFIG["dbUser"], + "password": CONFIG["dbPass"], } ) diff --git a/spip2md/config.py b/spip2md/config.py index 74427a4..f108aaf 100644 --- a/spip2md/config.py +++ b/spip2md/config.py @@ -1 +1,7 @@ -CONFIG = {"outputDir": "output", "maxExportNb": 1000} +CONFIG = { + "db": "spip", + "dbUser": "spip", + "dbPass": "password", + "outputDir": "output", + "maxExportNb": 1000, +} diff --git a/spip2md/content.py b/spip2md/content.py index 5d1c79b..71b1fe8 100644 --- a/spip2md/content.py +++ b/spip2md/content.py @@ -1,47 +1,9 @@ import re - -def italic(text): - # convert SPIP italic to markdown italic - # return re.sub(r"([^\{]*)([^\{\}]*)([^\{]*)", r"\1\*\2\*\3", text) - pass - - -def bold(text): - # convert SPIP bold to markdown bold - pass - - -def headings(text): - # convert SPIP headings to markdown headings - pass - - -def code_blocks(text): - # convert SPIP code blocks to markdown code blocks - pass - - -def links(text): - # convert SPIP links to markdown links - pass - - -def paragraphs(text): - # convert SPIP paragraphs to markdown paragraphs - pass - - class content: def __init__(self, content): self.spip = content def get_markdown(self): markdown = self.spip - markdown = paragraphs(markdown) - markdown = italic(markdown) - markdown = bold(markdown) - markdown = headings(markdown) - markdown = links(markdown) - markdown = code_blocks(markdown) return markdown diff --git a/spip2md/spip2md.py b/spip2md/spip2md.py index 5fca85f..ae80eb6 100755 --- a/spip2md/spip2md.py +++ b/spip2md/spip2md.py @@ -4,7 +4,6 @@ import shutil import sys # from datetime import date, datetime, time -# Modules from config import CONFIG from content import content from metadata import metadata