partially/fully checked output folder name removes special characters for KEPUB (#1508)
This commit is contained in:
1 parent
f93c2e1f2c
commit
4e619fd1cc
1 file changed
+8
-5
@@ -50,7 +50,7 @@ from .KCC_spread_label import LabelSpreadsDialog
|
|||||||
from .shared import HTMLStripper, sanitizeTrace, walkLevel
|
from .shared import HTMLStripper, sanitizeTrace, walkLevel
|
||||||
from .image import ProfileData
|
from .image import ProfileData
|
||||||
from .comicarchive import SEVENZIP, TAR, available_archive_tools
|
from .comicarchive import SEVENZIP, TAR, available_archive_tools
|
||||||
from .comic2ebook import OS_SORT_KEY, KF7_KINDLES, flattenTree, getWorkFolder, removeNonImages, sanitizeTree, detectKindleGen
|
from .comic2ebook import KOBO_TOUCH_DRIVER_REGEX, OS_SORT_KEY, KF7_KINDLES, flattenTree, getWorkFolder, removeNonImages, sanitizeTree, detectKindleGen
|
||||||
from . import __version__
|
from . import __version__
|
||||||
from . import i18n
|
from . import i18n
|
||||||
from . import comic2ebook
|
from . import comic2ebook
|
||||||
@@ -1338,18 +1338,21 @@ class KCCGUI(QObject, KCC_ui.Ui_mainWindow):
|
|||||||
self.conversionAlive = False
|
self.conversionAlive = False
|
||||||
self.worker.sync()
|
self.worker.sync()
|
||||||
else:
|
else:
|
||||||
|
parent = Path(self.jobList.item(0).text()).parent
|
||||||
|
name = parent.name
|
||||||
|
if GUI.deviceBox.currentText().startswith('Kobo') and GUI.formatBox.currentText() == 'EPUB':
|
||||||
|
name = KOBO_TOUCH_DRIVER_REGEX.sub('_', name)
|
||||||
|
|
||||||
if QApplication.keyboardModifiers() == Qt.KeyboardModifier.ShiftModifier:
|
if QApplication.keyboardModifiers() == Qt.KeyboardModifier.ShiftModifier:
|
||||||
if not self.selectOutputFolder():
|
if not self.selectOutputFolder():
|
||||||
return
|
return
|
||||||
elif GUI.defaultOutputFolderBox.checkState() == Qt.CheckState.PartiallyChecked:
|
elif GUI.defaultOutputFolderBox.checkState() == Qt.CheckState.PartiallyChecked:
|
||||||
parent = Path(self.jobList.item(0).text()).parent
|
target_path = parent.joinpath(f"{name} [kcc]")
|
||||||
target_path = parent.joinpath(f"{parent.name} [kcc]")
|
|
||||||
if not target_path.exists():
|
if not target_path.exists():
|
||||||
target_path.mkdir()
|
target_path.mkdir()
|
||||||
self.targetDirectory = str(target_path)
|
self.targetDirectory = str(target_path)
|
||||||
elif GUI.defaultOutputFolderBox.isChecked():
|
elif GUI.defaultOutputFolderBox.isChecked():
|
||||||
parent = Path(self.jobList.item(0).text()).parent
|
self.targetDirectory = os.path.join(self.defaultOutputFolder, f"{name} [kcc]")
|
||||||
self.targetDirectory = os.path.join(self.defaultOutputFolder, f"{parent.name} [kcc]")
|
|
||||||
else:
|
else:
|
||||||
GUI.targetDirectory = ''
|
GUI.targetDirectory = ''
|
||||||
self.progress.start()
|
self.progress.start()
|
||||||
|
|||||||
Reference in new issue
Block a user