Add raw data preview support

- Also adds psc as valid text preview

CMakeLists.txt

@@ -1,11 +1,10 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(preview_base)
-set(project_type plugin)
-
 if(DEFINED DEPENDENCIES_DIR)
-	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/project.cmake)
+	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake)
 else()
-	include(../cmake_common/project.cmake)
+	include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake)
 endif()
+
+project(preview_base)
 add_subdirectory(src)

src/CMakeLists.txt

@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-if(DEFINED DEPENDENCIES_DIR)
-	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/src.cmake)
-else()
-	include(../../cmake_common/src.cmake)
-endif()
+
+add_library(preview_base SHARED)
+mo2_configure_plugin(preview_base WARNINGS OFF)
+mo2_install_target(preview_base)

src/SConscript

@@ -1,11 +0,0 @@
-Import('qt_env')
-
-env = qt_env.Clone()
-
-env.AppendUnique(CPPDEFINES = [ 'PREVIEWBASE_LIBRARY' ])
-
-lib = env.SharedLibrary('previewBase', env.Glob('*.cpp'))
-env.InstallModule(lib)
-
-res = env['QT_USED_MODULES']
-Return('res')

src/previewBase.pro

@@ -1,26 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2014-01-14T19:50:56
-#
-#-------------------------------------------------
-
-TARGET = previewBase
-TEMPLATE = lib
-
-CONFIG += plugins
-CONFIG += dll
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets gui
-
-DEFINES += PREVIEWBASE_LIBRARY
-
-SOURCES += previewbase.cpp
-
-HEADERS += previewbase.h
-
-
-include(../plugin_template.pri)
-
-OTHER_FILES += \
-    previewbase.json\
-    SConscript

src/previewbase.cpp

@@ -26,7 +26,7 @@ along with Base Preview plugin.  If not, see <http://www.gnu.org/licenses/>.
 #include <QTextEdit>
 #include <QtPlugin>
 #include <QApplication>
-#include <QDesktopWidget>
+#include <QScreen>
 
 
 using namespace MOBase;
@@ -44,7 +44,7 @@ bool PreviewBase::init(IOrganizer *moInfo)
   const QStringList& blacklist = m_MOInfo->pluginSetting(name(), "blacklisted_extensions").toString().toLower().split(',');
 
   // set up image reader to be used for all image types qt (the current installation) supports
-  auto imageReader = std::bind(&PreviewBase::genImagePreview, this, std::placeholders::_1, std::placeholders::_2);
+  auto imageReader = std::bind(&PreviewBase::genImagePreview, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3);
 
   foreach(const QByteArray & fileType, QImageReader::supportedImageFormats()) {
     auto strFileType = QString(fileType).toLower();
@@ -56,9 +56,9 @@ bool PreviewBase::init(IOrganizer *moInfo)
     m_PreviewGenerators[strFileType] = imageReader;
   }
 
-  const QStringList supportedTextFormats = { "txt", "ini", "json", "log", "cfg" };
+  const QStringList supportedTextFormats = { "txt", "ini", "json", "log", "cfg", "psc" };
 
-  auto textReader = std::bind(&PreviewBase::genTxtPreview, this, std::placeholders::_1, std::placeholders::_2);
+  auto textReader = std::bind(&PreviewBase::genTxtPreview, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3);
 
   foreach(const QString fileType, supportedTextFormats) {
 
@@ -116,21 +116,32 @@ std::set<QString> PreviewBase::supportedExtensions() const
   return extensions;
 }
 
-QWidget *PreviewBase::genFilePreview(const QString &fileName, const QSize &maxSize) const
+QWidget* PreviewBase::genFilePreview(const QString &fileName, const QSize &maxSize) const
+{
+  return genDataPreview(nullptr, fileName, maxSize);
+}
+
+QWidget* PreviewBase::genDataPreview(const QByteArray& fileData, const QString& fileName,
+    const QSize& maxSize) const
 {
   auto iter = m_PreviewGenerators.find(QFileInfo(fileName).suffix().toLower());
   if (iter != m_PreviewGenerators.end()) {
-    return iter->second(fileName, maxSize);
+    return iter->second(fileName, maxSize, fileData);
   } else {
     return nullptr;
   }
 }
 
-QWidget *PreviewBase::genImagePreview(const QString &fileName, const QSize&) const
+QWidget *PreviewBase::genImagePreview(const QString &fileName, const QSize&, const QByteArray& fileData) const
 {
   QLabel *label = new QLabel();
-  QPixmap pic = QPixmap(fileName);
-  QSize screenSize = QApplication::desktop()->screenGeometry().size();
+  QPixmap pic;
+  if (fileData == nullptr) {
+    pic = QPixmap(fileName);
+  } else {
+    pic.loadFromData(fileData);
+  }
+  QSize screenSize = QApplication::primaryScreen()->geometry().size();
   // ensure the output image is no more than 80% of the screen height.
   // If the aspect ratio is higher than that of the screen this would still allow the image to extend
   // beyond the screen but it ensures you can drag the window and close it
@@ -142,10 +153,14 @@ QWidget *PreviewBase::genImagePreview(const QString &fileName, const QSize&) con
   return label;
 }
 
-QWidget *PreviewBase::genTxtPreview(const QString &fileName, const QSize&) const
+QWidget *PreviewBase::genTxtPreview(const QString &fileName, const QSize&, const QByteArray& fileData) const
 {
   QTextEdit *edit = new QTextEdit();
-  edit->setText(MOBase::readFileText(fileName));
+  if (fileData == nullptr) {
+    edit->setText(MOBase::readFileText(fileName));
+  } else {
+    edit->setText(MOBase::decodeTextData(fileData));
+  }
   edit->setReadOnly(true);
   return edit;
 }

src/previewbase.h

@@ -47,15 +47,17 @@ public:
 
 public:
   virtual std::set<QString> supportedExtensions() const;
-  virtual QWidget *genFilePreview(const QString &fileName, const QSize &maxSize) const;
+  virtual bool supportsArchives() const override { return true; }
+  virtual QWidget* genFilePreview(const QString &fileName, const QSize &maxSize) const;
+  virtual QWidget* genDataPreview(const QByteArray& fileData, const QString& fileName,
+      const QSize& maxSize) const override;
 
 private:
-
-  QWidget *genImagePreview(const QString &fileName, const QSize &maxSize) const;
-  QWidget *genTxtPreview(const QString &fileName, const QSize &maxSize) const;
+  QWidget *genImagePreview(const QString &fileName, const QSize &maxSize, const QByteArray& fileData) const;
+  QWidget* genTxtPreview(const QString& fileName, const QSize& maxSize, const QByteArray& fileData) const;
 
 private:
-  std::map<QString, std::function<QWidget*(const QString&, const QSize&)> > m_PreviewGenerators;
+  std::map<QString, std::function<QWidget*(const QString&, const QSize&, const QByteArray&)> > m_PreviewGenerators;
 
 private:
   const MOBase::IOrganizer* m_MOInfo;