CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-10 07:52:35 +12:00
Code Issues Projects Releases Wiki Activity

Purging types from file loader

Browse source
This commit is contained in:
Olivier Keshavjee 2016-03-30 11:14:05 +02:00
parent 6551166000
commit 54ab5f0455
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
manuskript/load_save/version_1.py
View file

@ -18,7 +18,7 @@ from PyQt5.QtGui import QColor, QStandardItem
from manuskript import settings
from manuskript.enums import Character, World, Plot, PlotStep, Outline
from manuskript.functions import mainWindow, iconColor, iconFromColorString
from manuskript.functions import mainWindow, iconColor, iconFromColorString, HTML2PlainText
from lxml import etree as ET
from manuskript.load_save.version_0 import loadFilesFromZip
@ -529,12 +529,7 @@ def exportOutlineItem(root):
content = outlineToMMD(child)
files.append((fpath, content))
elif child.type() in ["txt", "t2t", "md"]:
content = outlineToMMD(child)
files.append((spath, content))
elif child.type() in ["html"]:
# Save as html. Not the most beautiful, but hey.
elif child.type() == "md":
content = outlineToMMD(child)
files.append((spath, content))
@ -912,6 +907,14 @@ def outlineFromMMD(text, parent):
# Store body
item.setData(Outline.text.value, str(body))
# Set file format to "md"
# (Old version of manuskript had different file formats: text, t2t, html and md)
# If file format is html, convert to plain text:
if item.type() == "html":
item.setData(Outline.text.value, HTML2PlainText(body))
if item.type() in ["txt", "t2t", "html"]:
item.setData(Outline.type.value, "md")
return item