dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

image related fixes

Browse Source 
- Support previewing cross-line image link;
- Do not consider image title when generating image name and use current
time at the front to make it easy to sort.
This commit is contained in:
Le Tan 2018-10-14 11:59:25 +08:00
parent 94fd430c06
commit 1b95b636e7
4 changed files with 69 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/utils/vutils.cpp
View File

@ -43,7 +43,7 @@ extern VConfigManager *g_config;
QVector<QPair<QString, QString>> VUtils::s_availableLanguages;
const QString VUtils::c_imageLinkRegExp = QString("\\!\\[([^\\]]*)\\]"
const QString VUtils::c_imageLinkRegExp = QString("\\!\\[([^\\[\\]]*)\\]"
"\\(\\s*"
"([^\\)\"'\\s]+)"
"(\\s*(\"[^\"\\)\\n]*\")|('[^'\\)\\n]*'))?"
@ -158,33 +158,30 @@ QString VUtils::generateImageFileName(const QString &path,
const QString &title,
const QString &format)
{
QRegExp regExp("\\W");
QString baseName(title.toLower());
const QChar sep('_');
// Remove non-character chars.
baseName.remove(regExp);
// Constrain the length of the name.
baseName.truncate(10);
baseName.prepend(g_config->getImageNamePrefix());
if (!baseName.isEmpty()) {
baseName.append('_');
QString baseName(g_config->getImageNamePrefix());
if (!baseName.isEmpty()
&& !(baseName.size() == 1 && baseName[0] == sep)) {
baseName += sep;
}
// Add current time and random number to make the name be most likely unique
baseName += QString::number(QDateTime::currentDateTime().toTime_t())
+ '_'
+ QString::number(qrand());
// Add current time at fixed length.
baseName += QDateTime::currentDateTime().toString("yyyyMMddHHmmsszzz");
QDir dir(path);
QString imageName = baseName + "." + format.toLower();
// Add random number to make the name be most likely unique.
baseName += (sep + QString::number(qrand()));
QString suffix;
if (!format.isEmpty()) {
suffix = "." + format.toLower();
}
QString imageName(baseName + suffix);
int index = 1;
QDir dir(path);
while (fileExists(dir, imageName, true)) {
imageName = QString("%1_%2.%3").arg(baseName).arg(index++)
.arg(format.toLower());
imageName = QString("%1_%2%3").arg(baseName).arg(index++).arg(suffix);
}
return imageName;
@ -1016,11 +1013,12 @@ QString VUtils::getRandomFileName(const QString &p_directory)
{
Q_ASSERT(!p_directory.isEmpty());
QString name;
QString baseName(QDateTime::currentDateTime().toString("yyyyMMddHHmmsszzz"));
QDir dir(p_directory);
QString name;
do {
name = QString::number(QDateTime::currentDateTimeUtc().toTime_t());
name = name + '_' + QString::number(qrand());
name = baseName + '_' + QString::number(qrand());
} while (fileExists(dir, name, true));
return name;
@ -1826,3 +1824,8 @@ QTemporaryFile *VUtils::createTemporaryFile(QString p_suffix)
+ xx
+ p_suffix);
}
QString VUtils::purifyImageTitle(QString p_title)
{
return p_title.remove(QRegExp("[\\r\\n\\[\\]]"));
}

2
src/utils/vutils.h
View File

@ -390,6 +390,8 @@ public:
static QTemporaryFile *createTemporaryFile(QString p_suffix);
static QString purifyImageTitle(QString p_title);
// Regular expression for image link.
// ![image title]( http://github.com/tamlok/vnote.jpg "alt text" =200x100)
// Captured texts (need to be trimmed):

2
src/vmdeditor.cpp
View File

@ -2055,7 +2055,7 @@ void VMdEditor::replaceTextWithLocalImages(QString &p_text)
continue;
}
QString imageTitle = regExp.cap(1).trimmed();
QString imageTitle = VUtils::purifyImageTitle(regExp.cap(1).trimmed());
QString imageUrl = regExp.cap(2).trimmed();
const int maxUrlLength = 100;

59
src/vpreviewmanager.cpp
View File

@ -136,41 +136,58 @@ void VPreviewManager::fetchImageLinksFromRegions(QVector<VElementRegion> p_image
for (int i = 0; i < p_imageRegions.size(); ++i) {
const VElementRegion &reg = p_imageRegions[i];
QTextBlock block = doc->findBlock(reg.m_startPos);
if (!block.isValid()) {
QTextBlock firstBlock = doc->findBlock(reg.m_startPos);
if (!firstBlock.isValid()) {
continue;
}
int blockStart = block.position();
int blockEnd = blockStart + block.length() - 1;
QString text = block.text();
// Since the image links update signal is emitted after a timer, during which
// the content may be changed.
if (reg.m_endPos > blockEnd) {
// Image link may cross multiple regions.
QTextBlock lastBlock = doc->findBlock(reg.m_endPos - 1);
if (!lastBlock.isValid()) {
continue;
}
ImageLinkInfo info(reg.m_startPos,
int firstBlockStart = firstBlock.position();
int lastBlockStart = lastBlock.position();
int lastBlockEnd = lastBlockStart + lastBlock.length() - 1;
QString text;
if (firstBlock.blockNumber() == lastBlock.blockNumber()) {
text = firstBlock.text().mid(reg.m_startPos - firstBlockStart,
reg.m_endPos - reg.m_startPos);
} else {
text = firstBlock.text().mid(reg.m_startPos - firstBlockStart);
QTextBlock block = firstBlock.next();
while (block.isValid() && block.blockNumber() < lastBlock.blockNumber()) {
text += "\n" + block.text();
block = block.next();
}
text += "\n" + lastBlock.text().left(reg.m_endPos - lastBlockStart);
}
// Preview the image at the last block.
ImageLinkInfo info(qMax(reg.m_startPos, lastBlockStart),
reg.m_endPos,
blockStart,
block.blockNumber(),
calculateBlockMargin(block, m_editor->tabStopWidthW()));
if ((reg.m_startPos == blockStart
|| isAllSpaces(text, 0, reg.m_startPos - blockStart))
&& (reg.m_endPos == blockEnd
|| isAllSpaces(text, reg.m_endPos - blockStart, blockEnd - blockStart))) {
lastBlockStart,
lastBlock.blockNumber(),
calculateBlockMargin(firstBlock, m_editor->tabStopWidthW()));
if ((reg.m_startPos == firstBlockStart
|| isAllSpaces(firstBlock.text(), 0, reg.m_startPos - firstBlockStart))
&& (reg.m_endPos == lastBlockEnd
|| isAllSpaces(lastBlock.text(),
reg.m_endPos - lastBlockStart,
lastBlockEnd - lastBlockStart))) {
// Image block.
info.m_isBlock = true;
fetchImageInfoToPreview(text, info);
} else {
// Inline image.
info.m_isBlock = false;
fetchImageInfoToPreview(text.mid(reg.m_startPos - blockStart,
reg.m_endPos - reg.m_startPos),
info);
}
fetchImageInfoToPreview(text, info);
if (info.m_linkUrl.isEmpty() || info.m_linkShortUrl.isEmpty()) {
continue;
}