Merge pull request #75 from rodlie/6.1-wip

6.1.4 fixes

Author: rodlie

AUTHORS

@@ -1,6 +1,6 @@
 Developers:
 
- * Ole-André Rodlie (5.2018
+ * Ole-André Rodlie
    <ole.andre.rodlie@gmail.com>
  * Michal Rost (8.2012 - 5.2013)
    <rost.michal@gmail.com>

ChangeLog

@@ -1,5 +1,10 @@
-6.1.4 XX-October 2018
+6.1.4 23-November 2018
 - fix potential config corruption. Thanks to @slackuser0xae34 for the patch
+- fix segfault on thumbnail update (view may have changed since loading thumbnails)
+- don't cut file(s) if moving to same directory in bookmarks
+- verify reply from udisks (avoid crash)
+- populate view if not watched
+- fix refresh view
 
 6.1.3 07-October 2018
 - update grid on paste/remove

README.md

@@ -133,7 +133,7 @@ make INSTALL_ROOT=/package_temp_path install
 
 ## Related
 
- * **[powerdwarf](https://github.com/rodlie/powerdwarf)** : Desktop Independent Power Manager.
+ * **[powerkit](https://github.com/rodlie/powerkit)** : Desktop Independent Power Manager.
  * **[Openbox](http://openbox.org/wiki/Main_Page)** : Openbox is a highly configurable, next generation window manager with extensive standards support.
  * **[tint2](https://gitlab.com/o9000/tint2)** : A lightweight panel/taskbar for Linux and BSD.
  * **[qterminal](https://github.com/lxqt/qterminal)** : A lightweight Qt-based terminal emulator.

fm/qtfm.1

@@ -29,4 +29,4 @@ qtfm-tray(1)
 .SH BUGS
 See https://github.com/rodlie/qtfm/issues
 .SH AUTHOR
-Ole-Andre Rodlie (ole.andre.rodlie@gmail.com)
+Ole-Andre Rodlie, Michal Rost, Wittfella.

fm/src/bookmarks.cpp

@@ -230,14 +230,17 @@ bool bookmarkmodel::dropMimeData(const QMimeData * data,Qt::DropAction action,in
         return false;
       }
     }
+
     foreach(QUrl path, files) {
         QFileInfo file(path.toLocalFile());
         //drag to bookmark window, add a new bookmark
         if(parent.column() == -1) {
             if(file.isDir()) this->addBookmark(file.fileName(),file.filePath(),0,"");
             return false;
         } else {
-            if (mode == Common::DM_MOVE) { cutList.append(file.filePath()); }
+            if (mode == Common::DM_MOVE) {
+                if (file.absoluteDir() != parentPath) { cutList.append(file.filePath()); }
+            }
         }
     }
 

fm/src/mainwindow.cpp

@@ -378,8 +378,8 @@ void MainWindow::lateStart() {
   connect(detailTree, SIGNAL(pressed(QModelIndex)),
           this, SLOT(listItemPressed(QModelIndex)));
 
-  connect(modelList, SIGNAL(thumbUpdate(QModelIndex)),
-          this, SLOT(thumbUpdate(QModelIndex)));
+  connect(modelList, SIGNAL(thumbUpdate()),
+          this, SLOT(thumbUpdate()));
 
   qApp->setKeyboardInputInterval(1000);
 
@@ -708,12 +708,9 @@ void MainWindow::dirLoaded()
     updateGrid();
 }
 
-//---------------------------------------------------------------------------
-void MainWindow::thumbUpdate(QModelIndex index)
+void MainWindow::thumbUpdate()
 {
-    qDebug() << "thumbUpdate";
-    if (currentView == 2) { detailTree->update(modelView->mapFromSource(index)); }
-    else { list->update(modelView->mapFromSource(index)); }
+    refresh(false, false);
 }
 
 //---------------------------------------------------------------------------
@@ -1532,15 +1529,17 @@ QMenu* MainWindow::createOpenWithMenu() {
   return openMenu;
 }
 
-void MainWindow::refresh()
+void MainWindow::refresh(bool modelRefresh, bool loadDir)
 {
     qDebug() << "refresh";
-    modelList->refreshItems();
-    modelList->update();
+    if (modelRefresh) {
+        modelList->refreshItems();
+        modelList->update();
+    }
     QModelIndex baseIndex = modelView->mapFromSource(modelList->index(pathEdit->currentText()));
     if (currentView == 2) { detailTree->setRootIndex(baseIndex); }
     else { list->setRootIndex(baseIndex); }
-    dirLoaded();
+    if (loadDir) { dirLoaded(); }
 }
 //---------------------------------------------------------------------------
 

fm/src/mainwindow.h

@@ -277,7 +277,7 @@ public slots:
     void openFolderAction();
     void exitAction();
     void dirLoaded();
-    void thumbUpdate(QModelIndex);
+    void thumbUpdate();
     void addressChanged(int,int);
     void loadSettings(bool wState = true, bool hState = true, bool tabState = true, bool thumbState = true);
     void firstRunBookmarks(bool isFirstRun);
@@ -312,7 +312,7 @@ private slots:
     void clearCache();
     void handlePathRequested(QString path);
     void slowPathEdit();
-    void refresh();
+    void refresh(bool modelRefresh = true, bool loadDir = true);
 private:
     void createActions();
     void createActionIcons();

fm/src/mymodel.cpp

@@ -177,6 +177,7 @@ QModelIndex myModel::parent(const QModelIndex &index) const
 //---------------------------------------------------------------------------------------
 bool myModel::isDir(const QModelIndex &index)
 {
+    if (!index.isValid()) { return false; }
     myModelItem *item = static_cast<myModelItem*>(index.internalPointer());
     if(item && item != rootItem) { return item->fileInfo().isDir(); }
     return false;
@@ -185,6 +186,7 @@ bool myModel::isDir(const QModelIndex &index)
 //---------------------------------------------------------------------------------------
 QFileInfo myModel::fileInfo(const QModelIndex &index)
 {
+    if (!index.isValid()) { return QFileInfo(); }
     myModelItem *item = static_cast<myModelItem*>(index.internalPointer());
     if(item) { return item->fileInfo(); }
     return QFileInfo();
@@ -193,6 +195,7 @@ QFileInfo myModel::fileInfo(const QModelIndex &index)
 //---------------------------------------------------------------------------------------
 qint64 myModel::size(const QModelIndex &index)
 {
+    if (!index.isValid()) { return 0; }
     myModelItem *item = static_cast<myModelItem*>(index.internalPointer());
     if(item) { return item->fileInfo().size(); }
     return 0;
@@ -201,14 +204,16 @@ qint64 myModel::size(const QModelIndex &index)
 //---------------------------------------------------------------------------------------
 QString myModel::fileName(const QModelIndex &index)
 {
+    if (!index.isValid()) { return QString(); }
     myModelItem *item = static_cast<myModelItem*>(index.internalPointer());
     if(item) { return item->fileName(); }
-    return "";
+    return QString();
 }
 
 //---------------------------------------------------------------------------------------
 QString myModel::filePath(const QModelIndex &index)
 {
+    if (!index.isValid()) { return QString(); }
     myModelItem *item = static_cast<myModelItem*>(index.internalPointer());
     if(item) { return item->absoluteFilePath(); }
     return QString();
@@ -217,6 +222,7 @@ QString myModel::filePath(const QModelIndex &index)
 //---------------------------------------------------------------------------------------
 QString myModel::getMimeType(const QModelIndex &index)
 {
+    if (!index.isValid()) { return QString(); }
     qDebug() << "myModel getMimeType";
     myModelItem *item = static_cast<myModelItem*>(index.internalPointer());
     if(item->mMimeType.isNull()) {
@@ -341,14 +347,13 @@ bool myModel::setRootPath(const QString& path)
         return false;
     }
 
-    if(item->watched == 0) { addWatcher(item); }
-
-    if(item->walked == 0) {
+    if (!item->watched) { addWatcher(item); }
+    if (!item->walked || !item->watched) {
         populateItem(item);
         return false;
     } else {
         if(item->dirty) { //model is up to date, but view needs to be invalidated
-            item->dirty = 0;
+            item->dirty = false;
             return true;
         }
     }
@@ -378,12 +383,10 @@ void myModel::fetchMore (const QModelIndex & parent)
 {
     myModelItem *item = static_cast<myModelItem*>(parent.internalPointer());
 
-    if(item) {
+    if (item) {
         populateItem(item);
         emit dataChanged(parent,parent);
     }
-
-    return;
 }
 
 //---------------------------------------------------------------------------------------
@@ -422,14 +425,15 @@ void myModel::refresh()
     watchers.clear();
 
     beginResetModel();
-    item->clearAll();
+    if (item) { item->clearAll(); }
     endResetModel();
 }
 
 //---------------------------------------------------------------------------------
 void myModel::update()
 {
     myModelItem *item = rootItem->matchPath(currentRootPath.split(SEPARATOR));
+    if (item == NULL) { return; }
     foreach(myModelItem *child, item->children()) { child->refreshFileInfo(); }
 }
 
@@ -619,7 +623,6 @@ void myModel::loadThumbs(QModelIndexList indexes) {
       if (!thumbs->contains(item) || (item.split("/").takeLast() == lastEventFilename && !lastEventFilename.isEmpty())) {
           qDebug() << "gen new thumb" << item;
           thumbs->insert(item, getThumb(item));
-          emit thumbUpdate(index(item));
           if (item.split("/").takeLast() == lastEventFilename) {
               qDebug() << "save new thumb cache";
               lastEventFilename.clear();
@@ -634,10 +637,9 @@ void myModel::loadThumbs(QModelIndexList indexes) {
                   }
               }
           }
-      } else {
-          emit thumbUpdate(index(item));
       }
     }
+    emit thumbUpdate();
   }
 }
 
@@ -650,6 +652,8 @@ void myModel::loadThumbs(QModelIndexList indexes) {
  */
 QByteArray myModel::getThumb(QString item) {
 
+  if (item.isEmpty()) { return QByteArray(); }
+
   // Thumbnail image
   QImage theThumb, background;
   QImageReader pic(item);
@@ -808,6 +812,8 @@ QVariant myModel::data(const QModelIndex & index, int role) const {
  */
 QVariant myModel::findIcon(myModelItem *item) const {
 
+  if (item == NULL) { return  QIcon(); }
+
   //qDebug() << "findicon" << item->absoluteFilePath();
   // If type of file is directory, return icon of directory
   QFileInfo type(item->fileInfo());
@@ -891,6 +897,8 @@ QVariant myModel::findIcon(myModelItem *item) const {
  */
 QVariant myModel::findMimeIcon(myModelItem *item) const {
 
+  if (item == NULL) { return QIcon(); }
+
   // Retrieve mime and search cache for it
   QString mime = mimeUtilsPtr->getMimeType(item->absoluteFilePath());
   if (mimeIcons->contains(mime)) {

fm/src/mymodel.h

@@ -89,7 +89,7 @@ public slots:
 signals:
   void dragDropPaste(const QMimeData *data, QString newPath,
                      Common::DragMode mode = Common::DM_UNKNOWN);
-  void thumbUpdate(const QModelIndex index);
+  void thumbUpdate();
   void reloadDir();
 protected:
   QVariant data(const QModelIndex & index, int role) const;