mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added support for dropping folders to import them. TODO update the foldersView properly (now all the tree model is reloaded).

Browse Source
This commit is contained in:
Luis Ángel San Martín 2014-10-14 23:24:27 +02:00
parent 5e355f85bf
commit 46e4cfceb9
13 changed files with 223 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
YACReaderLibrary/comic_files_manager.cpp
View File

@ -5,30 +5,61 @@
#include <QsLog.h> #include <QsLog.h>
#include "comic.h"
ComicFilesManager::ComicFilesManager(QObject *parent) : ComicFilesManager::ComicFilesManager(QObject *parent) :
QObject(parent), canceled(false) QObject(parent), canceled(false)
{ {
} }
void ComicFilesManager::copyComicsTo(const QList<QString> &sourceComics, const QString &folderDest) void ComicFilesManager::copyComicsTo(const QList<QPair<QString,QString> > &sourceComics, const QString &folderDest)
{ {
comics = sourceComics; comics = sourceComics;
folder = folderDest; folder = folderDest;
move = false; move = false;
} }
void ComicFilesManager::moveComicsTo(const QList<QString> &sourceComics, const QString &folderDest) void ComicFilesManager::moveComicsTo(const QList<QPair<QString, QString> > &sourceComics, const QString &folderDest)
{ {
comics = sourceComics; comics = sourceComics;
folder = folderDest; folder = folderDest;
move = true; move = true;
} }
QList<QPair<QString, QString> > ComicFilesManager::getDroppedFiles(const QList<QUrl> &urls)
{
QList<QPair<QString,QString> > dropedFiles;
QString currentPath;
foreach(QUrl url, urls)
{
currentPath = url.toLocalFile();
if(Comic::fileIsComic(currentPath))
dropedFiles << QPair<QString, QString>(currentPath,"/");
else
{
QFileInfo info(currentPath);
if(info.isDir())
{
foreach(QString comicPath, Comic::findValidComicFilesInFolder(info.absoluteFilePath()))
{
QFileInfo comicInfo(comicPath);
QString path = comicInfo.absolutePath();
dropedFiles << QPair<QString, QString>(comicPath, path.remove(info.absolutePath()));
}
}
}
}
return dropedFiles;
}
void ComicFilesManager::process() void ComicFilesManager::process()
{ {
int i=0; int i=0;
bool successProcesingFiles = false; bool successProcesingFiles = false;
foreach (QString source, comics) { QPair<QString, QString> source;
foreach (source, comics) {
if(canceled) if(canceled)
{ {
@ -39,12 +70,17 @@ void ComicFilesManager::process()
return; //TODO rollback? return; //TODO rollback?
} }
QFileInfo info(source); QFileInfo info(source.first);
if(QFile::copy(source, QDir::cleanPath(folder+'/'+info.fileName()))) QString destPath = QDir::cleanPath(folder+'/'+source.second);
QLOG_DEBUG() << "crear : " << destPath;
QDir().mkpath(destPath);
if(QFile::copy(source.first, QDir::cleanPath(destPath+'/'+info.fileName())))
{ {
successProcesingFiles = true; successProcesingFiles = true;
if(move) if(move)
QFile::remove(source); {
QFile::remove(source.first); //TODO: remove the whole path....
}
} }
i++; i++;

8
YACReaderLibrary/comic_files_manager.h
View File

@ -9,9 +9,9 @@ class ComicFilesManager : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit ComicFilesManager(QObject *parent = 0); explicit ComicFilesManager(QObject *parent = 0);
void copyComicsTo(const QList<QString> & sourceComics, const QString & folderDest); void copyComicsTo(const QList<QPair<QString,QString> > & sourceComics, const QString & folderDest);
void moveComicsTo(const QList<QString> & comics, const QString & folderDest); void moveComicsTo(const QList<QPair<QString,QString> > & comics, const QString & folderDest);
static QList<QPair<QString, QString> > getDroppedFiles(const QList<QUrl> & urls);
signals: signals:
void currentComic(QString); void currentComic(QString);
void progress(int); void progress(int);
@ -24,7 +24,7 @@ public slots:
protected: protected:
bool move; bool move;
bool canceled; bool canceled;
QList<QString> comics; QList<QPair<QString,QString> > comics;
QString folder; QString folder;
}; };

26
YACReaderLibrary/comics_view.cpp
View File

@ -1,5 +1,6 @@
#include "comics_view.h" #include "comics_view.h"
#include "comic.h" #include "comic.h"
#include "comic_files_manager.h"
#include "QsLog.h" #include "QsLog.h"
@ -21,9 +22,12 @@ void ComicsView::dragEnterEvent(QDragEnterEvent *event)
if (event->mimeData()->hasUrls()) if (event->mimeData()->hasUrls())
{ {
urlList = event->mimeData()->urls(); urlList = event->mimeData()->urls();
QString currentPath;
foreach (QUrl url, urlList) foreach (QUrl url, urlList)
{ {
if(Comic::fileIsComic(url)) //comics or folders are accepted, folders' content is validate in dropEvent (avoid any lag before droping)
currentPath = url.toLocalFile();
if(Comic::fileIsComic(currentPath) || QFileInfo(currentPath).isDir())
{ {
event->acceptProposedAction(); event->acceptProposedAction();
return; return;
@ -34,20 +38,26 @@ void ComicsView::dragEnterEvent(QDragEnterEvent *event)
void ComicsView::dropEvent(QDropEvent *event) void ComicsView::dropEvent(QDropEvent *event)
{ {
bool accepted = false;
QLOG_DEBUG() << "drop" << event->dropAction(); QLOG_DEBUG() << "drop" << event->dropAction();
bool validAction = event->dropAction() == Qt::CopyAction || event->dropAction() & Qt::MoveAction;
if(validAction)
{
QList<QPair<QString, QString> > droppedFiles = ComicFilesManager::getDroppedFiles(event->mimeData()->urls());
if(event->dropAction() == Qt::CopyAction) if(event->dropAction() == Qt::CopyAction)
{ {
QLOG_DEBUG() << "copy"; QLOG_DEBUG() << "copy :" << droppedFiles;
emit copyComicsToCurrentFolder(Comic::filterInvalidComicFiles(event->mimeData()->urls())); emit copyComicsToCurrentFolder(droppedFiles);
} }
else if(event->dropAction() & Qt::MoveAction) else if(event->dropAction() & Qt::MoveAction)
{ {
QLOG_DEBUG() << "move"; QLOG_DEBUG() << "move :" << droppedFiles;
emit moveComicsToCurrentFolder(Comic::filterInvalidComicFiles(event->mimeData()->urls())); emit moveComicsToCurrentFolder(droppedFiles);
} }
if(accepted)
event->acceptProposedAction(); event->acceptProposedAction();
} }
}

4
YACReaderLibrary/comics_view.h
View File

@ -35,8 +35,8 @@ signals:
void comicRated(int,QModelIndex); void comicRated(int,QModelIndex);
//Drops //Drops
void copyComicsToCurrentFolder(QList<QString>); void copyComicsToCurrentFolder(QList<QPair<QString, QString> >);
void moveComicsToCurrentFolder(QList<QString>); void moveComicsToCurrentFolder(QList<QPair<QString, QString> >);
public slots: public slots:
virtual void setShowMarks(bool show) = 0; virtual void setShowMarks(bool show) = 0;

5
YACReaderLibrary/db/treemodel.cpp
View File

@ -544,3 +544,8 @@ QStringList TreeModel::getSubfoldersNames(const QModelIndex &mi)
qSort(result.begin(),result.end(),naturalSortLessThanCI); qSort(result.begin(),result.end(),naturalSortLessThanCI);
return result; return result;
} }
void TreeModel::fetchMore(const QModelIndex &parent)
{
}

2
YACReaderLibrary/db/treemodel.h
View File

@ -87,6 +87,8 @@ public:
QStringList getSubfoldersNames(const QModelIndex & mi); QStringList getSubfoldersNames(const QModelIndex & mi);
void fetchMore(const QModelIndex & parent);
enum Columns { enum Columns {
Name = 0, Name = 0,
Path = 1, Path = 1,

11
YACReaderLibrary/library_creator.cpp
View File

@ -38,7 +38,7 @@ using namespace std;
LibraryCreator::LibraryCreator() LibraryCreator::LibraryCreator()
:creation(false), partialUpdate(false) :creation(false), partialUpdate(false)
{ {
_nameFilter << "*.cbr" << "*.cbz" << "*.rar" << "*.zip" << "*.tar" << "*.pdf" << "*.7z" << "*.cb7" << "*.arj" << "*.cbt"; _nameFilter << Comic::comicExtensions;
} }
void LibraryCreator::createLibrary(const QString &source, const QString &target) void LibraryCreator::createLibrary(const QString &source, const QString &target)
@ -66,11 +66,18 @@ void LibraryCreator::updateFolder(const QString &source, const QString &target,
if(relativeFolderPath.startsWith("/")) if(relativeFolderPath.startsWith("/"))
relativeFolderPath = relativeFolderPath.remove(0,1);//remove firts '/' relativeFolderPath = relativeFolderPath.remove(0,1);//remove firts '/'
QStringList folders = relativeFolderPath.split('/'); QStringList folders;
if(!relativeFolderPath.isEmpty()) //updating root
folders = relativeFolderPath.split('/');
QLOG_DEBUG() << "folders found in relative path : " << folders << "-" << relativeFolderPath;
QSqlDatabase db = DataBaseManagement::loadDatabase(target); QSqlDatabase db = DataBaseManagement::loadDatabase(target);
foreach (QString folderName, folders) { foreach (QString folderName, folders) {
if(folderName.isEmpty())
break;
qulonglong parentId = _currentPathFolders.last().id; qulonglong parentId = _currentPathFolders.last().id;
_currentPathFolders.append(DBHelper::loadFolder(folderName, parentId, db)); _currentPathFolders.append(DBHelper::loadFolder(folderName, parentId, db));
QLOG_DEBUG() << "Folder appended : " << _currentPathFolders.last().id << " " << _currentPathFolders.last().name << " with parent" << _currentPathFolders.last().parentId; QLOG_DEBUG() << "Folder appended : " << _currentPathFolders.last().id << " " << _currentPathFolders.last().name << " with parent" << _currentPathFolders.last().parentId;

37
YACReaderLibrary/library_window.cpp
View File

@ -392,8 +392,8 @@ void LibraryWindow::disconnectComicsViewConnections(ComicsView * widget)
disconnect(widget,SIGNAL(selected(unsigned int)),this,SLOT(openComic())); disconnect(widget,SIGNAL(selected(unsigned int)),this,SLOT(openComic()));
disconnect(widget,SIGNAL(doubleClicked(QModelIndex)),this,SLOT(openComic())); disconnect(widget,SIGNAL(doubleClicked(QModelIndex)),this,SLOT(openComic()));
disconnect(selectAllComicsAction,SIGNAL(triggered()),widget,SLOT(selectAll())); disconnect(selectAllComicsAction,SIGNAL(triggered()),widget,SLOT(selectAll()));
disconnect(comicsView, SIGNAL(copyComicsToCurrentFolder(QList<QString>)), this, SLOT(copyAndImportComicsToCurrentFolder(QList<QString>))); disconnect(comicsView, SIGNAL(copyComicsToCurrentFolder(QList<QPair<QString, QString> >)), this, SLOT(copyAndImportComicsToCurrentFolder(QList<QPair<QString, QString> >)));
disconnect(comicsView, SIGNAL(moveComicsToCurrentFolder(QList<QString>)), this, SLOT(moveAndImportComicsToCurrentFolder(QList<QString>))); disconnect(comicsView, SIGNAL(moveComicsToCurrentFolder(QList<QPair<QString, QString> >)), this, SLOT(moveAndImportComicsToCurrentFolder(QList<QPair<QString, QString> >)));
} }
void LibraryWindow::doComicsViewConnections() void LibraryWindow::doComicsViewConnections()
@ -404,8 +404,8 @@ void LibraryWindow::doComicsViewConnections()
connect(comicsView,SIGNAL(doubleClicked(QModelIndex)),this,SLOT(openComic())); connect(comicsView,SIGNAL(doubleClicked(QModelIndex)),this,SLOT(openComic()));
connect(selectAllComicsAction,SIGNAL(triggered()),comicsView,SLOT(selectAll())); connect(selectAllComicsAction,SIGNAL(triggered()),comicsView,SLOT(selectAll()));
//Drops //Drops
connect(comicsView, SIGNAL(copyComicsToCurrentFolder(QList<QString>)), this, SLOT(copyAndImportComicsToCurrentFolder(QList<QString>))); connect(comicsView, SIGNAL(copyComicsToCurrentFolder(QList<QPair<QString, QString> >)), this, SLOT(copyAndImportComicsToCurrentFolder(QList<QPair<QString, QString> >)));
connect(comicsView, SIGNAL(moveComicsToCurrentFolder(QList<QString>)), this, SLOT(moveAndImportComicsToCurrentFolder(QList<QString>))); connect(comicsView, SIGNAL(moveComicsToCurrentFolder(QList<QPair<QString, QString> >)), this, SLOT(moveAndImportComicsToCurrentFolder(QList<QPair<QString, QString> >)));
} }
void LibraryWindow::createActions() void LibraryWindow::createActions()
@ -993,8 +993,8 @@ void LibraryWindow::createConnections()
connect(foldersView, SIGNAL(clicked(QModelIndex)), this, SLOT(updateHistory(QModelIndex))); connect(foldersView, SIGNAL(clicked(QModelIndex)), this, SLOT(updateHistory(QModelIndex)));
//drops in folders view //drops in folders view
connect(foldersView, SIGNAL(copyComicsToFolder(QList<QString>,QModelIndex)), this, SLOT(copyAndImportComicsToFolder(QList<QString>,QModelIndex))); connect(foldersView, SIGNAL(copyComicsToFolder(QList<QPair<QString,QString> >,QModelIndex)), this, SLOT(copyAndImportComicsToFolder(QList<QPair<QString,QString> >,QModelIndex)));
connect(foldersView, SIGNAL(moveComicsToFolder(QList<QString>,QModelIndex)), this, SLOT(moveAndImportComicsToFolder(QList<QString>,QModelIndex))); connect(foldersView, SIGNAL(moveComicsToFolder(QList<QPair<QString,QString> >,QModelIndex)), this, SLOT(moveAndImportComicsToFolder(QList<QPair<QString,QString> >,QModelIndex)));
//actions //actions
connect(createLibraryAction,SIGNAL(triggered()),this,SLOT(createLibrary())); connect(createLibraryAction,SIGNAL(triggered()),this,SLOT(createLibrary()));
@ -1282,7 +1282,10 @@ void LibraryWindow::loadCoversFromCurrentModel()
} }
} }
void LibraryWindow::copyAndImportComicsToCurrentFolder(const QList<QString> &comics) void LibraryWindow::copyAndImportComicsToCurrentFolder(const QList<QPair<QString, QString> > &comics)
{
QLOG_DEBUG() << "-copyAndImportComicsToCurrentFolder-";
if(comics.size()>0)
{ {
QString destFolderPath = currentFolderPath(); QString destFolderPath = currentFolderPath();
@ -1295,8 +1298,12 @@ void LibraryWindow::copyAndImportComicsToCurrentFolder(const QList<QString> &com
processComicFiles(comicFilesManager, progressDialog); processComicFiles(comicFilesManager, progressDialog);
} }
}
void LibraryWindow::moveAndImportComicsToCurrentFolder(const QList<QString> &comics) void LibraryWindow::moveAndImportComicsToCurrentFolder(const QList<QPair<QString,QString> > &comics)
{
QLOG_DEBUG() << "-moveAndImportComicsToCurrentFolder-";
if(comics.size()>0)
{ {
QString destFolderPath = currentFolderPath(); QString destFolderPath = currentFolderPath();
@ -1309,10 +1316,12 @@ void LibraryWindow::moveAndImportComicsToCurrentFolder(const QList<QString> &com
processComicFiles(comicFilesManager, progressDialog); processComicFiles(comicFilesManager, progressDialog);
} }
}
void LibraryWindow::copyAndImportComicsToFolder(const QList<QString> &comics, const QModelIndex &miFolder) void LibraryWindow::copyAndImportComicsToFolder(const QList<QPair<QString,QString> > &comics, const QModelIndex &miFolder)
{ {
if(miFolder.isValid()) QLOG_DEBUG() << "-copyAndImportComicsToFolder-";
if(comics.size()>0)
{ {
QString destFolderPath = QDir::cleanPath(currentPath()+foldersModel->getFolderPath(miFolder)); QString destFolderPath = QDir::cleanPath(currentPath()+foldersModel->getFolderPath(miFolder));
@ -1329,9 +1338,10 @@ void LibraryWindow::copyAndImportComicsToFolder(const QList<QString> &comics, co
} }
} }
void LibraryWindow::moveAndImportComicsToFolder(const QList<QString> &comics, const QModelIndex &miFolder) void LibraryWindow::moveAndImportComicsToFolder(const QList<QPair<QString, QString> > &comics, const QModelIndex &miFolder)
{ {
if(miFolder.isValid()) QLOG_DEBUG() << "-moveAndImportComicsToFolder-";
if(comics.size()>0)
{ {
QString destFolderPath = QDir::cleanPath(currentPath()+foldersModel->getFolderPath(miFolder)); QString destFolderPath = QDir::cleanPath(currentPath()+foldersModel->getFolderPath(miFolder));
@ -1415,6 +1425,9 @@ void LibraryWindow::reloadAfterCopyMove()
if(getCurrentFolderIndex() == updateDestination) if(getCurrentFolderIndex() == updateDestination)
reloadCovers(); reloadCovers();
//TODO do not reload the whole model, just the current folder...
foldersModel->setupModelData(QDir::cleanPath(libraries.getPath(selectedLibrary->currentText())+"/.yacreaderlibrary"));
enableNeededActions(); enableNeededActions();
} }

8
YACReaderLibrary/library_window.h
View File

@ -326,10 +326,10 @@ public slots:
void toggleComicsView(); void toggleComicsView();
void checkSearchNumResults(int numResults); void checkSearchNumResults(int numResults);
void loadCoversFromCurrentModel(); void loadCoversFromCurrentModel();
void copyAndImportComicsToCurrentFolder(const QList<QString> & comics); void copyAndImportComicsToCurrentFolder(const QList<QPair<QString,QString> > & comics);
void moveAndImportComicsToCurrentFolder(const QList<QString> &comics); void moveAndImportComicsToCurrentFolder(const QList<QPair<QString, QString> > &comics);
void copyAndImportComicsToFolder(const QList<QString> & comics, const QModelIndex & miFolder); void copyAndImportComicsToFolder(const QList<QPair<QString,QString> > & comics, const QModelIndex & miFolder);
void moveAndImportComicsToFolder(const QList<QString> & comics, const QModelIndex & miFolder); void moveAndImportComicsToFolder(const QList<QPair<QString,QString> > & comics, const QModelIndex & miFolder);
void processComicFiles(ComicFilesManager * comicFilesManager, QProgressDialog * progressDialog); void processComicFiles(ComicFilesManager * comicFilesManager, QProgressDialog * progressDialog);
void updateCopyMoveFolderDestination(); //imports new comics from the current folder void updateCopyMoveFolderDestination(); //imports new comics from the current folder
void updateCurrentFolder(); void updateCurrentFolder();

54
common/comic.cpp
View File

@ -13,11 +13,13 @@
#include "compressed_archive.h" #include "compressed_archive.h"
#include "comic_db.h" #include "comic_db.h"
QStringList Comic::imageExtensions = QStringList() << "*.jpg" << "*.jpeg" << "*.png" << "*.gif" << "*.tiff" << "*.tif" << "*.bmp"; #include "QsLog.h"
QStringList Comic::literalImageExtensions = QStringList() << "jpg" << "jpeg" << "png" << "gif" << "tiff" << "tif" << "bmp";
QStringList Comic::comicExtensions = QStringList() << "*.cbr" << "*.cbz" << "*.rar" << "*.zip" << "*.tar" << "*.pdf" << "*.7z" << "*.cb7" << "*.arj" << "*.cbt"; const QStringList Comic::imageExtensions = QStringList() << "*.jpg" << "*.jpeg" << "*.png" << "*.gif" << "*.tiff" << "*.tif" << "*.bmp";
QStringList Comic::literalComicExtensions = QStringList() << "cbr" << "cbz" << "rar" << "zip" << "tar" << "pdf" << "7z" << "cb7" << "arj" << "cbt"; const QStringList Comic::literalImageExtensions = QStringList() << "jpg" << "jpeg" << "png" << "gif" << "tiff" << "tif" << "bmp";
const QStringList Comic::comicExtensions = QStringList() << "*.cbr" << "*.cbz" << "*.rar" << "*.zip" << "*.tar" << "*.pdf" << "*.7z" << "*.cb7" << "*.arj" << "*.cbt";
const QStringList Comic::literalComicExtensions = QStringList() << "cbr" << "cbz" << "rar" << "zip" << "tar" << "pdf" << "7z" << "cb7" << "arj" << "cbt";
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
Comic::Comic() Comic::Comic()
@ -183,18 +185,52 @@ bool Comic::pageIsLoaded(int page)
return _loadedPages[page]; return _loadedPages[page];
} }
bool Comic::fileIsComic(QUrl &path) bool Comic::fileIsComic(const QString &path)
{ {
QFileInfo info(path.toLocalFile()); QFileInfo info(path);
return literalComicExtensions.contains(info.suffix()); return literalComicExtensions.contains(info.suffix());
} }
QList<QString> Comic::filterInvalidComicFiles(const QList<QUrl> &list) QList<QString> Comic::findValidComicFiles(const QList<QUrl> &list)
{ {
QLOG_DEBUG() << "-findValidComicFiles-";
QList<QString> validComicFiles; QList<QString> validComicFiles;
QString currentPath;
foreach (QUrl url, list) { foreach (QUrl url, list) {
if(Comic::fileIsComic(url)) currentPath = url.toLocalFile();
validComicFiles << url.toLocalFile(); if(Comic::fileIsComic(currentPath))
validComicFiles << currentPath;
else if(QFileInfo(currentPath).isDir())
{
validComicFiles << findValidComicFilesInFolder(currentPath);
}
}
QLOG_DEBUG() << "-" << validComicFiles << "-";
return validComicFiles;
}
QList<QString> Comic::findValidComicFilesInFolder(const QString &path)
{
QLOG_DEBUG() << "-findValidComicFilesInFolder-" << path;
if(!QFileInfo(path).isDir())
return QList<QString>();
QList<QString> validComicFiles;
QDir folder(path);
folder.setNameFilters(Comic::comicExtensions);
folder.setFilter(QDir::AllDirs|QDir::Files|QDir::NoDotAndDotDot);
QFileInfoList folderContent = folder.entryInfoList();
QString currentPath;
foreach (QFileInfo info, folderContent) {
currentPath = info.absoluteFilePath();
if(info.isDir())
validComicFiles << findValidComicFilesInFolder(currentPath); //find comics recursively
else if(Comic::fileIsComic(currentPath))
{
validComicFiles << currentPath;
}
} }
return validComicFiles; return validComicFiles;

17
common/comic.h
View File

@ -49,12 +49,13 @@ class ComicDB;
bool _isPDF; bool _isPDF;
static QStringList imageExtensions;
static QStringList literalImageExtensions;
static QStringList comicExtensions;
static QStringList literalComicExtensions;
public: public:
static const QStringList imageExtensions;
static const QStringList literalImageExtensions;
static const QStringList comicExtensions;
static const QStringList literalComicExtensions;
Bookmarks * bm; Bookmarks * bm;
//Constructors //Constructors
@ -84,9 +85,9 @@ class ComicDB;
inline static QStringList getSupportedImageFormats() { return imageExtensions;} inline static QStringList getSupportedImageFormats() { return imageExtensions;}
inline static QStringList getSupportedImageLiteralFormats() { return literalImageExtensions;} inline static QStringList getSupportedImageLiteralFormats() { return literalImageExtensions;}
static bool fileIsComic(QUrl & path); static bool fileIsComic(const QString &path);
static QList<QString> filterInvalidComicFiles(const QList<QUrl> & list); static QList<QString> findValidComicFiles(const QList<QUrl> & list);
static QList<QString> findValidComicFilesInFolder(const QString &path);
public slots: public slots:
void loadFinished(); void loadFinished();
void setBookmark(); void setBookmark();

42
custom_widgets/yacreader_treeview.cpp
View File

@ -3,6 +3,7 @@
#include "treemodel.h" #include "treemodel.h"
#include "comic.h" #include "comic.h"
#include "comic_files_manager.h"
#include "QsLog.h" #include "QsLog.h"
@ -77,9 +78,12 @@ void YACReaderTreeView::dragEnterEvent(QDragEnterEvent *event)
if (event->mimeData()->hasUrls()) if (event->mimeData()->hasUrls())
{ {
urlList = event->mimeData()->urls(); urlList = event->mimeData()->urls();
QString currentPath;
foreach (QUrl url, urlList) foreach (QUrl url, urlList)
{ {
if(Comic::fileIsComic(url)) //comics or folders are accepted, folders' content is validate in dropEvent (avoid any lag before droping)
currentPath = url.toLocalFile();
if(Comic::fileIsComic(currentPath) || QFileInfo(currentPath).isDir())
{ {
event->acceptProposedAction(); event->acceptProposedAction();
return; return;
@ -88,20 +92,25 @@ void YACReaderTreeView::dragEnterEvent(QDragEnterEvent *event)
} }
} }
void YACReaderTreeView::dragLeaveEvent(QDragLeaveEvent *event)
{
Q_UNUSED(event)
}
void YACReaderTreeView::dragMoveEvent(QDragMoveEvent *event) void YACReaderTreeView::dragMoveEvent(QDragMoveEvent *event)
{ {
QTreeView::dragMoveEvent(event); QTreeView::dragMoveEvent(event);
event->acceptProposedAction(); event->acceptProposedAction();
//fix for drop auto expand //fix for drop auto expand
QModelIndex lastExpanded = indexAt(expandPos);
QModelIndex underMouse = indexAt(event->pos()); QModelIndex underMouse = indexAt(event->pos());
if( underMouse.isValid() && (underMouse != lastExpanded)) { if( underMouse.isValid()) {
expandPos = event->pos(); expandPos = event->pos();
connect(&expandTimer,SIGNAL(timeout()),this,SLOT(expandCurrent())); connect(&expandTimer,SIGNAL(timeout()),this,SLOT(expandCurrent()));
expandTimer.start(750); expandTimer.setSingleShot(true);
expandTimer.start(500);
} }
//TODO force mouse hover decoration, why the event loop is not working here? //force mouse hover decoration, TODO why the event loop is not working here?
if(!t.isActive()) if(!t.isActive())
{ {
t.setSingleShot(true); t.setSingleShot(true);
@ -114,25 +123,34 @@ void YACReaderTreeView::dragMoveEvent(QDragMoveEvent *event)
void YACReaderTreeView::dropEvent(QDropEvent *event) void YACReaderTreeView::dropEvent(QDropEvent *event)
{ {
t.stop();
QTreeView::dropEvent(event); QTreeView::dropEvent(event);
bool accepted = false;
QLOG_DEBUG() << "drop on tree" << event->dropAction(); QLOG_DEBUG() << "drop on tree" << event->dropAction();
bool validAction = event->dropAction() == Qt::CopyAction || event->dropAction() & Qt::MoveAction;
if(validAction)
{
QList<QPair<QString, QString> > droppedFiles = ComicFilesManager::getDroppedFiles(event->mimeData()->urls());
QModelIndex destinationIndex = indexAt(event->pos());
if(event->dropAction() == Qt::CopyAction) if(event->dropAction() == Qt::CopyAction)
{ {
QLOG_DEBUG() << "copy - tree"; QLOG_DEBUG() << "copy - tree :" << droppedFiles;
emit copyComicsToFolder(Comic::filterInvalidComicFiles(event->mimeData()->urls()),indexAt(event->pos())); emit copyComicsToFolder(droppedFiles, destinationIndex);
} }
else if(event->dropAction() & Qt::MoveAction) else if(event->dropAction() & Qt::MoveAction)
{ {
QLOG_DEBUG() << "move - tree"; QLOG_DEBUG() << "move - tree :" << droppedFiles;
emit moveComicsToFolder(Comic::filterInvalidComicFiles(event->mimeData()->urls()),indexAt(event->pos())); emit moveComicsToFolder(droppedFiles, destinationIndex);
} }
if(accepted)
event->acceptProposedAction(); event->acceptProposedAction();
} }
}
YACReaderTreeViewItemDeletegate::YACReaderTreeViewItemDeletegate(QObject *parent) YACReaderTreeViewItemDeletegate::YACReaderTreeViewItemDeletegate(QObject *parent)

6
custom_widgets/yacreader_treeview.h
View File

@ -11,8 +11,8 @@ public:
signals: signals:
//Drops //Drops
void copyComicsToFolder(QList<QString>,QModelIndex); void copyComicsToFolder(QList<QPair<QString,QString> >,QModelIndex);
void moveComicsToFolder(QList<QString>,QModelIndex); void moveComicsToFolder(QList<QPair<QString,QString> >,QModelIndex);
protected slots: protected slots:
//fix for drop auto expand //fix for drop auto expand
@ -21,9 +21,11 @@ protected slots:
protected: protected:
//Drop to import //Drop to import
void dragEnterEvent(QDragEnterEvent *event); void dragEnterEvent(QDragEnterEvent *event);
void dragLeaveEvent(QDragLeaveEvent *event);
void dragMoveEvent(QDragMoveEvent *event); void dragMoveEvent(QDragMoveEvent *event);
void dropEvent(QDropEvent *event); void dropEvent(QDropEvent *event);
//fix for drop auto expand //fix for drop auto expand
QTimer expandTimer; QTimer expandTimer;
QTimer t; QTimer t;