- bsa parser will now cancel in case of a read error. Before, when attempting to parse a broken bsa it could take forever and continuously allocate memory

- better error message when bsa parsing fails
- slightly better support for font colors in bbcode converter
- configurator now also uses pyqt5
- bugfix: bsa hashing function converted backslashes to slashes instead of the other way around. hash calculation is still often wrong on folder names...

3 files changed, 17 insertions, 10 deletions

diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
index 90dcd073..d7749187 100644
--- a/src/aboutdialog.cpp
+++ b/src/aboutdialog.cpp
@@ -36,7 +36,7 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
   m_LicenseFiles[LICENSE_CCBY3] = "by-sa3.txt";

   m_LicenseFiles[LICENSE_ZLIB] = "zlib.txt";

 

-  addLicense("Qt 4.8.5", LICENSE_LGPL3);

+  addLicense("Qt 5.3", LICENSE_LGPL3);

   addLicense("Qt Json", LICENSE_GPL3);

   addLicense("Boost Library", LICENSE_BOOST);

   addLicense("7-zip", LICENSE_LGPL3);

diff --git a/src/bbcode.cpp b/src/bbcode.cpp
index 92eb427f..2e22859d 100644
--- a/src/bbcode.cpp
+++ b/src/bbcode.cpp
@@ -80,11 +80,15 @@ public:
             if (tagName == "color") {

               QString color = tagIter->second.first.cap(1);

               QString content = tagIter->second.first.cap(2);

-              auto colIter = m_ColorMap.find(color.toLower());

-              if (colIter != m_ColorMap.end()) {

-                color = colIter->second;

+              if (color.at(0) == "#") {

+                return temp.replace(tagIter->second.first, QString("<font style=\"color: %1;\">%2</font>").arg(color, content));

+              } else {

+                auto colIter = m_ColorMap.find(color.toLower());

+                if (colIter != m_ColorMap.end()) {

+                  color = colIter->second;

+                }

+                return temp.replace(tagIter->second.first, QString("<font style=\"color: #%1;\">%2</font>").arg(color, content));

               }

-              return temp.replace(tagIter->second.first, QString("<font style=\"color: #%1;\">%2</font>").arg(color, content));

             } else {

               qWarning("don't know how to deal with tag %s", qPrintable(tagName));

             }

@@ -131,7 +135,7 @@ private:
     m_TagMap["color="] = std::make_pair(QRegExp("\\[color=([^\\]]*)\\](.*)\\[/color\\]"),

                                         "");

     m_TagMap["font="]  = std::make_pair(QRegExp("\\[font=([^\\]]*)\\](.*)\\[/font\\]"),

-                                        "<font face=\\1>\\2</font>");

+                                        "<font style=\"font-family: \\1;\">\\2</font>");

     m_TagMap["center"] = std::make_pair(QRegExp("\\[center\\](.*)\\[/center\\]"),

                                         "<div align=\"center\">\\1</div>");

     m_TagMap["quote"]  = std::make_pair(QRegExp("\\[quote\\](.*)\\[/quote\\]"),

@@ -231,7 +235,6 @@ QString convertToHTML(const QString &inputParam)
 

   QString input = inputParam.mid(0).replace("\r\n", "<br/>");

   input.replace("\\\"", "\"").replace("\\'", "'");

-

   QString result;

   int lastBlock = 0;

   int pos = 0;

diff --git a/src/directoryrefresher.cpp b/src/directoryrefresher.cpp
index 2186f9a5..24fda501 100644
--- a/src/directoryrefresher.cpp
+++ b/src/directoryrefresher.cpp
@@ -83,8 +83,12 @@ void DirectoryRefresher::addModBSAToStructure(DirectoryEntry *directoryStructure
   foreach (const QString &archive, archives) {

     QFileInfo fileInfo(archive);

     if (m_EnabledArchives.find(fileInfo.fileName()) != m_EnabledArchives.end()) {

-      directoryStructure->addFromBSA(ToWString(modName), directoryW,

-                                     ToWString(QDir::toNativeSeparators(fileInfo.absoluteFilePath())), priority);

+      try {

+        directoryStructure->addFromBSA(ToWString(modName), directoryW,

+                                       ToWString(QDir::toNativeSeparators(fileInfo.absoluteFilePath())), priority);

+      } catch (const std::exception &e) {

+        throw MyException(tr("failed to parse bsa %1: %2").arg(archive, e.what()));

+      }

     }

   }

 }

@@ -143,7 +147,7 @@ void DirectoryRefresher::refresh()
     try {

       addModToStructure(m_DirectoryStructure, iter->modName, i, iter->absolutePath, iter->stealFiles, iter->archives);

     } catch (const std::exception &e) {

-      emit error(tr("failed to read bsa: %1").arg(e.what()));

+      emit error(tr("failed to read mod (%1): %2").arg(iter->modName, e.what()));

     }

     emit progress((i * 100) / m_Mods.size() + 1);

   }