chgksuite 0.27.0b5__tar.gz → 0.27.2__tar.gz

chgksuite-0.27.2/.claude/settings.local.json

@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(uv run pytest:*)",
+      "Bash(ls:*)",
+      "Bash(python3:*)",
+      "Bash(mv:*)"
+    ]
+  }
+}

chgksuite-0.27.2/.github/workflows/build.yml

@@ -0,0 +1,283 @@
+name: Build Standalone Executables
+
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to build and release (e.g., v0.26.1). Leave empty for build-only.'
+        required: false
+        default: ''
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-24.04
+            platform: linux-x64
+            rust_target: x86_64-unknown-linux-gnu
+          - os: ubuntu-24.04-arm
+            platform: linux-arm64
+            rust_target: aarch64-unknown-linux-gnu
+          - os: macos-15-intel
+            platform: macos-x64
+            rust_target: x86_64-apple-darwin
+          - os: macos-latest
+            platform: macos-arm64
+            rust_target: aarch64-apple-darwin
+          - os: windows-latest
+            platform: windows-x64
+            rust_target: x86_64-pc-windows-msvc
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout chgksuite
+        uses: actions/checkout@v4
+
+      - name: Checkout pyapp
+        uses: actions/checkout@v4
+        with:
+          repository: ofek/pyapp
+          path: pyapp
+          ref: v0.29.0
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.rust_target }}
+
+      - name: Create build directory
+        shell: bash
+        run: mkdir -p artifacts
+
+      # Determine versions and create requirements files
+      - name: Setup build configuration
+        id: config
+        shell: bash
+        run: |
+          TAG="${{ inputs.tag || github.ref_name }}"
+
+          # Check if this is a release build (tag) or dev build (branch)
+          IS_RELEASE="false"
+          if [[ "${{ github.ref }}" == refs/tags/* ]] || [[ -n "${{ inputs.tag }}" ]]; then
+            IS_RELEASE="true"
+          fi
+
+          # Extract version from tag (remove 'v' prefix if present)
+          if [[ "$TAG" =~ ^v ]]; then
+            VERSION="${TAG:1}"
+          else
+            VERSION="$TAG"
+          fi
+
+          # Fallback to reading from version.py if no tag
+          if [ -z "$VERSION" ] || [[ ! "$VERSION" =~ ^[0-9] ]]; then
+            VERSION=$(grep -oP '__version__\s*=\s*"\K[^"]+' chgksuite/version.py 2>/dev/null || \
+                      grep -o '__version__\s*=\s*"[^"]*"' chgksuite/version.py | cut -d'"' -f2 || \
+                      echo "0.0.0")
+          fi
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "is_release=$IS_RELEASE" >> $GITHUB_OUTPUT
+
+          # For non-release builds, always use --pre to get latest beta versions
+          if [ "$IS_RELEASE" = "false" ]; then
+            PIP_PRE="--pre"
+          elif [[ "$VERSION" =~ (a|b|rc)[0-9]+ ]]; then
+            PIP_PRE="--pre"
+          else
+            PIP_PRE=""
+          fi
+          echo "pip_pre=$PIP_PRE" >> $GITHUB_OUTPUT
+
+          echo "Build configuration:"
+          echo "  Version: $VERSION"
+          echo "  Is release: $IS_RELEASE"
+          echo "  Pip pre flag: $PIP_PRE"
+
+      # Create requirements files in pyapp directory to avoid Windows path issues
+      - name: Create requirements files
+        shell: bash
+        run: |
+          # Qt requirements
+          echo "chgksuite" > pyapp/requirements-qt.txt
+          echo "chgksuite-qt" >> pyapp/requirements-qt.txt
+
+          # Tk requirements
+          echo "chgksuite" > pyapp/requirements-tk.txt
+          echo "chgksuite-tk" >> pyapp/requirements-tk.txt
+
+          echo "=== Qt requirements ==="
+          cat pyapp/requirements-qt.txt
+          echo "=== Tk requirements ==="
+          cat pyapp/requirements-tk.txt
+
+      # Build Qt GUI (skip on linux-arm64 - no PyQt6 wheel)
+      - name: Build Qt GUI
+        if: matrix.platform != 'linux-arm64'
+        shell: bash
+        working-directory: pyapp
+        run: |
+          export PYAPP_PROJECT_NAME="chgksuite-qt"
+          export PYAPP_PROJECT_VERSION="${{ steps.config.outputs.version }}"
+          export PYAPP_PROJECT_DEPENDENCY_FILE="$(pwd)/requirements-qt.txt"
+          export PYAPP_EXEC_SPEC="chgksuite_qt.__main__:main"
+          export PYAPP_PYTHON_VERSION="3.12"
+          export PYAPP_IS_GUI="1"
+          export PYAPP_UV_ENABLED="1"
+          export PYAPP_PIP_EXTRA_ARGS="${{ steps.config.outputs.pip_pre }}"
+          export PYAPP_PASS_LOCATION="1"
+
+          echo "Building Qt GUI with:"
+          echo "  PYAPP_PROJECT_DEPENDENCY_FILE=$PYAPP_PROJECT_DEPENDENCY_FILE"
+          echo "  PYAPP_PIP_EXTRA_ARGS=$PYAPP_PIP_EXTRA_ARGS"
+
+          cargo build --release --target ${{ matrix.rust_target }}
+
+          # Copy binary with platform-specific naming
+          if [ "${{ runner.os }}" = "Windows" ]; then
+            cp target/${{ matrix.rust_target }}/release/pyapp.exe ../artifacts/chgkq-${{ matrix.platform }}.exe
+          else
+            cp target/${{ matrix.rust_target }}/release/pyapp ../artifacts/chgkq-${{ matrix.platform }}
+          fi
+
+      # Build Tk GUI
+      - name: Build Tk GUI
+        shell: bash
+        working-directory: pyapp
+        run: |
+          export PYAPP_PROJECT_NAME="chgksuite-tk"
+          export PYAPP_PROJECT_VERSION="${{ steps.config.outputs.version }}"
+          export PYAPP_PROJECT_DEPENDENCY_FILE="$(pwd)/requirements-tk.txt"
+          export PYAPP_EXEC_SPEC="chgksuite_tk.__main__:main"
+          export PYAPP_PYTHON_VERSION="3.12"
+          export PYAPP_IS_GUI="1"
+          export PYAPP_UV_ENABLED="1"
+          export PYAPP_PIP_EXTRA_ARGS="${{ steps.config.outputs.pip_pre }}"
+          export PYAPP_PASS_LOCATION="1"
+
+          echo "Building Tk GUI with:"
+          echo "  PYAPP_PROJECT_DEPENDENCY_FILE=$PYAPP_PROJECT_DEPENDENCY_FILE"
+          echo "  PYAPP_PIP_EXTRA_ARGS=$PYAPP_PIP_EXTRA_ARGS"
+
+          cargo build --release --target ${{ matrix.rust_target }}
+
+          # Copy binary with platform-specific naming
+          if [ "${{ runner.os }}" = "Windows" ]; then
+            cp target/${{ matrix.rust_target }}/release/pyapp.exe ../artifacts/chgkt-${{ matrix.platform }}.exe
+          else
+            cp target/${{ matrix.rust_target }}/release/pyapp ../artifacts/chgkt-${{ matrix.platform }}
+          fi
+
+      # Create macOS .app bundles (required for Finder launch)
+      - name: Create macOS app bundles
+        if: runner.os == 'macOS'
+        shell: bash
+        run: |
+          # Create Qt .app bundle
+          if [ -f "artifacts/chgkq-${{ matrix.platform }}" ]; then
+            mkdir -p "artifacts/chgkq.app/Contents/MacOS"
+            mv "artifacts/chgkq-${{ matrix.platform }}" "artifacts/chgkq.app/Contents/MacOS/chgkq"
+            cat > "artifacts/chgkq.app/Contents/Info.plist" << 'EOF'
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0">
+          <dict>
+            <key>CFBundleExecutable</key>
+            <string>chgkq</string>
+            <key>CFBundleIdentifier</key>
+            <string>me.pecheny.chgkq</string>
+            <key>CFBundleName</key>
+            <string>chgksuite-qt</string>
+            <key>CFBundlePackageType</key>
+            <string>APPL</string>
+            <key>CFBundleVersion</key>
+            <string>${{ steps.config.outputs.version }}</string>
+            <key>CFBundleShortVersionString</key>
+            <string>${{ steps.config.outputs.version }}</string>
+            <key>LSMinimumSystemVersion</key>
+            <string>10.15</string>
+            <key>NSHighResolutionCapable</key>
+            <true/>
+          </dict>
+          </plist>
+          EOF
+            # Ad-hoc sign the app bundle to prevent "damaged" error
+            codesign --force --deep --sign - "artifacts/chgkq.app"
+            # Zip the .app bundle
+            cd artifacts && zip -r "chgkq-${{ matrix.platform }}.zip" chgkq.app && rm -rf chgkq.app && cd ..
+          fi
+
+          # Create Tk .app bundle
+          if [ -f "artifacts/chgkt-${{ matrix.platform }}" ]; then
+            mkdir -p "artifacts/chgkt.app/Contents/MacOS"
+            mv "artifacts/chgkt-${{ matrix.platform }}" "artifacts/chgkt.app/Contents/MacOS/chgkt"
+            cat > "artifacts/chgkt.app/Contents/Info.plist" << 'EOF'
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0">
+          <dict>
+            <key>CFBundleExecutable</key>
+            <string>chgkt</string>
+            <key>CFBundleIdentifier</key>
+            <string>me.pecheny.chgkt</string>
+            <key>CFBundleName</key>
+            <string>chgksuite-tk</string>
+            <key>CFBundlePackageType</key>
+            <string>APPL</string>
+            <key>CFBundleVersion</key>
+            <string>${{ steps.config.outputs.version }}</string>
+            <key>CFBundleShortVersionString</key>
+            <string>${{ steps.config.outputs.version }}</string>
+            <key>LSMinimumSystemVersion</key>
+            <string>10.15</string>
+            <key>NSHighResolutionCapable</key>
+            <true/>
+          </dict>
+          </plist>
+          EOF
+            # Ad-hoc sign the app bundle to prevent "damaged" error
+            codesign --force --deep --sign - "artifacts/chgkt.app"
+            # Zip the .app bundle
+            cd artifacts && zip -r "chgkt-${{ matrix.platform }}.zip" chgkt.app && rm -rf chgkt.app && cd ..
+          fi
+
+      - name: List artifacts
+        shell: bash
+        run: ls -lh artifacts/
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: builds-${{ matrix.platform }}
+          path: artifacts/*
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/') || inputs.tag != ''
+    permissions:
+      contents: write
+
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+          merge-multiple: true
+
+      - name: List artifacts
+        run: ls -la artifacts/
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ inputs.tag || github.ref_name }}
+          files: artifacts/*
+          generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

chgksuite-0.27.2/.gitignore

@@ -0,0 +1,10 @@
+build
+build_specs
+docs/public
+__pycache__
+dist
+*.egg-info
+*.log
+*.debug
+tmp*
+tests_password.txt

chgksuite-0.27.2/.gitlab-ci.yml

@@ -0,0 +1,17 @@
+image: python:3.14-trixie
+
+before_script:
+  - pip install zensical
+
+pages:
+  stage: deploy
+  script:
+  - cd docs
+  - zensical build
+  - mv public ../public
+  - cd ..
+  artifacts:
+    paths:
+    - public
+  rules:
+    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH

chgksuite-0.27.2/.hgignore

@@ -0,0 +1,2 @@
+__pycache__
+.trello_token

{chgksuite-0.27.0b5/chgksuite.egg-info → chgksuite-0.27.2}/PKG-INFO

@@ -1,23 +1,21 @@
 Metadata-Version: 2.4
 Name: chgksuite
-Version: 0.27.0b5
+Version: 0.27.2
 Summary: A package for chgk automation
+Project-URL: Homepage, https://gitlab.com/peczony/chgksuite
 Author-email: Alexander Pecheny <ap@pecheny.me>
 License-Expression: MIT
-Project-URL: Homepage, https://gitlab.com/peczony/chgksuite
-Classifier: Programming Language :: Python :: 3
+License-File: LICENSE
 Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
 Requires-Dist: beautifulsoup4
 Requires-Dist: chardet
-Requires-Dist: dashtable
 Requires-Dist: dateparser
 Requires-Dist: mammoth
 Requires-Dist: openpyxl
 Requires-Dist: parse
-Requires-Dist: Pillow
+Requires-Dist: pillow
 Requires-Dist: ply
 Requires-Dist: pypandoc
 Requires-Dist: pypdf
@@ -29,7 +27,7 @@ Requires-Dist: requests
 Requires-Dist: toml
 Requires-Dist: urllib3>=2.6.2
 Requires-Dist: watchdog
-Dynamic: license-file
+Description-Content-Type: text/markdown
 
 **chgksuite** is an utility that helps chgk editors.
 

chgksuite-0.27.2/adhoc/regexes_fixer.py

@@ -0,0 +1,66 @@
+import os
+import json
+import re
+
+
+def process_json_files(directory):
+    # Pattern to match filenames starting with "regexes_" and ending with ".json"
+    pattern = re.compile(r"^regexes_.*\.json$")
+
+    # Count for reporting
+    processed_files = 0
+
+    # Walk through the directory
+    for root, _, files in os.walk(directory):
+        for filename in files:
+            # Check if the filename matches our pattern
+            if pattern.match(filename):
+                filepath = os.path.join(root, filename)
+                print(f"Processing file: {filepath}")
+
+                try:
+                    # Load the JSON content
+                    with open(filepath, "r", encoding="utf-8") as file:
+                        data = json.load(file)
+
+                    # Make sure it's a dictionary
+                    if not isinstance(data, dict):
+                        print(
+                            f"  Warning: {filepath} does not contain a dictionary. Skipping."
+                        )
+                        continue
+
+                    # Replace spaces with '\s' in all values
+                    modified = False
+                    for key, value in data.items():
+                        if isinstance(value, str) and " " in value:
+                            data[key] = value.replace(" ", "\\s")
+                            modified = True
+
+                    # Save the modified content only if changes were made
+                    if modified:
+                        with open(filepath, "w", encoding="utf-8") as file:
+                            json.dump(data, file, ensure_ascii=False, indent=4)
+                        print(f"  Updated {filepath}")
+                    else:
+                        print(f"  No spaces found in values of {filepath}")
+
+                    processed_files += 1
+
+                except json.JSONDecodeError:
+                    print(f"  Error: {filepath} is not a valid JSON file. Skipping.")
+                except Exception as e:
+                    print(f"  Error processing {filepath}: {str(e)}")
+
+    print(f"\nSummary: Processed {processed_files} JSON files.")
+
+
+if __name__ == "__main__":
+    # Get the directory from user
+    directory = input("Enter the directory path to search: ")
+
+    # Validate directory exists
+    if not os.path.isdir(directory):
+        print(f"Error: '{directory}' is not a valid directory.")
+    else:
+        process_json_files(directory)

chgksuite-0.27.2/author_counter.py

@@ -0,0 +1,24 @@
+#!usr/bin/env python
+#! -*- coding: utf-8 -*-
+import argparse
+from collections import Counter
+
+from chgksuite.composer import parse_4s
+
+parser = argparse.ArgumentParser()
+parser.add_argument("filename")
+args = parser.parse_args()
+
+authors = Counter()
+
+with open(args.filename, "r", encoding="utf-8") as f:
+    structure = parse_4s(f.read().replace("\r", ""))
+
+for element in structure:
+    if element[0] == "Question":
+        if "author" in element[1]:
+            authors[element[1]["author"].replace("`", "")] += 1
+
+for au in authors.most_common():
+    print("{}\t{}".format(au[0], au[1]))
+print("Total: {}".format(sum(authors.values())))

chgksuite-0.27.2/chgksuite/_html2md.py

@@ -0,0 +1,94 @@
+"""Simple HTML table to Markdown converter.
+
+Replaces dashtable.html2md with a minimal implementation that avoids
+deprecated BeautifulSoup methods.
+"""
+
+from bs4 import BeautifulSoup
+
+
+def html2md(html_string: str) -> str:
+    """Convert an HTML table to a Markdown table string.
+
+    Parameters
+    ----------
+    html_string : str
+        HTML string containing a table
+
+    Returns
+    -------
+    str
+        The table formatted as Markdown
+    """
+    soup = BeautifulSoup(html_string, "html.parser")
+    table = soup.find("table")
+
+    if not table:
+        return ""
+
+    rows = table.find_all("tr")
+    if not rows:
+        return ""
+
+    # Extract all rows as lists of cell texts
+    data = []
+    for row in rows:
+        # Check for header cells first, then data cells
+        cells = row.find_all("th")
+        if not cells:
+            cells = row.find_all("td")
+
+        row_data = []
+        for cell in cells:
+            # Get text, normalize whitespace
+            text = " ".join(cell.get_text().split())
+            row_data.append(text)
+        if row_data:
+            data.append(row_data)
+
+    if not data:
+        return ""
+
+    # Normalize row lengths (pad shorter rows)
+    max_cols = max(len(row) for row in data)
+    for row in data:
+        while len(row) < max_cols:
+            row.append("")
+
+    # Calculate column widths (minimum 3 for markdown separator)
+    # Add 2 for space cushions on each side
+    widths = []
+    for col in range(max_cols):
+        width = max(len(row[col]) for row in data)
+        widths.append(max(width + 2, 3))
+
+    # Build markdown table
+    lines = []
+
+    # Header row (centered, with padding)
+    header = (
+        "|" + "|".join(_center(cell, widths[i]) for i, cell in enumerate(data[0])) + "|"
+    )
+    lines.append(header)
+
+    # Separator row (no spaces to avoid typotools converting --- to em-dash)
+    separator = "|" + "|".join("-" * w for w in widths) + "|"
+    lines.append(separator)
+
+    # Data rows (centered, with padding)
+    for row in data[1:]:
+        line = (
+            "|" + "|".join(_center(cell, widths[i]) for i, cell in enumerate(row)) + "|"
+        )
+        lines.append(line)
+
+    return "\n".join(lines)
+
+
+def _center(text: str, width: int) -> str:
+    """Center text within width, with space padding."""
+    text = text.strip()
+    padding = width - len(text)
+    left = padding // 2
+    right = padding - left
+    return " " * left + text + " " * right

{chgksuite-0.27.0b5 → chgksuite-0.27.2}/chgksuite/cli.py

@@ -596,6 +596,15 @@ class ArgparseBuilder:
             caption="Имя 4s-файла",
             filetypes=[("chgksuite markup files", "*.4s")],
         )
+        cmdcompose_markdown = cmdcompose_filetype.add_parser("markdown")
+        self.add_argument(
+            cmdcompose_markdown,
+            "filename",
+            nargs="*",
+            help="file(s) to compose from.",
+            caption="Имя 4s-файла",
+            filetypes=[("chgksuite markup files", "*.4s")],
+        )
         cmdcompose_pptx = cmdcompose_filetype.add_parser("pptx")
         self.add_argument(
             cmdcompose_pptx,

{chgksuite-0.27.0b5 → chgksuite-0.27.2}/chgksuite/common.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import argparse
-import codecs
 import csv
 import itertools
 import json
@@ -28,7 +27,7 @@ QUESTION_LABELS = [
     "number",
     "setcounter",
 ]
-SEP = os.linesep
+SEP = "\n"
 try:
     ENC = sys.stdout.encoding or "utf8"
 except AttributeError:
@@ -114,7 +113,7 @@ class DefaultArgs:
 def set_lastdir(path):
     chgksuite_dir = get_chgksuite_dir()
     lastdir = os.path.join(chgksuite_dir, "lastdir")
-    with codecs.open(lastdir, "w", "utf8") as f:
+    with open(lastdir, "w", encoding="utf-8") as f:
         f.write(path)
 
 
@@ -122,7 +121,7 @@ def get_lastdir():
     chgksuite_dir = get_chgksuite_dir()
     lastdir = os.path.join(chgksuite_dir, "lastdir")
     if os.path.isfile(lastdir):
-        with codecs.open(lastdir, "r", "utf8") as f:
+        with open(lastdir, "r", encoding="utf-8") as f:
             return f.read().rstrip()
     return "."
 
@@ -153,6 +152,19 @@ def ensure_utf8(s):
     return s
 
 
+def read_text_file(filepath, encoding="utf-8"):
+    """Read a text file, fixing corrupted line endings (\r\r\n -> \n) if present."""
+    with open(filepath, "rb") as f:
+        raw = f.read()
+    # Fix corrupted line endings at byte level before decoding
+    if b"\r\r\n" in raw:
+        raw = raw.replace(b"\r\r\n", b"\n")
+    text = raw.decode(encoding)
+    # Normalize any remaining line endings
+    text = text.replace("\r\n", "\n").replace("\r", "\n")
+    return text
+
+
 class DummyLogger(object):
     def info(self, *args, **kwargs):
         pass
@@ -371,6 +383,5 @@ def compose_4s(structure, args=None):
                         + SEP
                     )
             tmp = re.sub(r"{}+".format(SEP), SEP, tmp)
-            tmp = tmp.replace("\r\r", "\r")
             result += tmp + SEP
     return result

{chgksuite-0.27.0b5 → chgksuite-0.27.2}/chgksuite/composer/__init__.py

@@ -1,6 +1,5 @@
 #!usr/bin/env python
 # -*- coding: utf-8 -*-
-import codecs
 import json
 import os
 import shutil
@@ -13,6 +12,7 @@ from chgksuite.common import (
     get_source_dirs,
     init_logger,
     log_wrap,
+    read_text_file,
     set_lastdir,
 )
 from chgksuite.composer.chgksuite_parser import parse_4s
@@ -22,7 +22,7 @@ from chgksuite.composer.docx import DocxExporter
 from chgksuite.composer.latex import LatexExporter
 from chgksuite.composer.lj import LjExporter
 from chgksuite.composer.pptx import PptxExporter
-from chgksuite.composer.reddit import RedditExporter
+from chgksuite.composer.markdown import MarkdownExporter
 from chgksuite.composer.stats import StatsAdder
 from chgksuite.composer.telegram import TelegramExporter
 from chgksuite.composer.openquiz import OpenquizExporter
@@ -75,11 +75,11 @@ def process_file_wrapper(filename, sourcedir, targetdir, args):
 
 def parse_filepath(filepath, args=None):
     args = args or DefaultArgs()
-    with codecs.open(filepath, "r", "utf8") as input_file:
-        input_text = input_file.read()
-    input_text = input_text.replace("\r", "")
+    input_text = read_text_file(filepath)
     debug_dir = os.path.dirname(os.path.abspath(filepath))
-    return parse_4s(input_text, randomize=args.randomize, debug=args.debug, debug_dir=debug_dir)
+    return parse_4s(
+        input_text, randomize=args.randomize, debug=args.debug, debug_dir=debug_dir
+    )
 
 
 def make_merged_filename(filelist):
@@ -106,7 +106,7 @@ def process_file(filename, tmp_dir, targetdir, args=None, logger=None):
             targetdir,
             make_filename(os.path.basename(filename), "dbg", args),
         )
-        with codecs.open(debug_fn, "w", "utf8") as output_file:
+        with open(debug_fn, "w", encoding="utf-8") as output_file:
             output_file.write(json.dumps(structure, indent=2, ensure_ascii=False))
 
     if not args.filetype:
@@ -147,8 +147,8 @@ def process_file(filename, tmp_dir, targetdir, args=None, logger=None):
         outfilename = os.path.join(targetdir, make_filename(filename, "txt", args))
         exporter.export(outfilename)
 
-    if args.filetype == "redditmd":
-        exporter = RedditExporter(structure, args, dir_kwargs)
+    if args.filetype in ("redditmd", "markdown"):
+        exporter = MarkdownExporter(structure, args, dir_kwargs)
         outfilename = os.path.join(targetdir, make_filename(filename, "md", args))
         exporter.export(outfilename)