some fixes and removed obsolete code

5 files changed, 12 insertions, 288 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 07d6fa19..7061a6e3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -123,7 +123,7 @@ bool bootstrap()
 

   // cycle logfile

   removeOldFiles(qApp->property("dataPath").toString() + "/" + QString::fromStdWString(AppConfig::logPath()),

-                 "ModOrganizer*.log", 5, QDir::Name);

+                 "usvfs*.log", 5, QDir::Name);

 

   createAndMakeWritable(AppConfig::profilesPath());

   createAndMakeWritable(AppConfig::modsPath());

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e34d8b03..71013c3c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -186,6 +186,7 @@ MainWindow::MainWindow(const QString &exeName
   m_RefreshProgress->setVisible(false);

   statusBar()->addWidget(m_RefreshProgress, 1000);

   statusBar()->clearMessage();

+  statusBar()->hide();

 

   ui->actionEndorseMO->setVisible(false);

 

@@ -233,8 +234,6 @@ MainWindow::MainWindow(const QString &exeName
   }

   ui->espList->installEventFilter(m_OrganizerCore.pluginList());

 

-  ui->bsaList->setLocalMoveOnly(true);

-

   ui->splitter->setStretchFactor(0, 3);

   ui->splitter->setStretchFactor(1, 2);

 

@@ -302,9 +301,6 @@ MainWindow::MainWindow(const QString &exeName
 

   connect(this, SIGNAL(styleChanged(QString)), this, SLOT(updateStyle(QString)));

 

-  m_CheckBSATimer.setSingleShot(true);

-  connect(&m_CheckBSATimer, SIGNAL(timeout()), this, SLOT(checkBSAList()));

-

   m_UpdateProblemsTimer.setSingleShot(true);

   connect(&m_UpdateProblemsTimer, SIGNAL(timeout()), this, SLOT(updateProblemsButton()));

 

@@ -1317,157 +1313,6 @@ static QStringList toStringList(InputIterator current, InputIterator end)
   return result;

 }

 

-void MainWindow::updateBSAList(const QStringList &defaultArchives, const QStringList &activeArchives)

-{

-  m_DefaultArchives = defaultArchives;

-  ui->bsaList->clear();

-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)

-  ui->bsaList->header()->setSectionResizeMode(QHeaderView::ResizeToContents);

-#else

-  ui->bsaList->header()->setResizeMode(QHeaderView::ResizeToContents);

-#endif

-

-  std::vector<std::pair<UINT32, QTreeWidgetItem*>> items;

-

-  IPluginGame *gamePlugin = qApp->property("managed_game").value<IPluginGame*>();

-  BSAInvalidation *invalidation = gamePlugin->feature<BSAInvalidation>();

-  std::vector<FileEntry::Ptr> files = m_OrganizerCore.directoryStructure()->getFiles();

-

-  QStringList plugins = m_OrganizerCore.findFiles("", [] (const QString &fileName) -> bool {

-    return fileName.endsWith(".esp", Qt::CaseInsensitive)

-        || fileName.endsWith(".esm", Qt::CaseInsensitive);

-  });

-

-  auto hasAssociatedPlugin = [&](const QString &bsaName) -> bool {

-    for (const QString &pluginName : plugins) {

-      QFileInfo pluginInfo(pluginName);

-      if (bsaName.startsWith(QFileInfo(pluginName).baseName(), Qt::CaseInsensitive)

-          && (m_OrganizerCore.pluginList()->state(pluginInfo.fileName()) == IPluginList::STATE_ACTIVE)) {

-        return true;

-      }

-    }

-    return false;

-  };

-

-  for (FileEntry::Ptr current : files) {

-    QFileInfo fileInfo(ToQString(current->getName().c_str()));

-

-    if (fileInfo.suffix().toLower() == "bsa") {

-      int index = activeArchives.indexOf(fileInfo.fileName());

-      if (index == -1) {

-        index = 0xFFFF;

-      } else {

-        index += 2;

-      }

-

-      if ((invalidation != nullptr) && invalidation->isInvalidationBSA(fileInfo.fileName())) {

-        index = 1;

-      }

-

-      int originId = current->getOrigin();

-      FilesOrigin &origin = m_OrganizerCore.directoryStructure()->getOriginByID(originId);

-

-      QTreeWidgetItem *newItem = new QTreeWidgetItem(QStringList()

-                                                     << fileInfo.fileName()

-                                                     << ToQString(origin.getName()));

-      newItem->setData(0, Qt::UserRole, index);

-      newItem->setData(1, Qt::UserRole, originId);

-      newItem->setFlags(newItem->flags() & ~Qt::ItemIsDropEnabled | Qt::ItemIsUserCheckable);

-      newItem->setCheckState(0, (index != -1) ? Qt::Checked : Qt::Unchecked);

-      newItem->setData(0, Qt::UserRole, false);

-      if (m_OrganizerCore.settings().forceEnableCoreFiles()

-          && defaultArchives.contains(fileInfo.fileName())) {

-        newItem->setCheckState(0, Qt::Checked);

-        newItem->setDisabled(true);

-        newItem->setData(0, Qt::UserRole, true);

-      } else if (fileInfo.fileName().compare("update.bsa", Qt::CaseInsensitive) == 0) {

-        newItem->setCheckState(0, Qt::Checked);

-        newItem->setDisabled(true);

-      } else if (hasAssociatedPlugin(fileInfo.fileName())) {

-        newItem->setCheckState(0, Qt::Checked);

-        newItem->setDisabled(true);

-      }

-

-      if (index < 0) index = 0;

-

-      UINT32 sortValue = ((origin.getPriority() & 0xFFFF) << 16) | (index & 0xFFFF);

-      items.push_back(std::make_pair(sortValue, newItem));

-    }

-  }

-

-  std::sort(items.begin(), items.end(), BySortValue);

-

-  for (auto iter = items.begin(); iter != items.end(); ++iter) {

-    int originID = iter->second->data(1, Qt::UserRole).toInt();

-

-    FilesOrigin origin = m_OrganizerCore.directoryStructure()->getOriginByID(originID);

-    QString modName("data");

-    unsigned int modIndex = ModInfo::getIndex(ToQString(origin.getName()));

-    if (modIndex != UINT_MAX) {

-      ModInfo::Ptr modInfo = ModInfo::getByIndex(modIndex);

-      modName = modInfo->name();

-    }

-    QList<QTreeWidgetItem*> items = ui->bsaList->findItems(modName, Qt::MatchFixedString);

-    QTreeWidgetItem *subItem = nullptr;

-    if (items.length() > 0) {

-      subItem = items.at(0);

-    } else {

-      subItem = new QTreeWidgetItem(QStringList(modName));

-      subItem->setFlags(subItem->flags() & ~Qt::ItemIsDragEnabled);

-      ui->bsaList->addTopLevelItem(subItem);

-    }

-    subItem->addChild(iter->second);

-    subItem->setExpanded(true);

-  }

-

-  checkBSAList();

-}

-

-

-void MainWindow::checkBSAList()

-{

-  DataArchives *archives = m_OrganizerCore.managedGame()->feature<DataArchives>();

-

-  if (archives != nullptr) {

-    ui->bsaList->blockSignals(true);

-    ON_BLOCK_EXIT([&] () { ui->bsaList->blockSignals(false); });

-

-    QStringList defaultArchives = archives->archives(m_OrganizerCore.currentProfile());

-

-    bool warning = false;

-

-    for (int i = 0; i < ui->bsaList->topLevelItemCount(); ++i) {

-      bool modWarning = false;

-      QTreeWidgetItem *tlItem = ui->bsaList->topLevelItem(i);

-      for (int j = 0; j < tlItem->childCount(); ++j) {

-        QTreeWidgetItem *item = tlItem->child(j);

-        QString filename = item->text(0);

-        item->setIcon(0, QIcon());

-        item->setToolTip(0, QString());

-

-        if (item->checkState(0) == Qt::Unchecked) {

-          if (defaultArchives.contains(filename)) {

-            item->setIcon(0, QIcon(":/MO/gui/warning"));

-            item->setToolTip(0, tr("This bsa is enabled in the ini file so it may be required!"));

-            modWarning = true;

-          }

-        }

-      }

-      if (modWarning) {

-        ui->bsaList->expandItem(ui->bsaList->topLevelItem(i));

-        warning = true;

-      }

-    }

-

-    if (warning) {

-      ui->tabWidget->setTabIcon(1, QIcon(":/MO/gui/warning"));

-    } else {

-      ui->tabWidget->setTabIcon(1, QIcon());

-    }

-  }

-}

-

-

 void MainWindow::saveModMetas()

 {

   for (unsigned int i = 0; i < ModInfo::getNumMods(); ++i) {

@@ -1476,7 +1321,6 @@ void MainWindow::saveModMetas()
   }

 }

 

-

 void MainWindow::fixCategories()

 {

   for (unsigned int i = 0; i < ModInfo::getNumMods(); ++i) {

@@ -1856,8 +1700,10 @@ void MainWindow::setESPListSorting(int index)
 void MainWindow::refresher_progress(int percent)

 {

   if (percent == 100) {

-//    m_RefreshProgress->setVisible(false);

+    m_RefreshProgress->setVisible(false);

+    statusBar()->hide();

   } else if (!m_RefreshProgress->isVisible()) {

+    statusBar()->show();

     m_RefreshProgress->setVisible(true);

     m_RefreshProgress->setRange(0, 100);

     m_RefreshProgress->setValue(percent);

@@ -3815,8 +3661,7 @@ void MainWindow::updateDownloadListDelegate()
 

 void MainWindow::modDetailsUpdated(bool)

 {

-  --m_ModsToUpdate;

-  if (m_ModsToUpdate == 0) {

+  if (--m_ModsToUpdate == 0) {

     statusBar()->hide();

     m_ModListSortProxy->setCategoryFilter(boost::assign::list_of(CategoryFactory::CATEGORY_SPECIAL_UPDATEAVAILABLE));

     for (int i = 0; i < ui->categoriesList->topLevelItemCount(); ++i) {

@@ -4022,19 +3867,6 @@ void MainWindow::displayColumnSelection(const QPoint &pos)
   }

 }

 

-

-void MainWindow::on_bsaList_customContextMenuRequested(const QPoint &pos)

-{

-  m_ContextItem = ui->bsaList->itemAt(pos);

-

-//  m_ContextRow = ui->bsaList->indexOfTopLevelItem(ui->bsaList->itemAt(pos));

-

-  QMenu menu;

-  menu.addAction(tr("Extract..."), this, SLOT(extractBSATriggered()));

-

-  menu.exec(ui->bsaList->mapToGlobal(pos));

-}

-

 void MainWindow::on_actionProblems_triggered()

 {

   ProblemsDialog problems(m_PluginContainer.plugins<IPluginDiagnose>(), this);

@@ -4610,12 +4442,6 @@ void MainWindow::on_categoriesOrBtn_toggled(bool checked)
   }

 }

 

-void MainWindow::on_managedArchiveLabel_linkHovered(const QString&)

-{

-  QToolTip::showText(QCursor::pos(),

-                     ui->managedArchiveLabel->toolTip());

-}

-

 void MainWindow::dragEnterEvent(QDragEnterEvent *event)

 {

   //Accept copy or move drags to the download window. Link drags are not

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 279c8922..44f46f4b 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -88,7 +88,6 @@ public:
   virtual bool unlockClicked() override;

 

   bool addProfile();

-  void updateBSAList(const QStringList &defaultArchives, const QStringList &activeArchives);

   void refreshDataTree();

   void refreshSaveList();

 

@@ -439,8 +438,6 @@ private slots:
 

   void startExeAction();

 

-  void checkBSAList();

-

   void updateProblemsButton();

 

   void saveModMetas();

@@ -494,7 +491,6 @@ private slots: // ui slots
   void on_actionUpdate_triggered();

   void on_actionEndorseMO_triggered();

 

-  void on_bsaList_customContextMenuRequested(const QPoint &pos);

   void on_btnRefreshData_clicked();

   void on_categoriesList_customContextMenuRequested(const QPoint &pos);

   void on_conflictsCheckBox_toggled(bool checked);

@@ -522,7 +518,6 @@ private slots: // ui slots
   void on_actionCopy_Log_to_Clipboard_triggered();

   void on_categoriesAndBtn_toggled(bool checked);

   void on_categoriesOrBtn_toggled(bool checked);

-  void on_managedArchiveLabel_linkHovered(const QString &link);

 };

 

 

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 7d7eeca8..02319bee 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -884,102 +884,6 @@ p, li { white-space: pre-wrap; }
                 </item>

                </layout>

               </widget>

-              <widget class="QWidget" name="bsaTab">

-               <attribute name="title">

-                <string>Archives</string>

-               </attribute>

-               <layout class="QVBoxLayout" name="verticalLayout_9">

-                <property name="leftMargin">

-                 <number>6</number>

-                </property>

-                <property name="topMargin">

-                 <number>6</number>

-                </property>

-                <property name="rightMargin">

-                 <number>6</number>

-                </property>

-                <property name="bottomMargin">

-                 <number>6</number>

-                </property>

-                <item>

-                 <layout class="QHBoxLayout" name="horizontalLayout_9" stretch="0">

-                  <item>

-                   <widget class="QLabel" name="managedArchiveLabel">

-                    <property name="toolTip">

-                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;BSAs are bundles of game assets (textures, scripts, ...). By default, the engine loads these bundles in a separate step from loose files. MO can manage those archives to align their load order with that of loose files:&lt;/p&gt;&lt;p&gt;If archives are &lt;span style=&quot; font-weight:600;&quot;&gt;managed&lt;/span&gt;, their load order is specified by the priority of the corresponding mod (left pane), the same as the loose files. You can manually enable any BSA that has no corresponding plugin active.&lt;br/&gt;&lt;/p&gt;&lt;p&gt;If archives are &lt;span style=&quot; font-weight:600;&quot;&gt;not managed&lt;/span&gt; their load order is specified by the priority of the corresponding plugin (right pane, plugins tab). You can then not manually enable BSAs where the plugin isn't active.&lt;/p&gt;&lt;p&gt;In either case you can not disable archives if there is a matching plugin, the game will load them no matter what.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

-                    </property>

-                    <property name="text">

-                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Archive order follows Plugin order.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

-                    </property>

-                    <property name="wordWrap">

-                     <bool>true</bool>

-                    </property>

-                   </widget>

-                  </item>

-                 </layout>

-                </item>

-                <item>

-                 <widget class="MOBase::SortableTreeWidget" name="bsaList">

-                  <property name="contextMenuPolicy">

-                   <enum>Qt::CustomContextMenu</enum>

-                  </property>

-                  <property name="toolTip">

-                   <string>List of available BS Archives. Archives not checked here are not managed by MO and ignore installation order.</string>

-                  </property>

-                  <property name="whatsThis">

-                   <string>BSA files are archives (comparable to .zip files) that contain data assets (meshes, textures, ...) to be used by the game. As such they &quot;compete&quot; with loose files in your data directory over which is loaded.

-By default, BSAs that share their base name with an enabled ESP (i.e. plugin.esp and plugin.bsa) are automatically loaded and will have precedence over all loose files, the installation order you set up to the left is then ignored!

-

-BSAs checked here are loaded in such a way that your installation order is obeyed properly.</string>

-                  </property>

-                  <property name="editTriggers">

-                   <set>QAbstractItemView::NoEditTriggers</set>

-                  </property>

-                  <property name="showDropIndicator" stdset="0">

-                   <bool>true</bool>

-                  </property>

-                  <property name="dragEnabled">

-                   <bool>false</bool>

-                  </property>

-                  <property name="dragDropOverwriteMode">

-                   <bool>false</bool>

-                  </property>

-                  <property name="dragDropMode">

-                   <enum>QAbstractItemView::DragDrop</enum>

-                  </property>

-                  <property name="defaultDropAction">

-                   <enum>Qt::MoveAction</enum>

-                  </property>

-                  <property name="selectionMode">

-                   <enum>QAbstractItemView::SingleSelection</enum>

-                  </property>

-                  <property name="selectionBehavior">

-                   <enum>QAbstractItemView::SelectRows</enum>

-                  </property>

-                  <property name="indentation">

-                   <number>20</number>

-                  </property>

-                  <property name="itemsExpandable">

-                   <bool>true</bool>

-                  </property>

-                  <property name="columnCount">

-                   <number>1</number>

-                  </property>

-                  <attribute name="headerVisible">

-                   <bool>false</bool>

-                  </attribute>

-                  <attribute name="headerDefaultSectionSize">

-                   <number>200</number>

-                  </attribute>

-                  <column>

-                   <property name="text">

-                    <string>File</string>

-                   </property>

-                  </column>

-                 </widget>

-                </item>

-               </layout>

-              </widget>

               <widget class="QWidget" name="dataTab">

                <attribute name="title">

                 <string>Data</string>

@@ -1477,11 +1381,6 @@ Right now this has very limited functionality</string>
    <extends>QTreeView</extends>

    <header>modlistview.h</header>

   </customwidget>

-  <customwidget>

-   <class>MOBase::SortableTreeWidget</class>

-   <extends>QTreeWidget</extends>

-   <header>sortabletreewidget.h</header>

-  </customwidget>

  </customwidgets>

  <resources>

   <include location="resources.qrc"/>

diff --git a/src/usvfsconnector.cpp b/src/usvfsconnector.cpp
index 62145475..a29d806e 100644
--- a/src/usvfsconnector.cpp
+++ b/src/usvfsconnector.cpp
@@ -22,6 +22,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <memory>
 #include <QTemporaryFile>
 #include <QProgressDialog>
+#include <QDateTime>
 #include <QCoreApplication>
 
 
@@ -53,10 +54,13 @@ extern "C" DLLEXPORT void __cdecl InitHooks(LPVOID userData, size_t userDataSize
 LogWorker::LogWorker()
   : m_Buffer(1024, '\0')
   , m_QuitRequested(false)
-  , m_LogFile(qApp->property("dataPath").toString() + "/logs/usvfs.log")
+  , m_LogFile(qApp->property("dataPath").toString()
+              + QString("/logs/usvfs-%1.log").arg(
+                QDateTime::currentDateTimeUtc().toString("yyyy-MM-dd_hh-mm-ss")))
 {
   m_LogFile.open(QIODevice::WriteOnly);
-  qDebug("usvfs log messages are written to %s", qPrintable(m_LogFile.fileName()));
+  qDebug("usvfs log messages are written to %s",
+         qPrintable(m_LogFile.fileName()));
 }
 
 LogWorker::~LogWorker()