LCPQ/spip2md
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix files that should be in same dest dir

Browse Source
This commit is contained in:
Guilhem Fauré 2023-06-05 12:24:08 +02:00
parent c350ddbc01
commit 9f2dfc546a
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spip2md/config.py
View File

@ -23,6 +23,7 @@ class Configuration:
data_dir: str = "data/" # The directory in which SPIP images & documents are stored data_dir: str = "data/" # The directory in which SPIP images & documents are stored
prepend_h1: bool = True # Add the title of the article as a Markdown h1 prepend_h1: bool = True # Add the title of the article as a Markdown h1
prepend_id: bool = True # Add the ID of object before slug prepend_id: bool = True # Add the ID of object before slug
prepend_lang: bool = False # Add the lang of object before slug
unknown_char_replacement: str = "??" # Replaces unknown characters unknown_char_replacement: str = "??" # Replaces unknown characters
export_languages = ("fr", "en") # Languages that will be exported export_languages = ("fr", "en") # Languages that will be exported
export_filetype: str = "md" # Extension of exported text files export_filetype: str = "md" # Extension of exported text files

27
spip2md/extended_models.py
View File

@ -1,7 +1,7 @@
# SPIP website to plain Markdown files converter, Copyright (C) 2023 Guilhem Fauré # SPIP website to plain Markdown files converter, Copyright (C) 2023 Guilhem Fauré
import logging import logging
from os import makedirs from os import listdir, makedirs
from os.path import basename, splitext from os.path import basename, isfile, splitext
from re import Match, Pattern, finditer, match, search from re import Match, Pattern, finditer, match, search
from shutil import copyfile from shutil import copyfile
from typing import Any, Optional from typing import Any, Optional
@ -376,7 +376,7 @@ class RedactionalObject(WritableObject):
# If directory already exists, append a number or increase appended number # If directory already exists, append a number or increase appended number
if self._dest_dir_conflict: if self._dest_dir_conflict:
self.style_print( self.style_print(
f"Changing name of {directory} because another directory already has it" f"Name of {directory} conflicting with an existing one, changing it"
) )
m = match(r"^(.+)_([0-9]+)$", directory) m = match(r"^(.+)_([0-9]+)$", directory)
if m is not None: if m is not None:
@ -515,8 +515,25 @@ class RedactionalObject(WritableObject):
try: try:
makedirs(self.dest_directory()) makedirs(self.dest_directory())
except FileExistsError: except FileExistsError:
self._dest_dir_conflict = True # Create a new directory if write is about to overwrite an existing file
makedirs(self.dest_directory()) # or to write into a directory without the same fileprefix
directory = self.dest_directory()
for file in listdir(directory):
logging.debug(
f"Testing if {type(self).__name__} `{self.dest_path()}` of prefix "
+ f"{self._fileprefix} can be written along with `{file}` "
+ f"of prefix `{file.split('.')[0]}` in `{self.dest_directory()}`"
)
if isfile(directory + file) and (
self.dest_directory() + file == self.dest_path()
or file.split(".")[0] != self._fileprefix
):
logging.debug(
f"Not writing {self._title} in {self.dest_directory()} along "
+ file
)
self._dest_dir_conflict = True
makedirs(self.dest_directory())
# Write the content of this object into a file named as self.filename() # Write the content of this object into a file named as self.filename()
with open(self.dest_path(), "w") as f: with open(self.dest_path(), "w") as f:
f.write(self.content()) f.write(self.content())