diff --git a/providers/Paths.cpp b/providers/Paths.cpp index da4b278..b0ebf62 100644 --- a/providers/Paths.cpp +++ b/providers/Paths.cpp @@ -1,110 +1,110 @@ /* * Copyright 2010-2012 Bart Kroon * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "Paths.h" #include #include #include #include #include static QString subUser(QString path) { QString homePath = QDir::homePath(); if (path.startsWith(homePath)) path = "~" + path.mid(homePath.length(), -1); return path; } Paths::Paths(QObject *parent) : Provider(parent) { } Paths::~Paths() {} QList Paths::getResults(QString query) { QList list; QDir dir; if (query.startsWith("/")) { dir = QDir::root(); query.remove(0, 1); } else { dir = QDir::home(); } QStringList walk = query.split("/", QString::SkipEmptyParts); if (walk.isEmpty() || query.endsWith('/')) { walk.append(""); } QString part = walk.takeFirst(); while (walk.length() > 0) { dir.cd(part); part = walk.takeFirst(); } QFileInfoList paths = dir.entryInfoList(QStringList(part + '*'), QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files, QDir::Time); if (paths.size() > 100) { paths = paths.mid(0, 100); } for(const QFileInfo &path : paths) { ProviderResult *result = new ProviderResult(); result->name = subUser(path.absoluteFilePath()); result->completion = result->name.left(result->name.lastIndexOf("/")) + "/" + path.fileName(); QFileInfo info(path.absoluteFilePath()); - result->priority = info.lastModified().toSecsSinceEpoch(); + result->priority = QDateTime::currentSecsSinceEpoch() - info.lastModified().toSecsSinceEpoch(); if (path.isDir()) { result->completion += "/"; result->icon = "system-file-manager"; } else { result->icon = m_mimeDb.mimeTypeForFile(path.absoluteFilePath()).iconName(); } result->object = this; result->program = path.absoluteFilePath(); result->type = i18n("Open path"); list.append(result); } return list; } int Paths::launch(const QString &exec) { QDesktopServices::openUrl(QUrl::fromLocalFile(exec)); return 0; } // kate: indent-mode cstyle; space-indent on; indent-width 4; diff --git a/providers/Shell.cpp b/providers/Shell.cpp index d820b97..649f8b8 100644 --- a/providers/Shell.cpp +++ b/providers/Shell.cpp @@ -1,131 +1,131 @@ /* * Copyright 2010-2012 Bart Kroon * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "Shell.h" #include #include #include #include #include #include #include namespace { QMap walkDir(QString path) { QMap binList; QDir dir = QDir(path); QFileInfoList list = dir.entryInfoList(QStringList(), QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files); for (const QFileInfo &file : list) { if (file.isDir()) { if (file.isSymLink() && file.canonicalFilePath() != path) { binList.unite(walkDir(file.absoluteFilePath())); } } else { if (file.isExecutable()) { binList.insert(file.fileName(), file.absoluteFilePath()); } } } return binList; } QStringList getPathEnv() { QString pathEnv = getenv("PATH"); QStringList pathList = pathEnv.split(":", QString::SkipEmptyParts); pathList.append(QDir::homePath() + "/bin"); pathList.removeDuplicates(); return pathList; } } Shell::Shell(QObject *parent) : Provider(parent) { index.clear(); for (const QString &dir : getPathEnv()) { index.unite(walkDir(dir)); } } Shell::~Shell() {} QList Shell::getResults(QString query) { QList list; QString command; QString args; if (query.contains(' ')) { command = query.left(query.indexOf(" ")); args = query.right(query.length() - query.indexOf(" ")); } else { command = query; } QMapIterator iterator(this->index); while (iterator.hasNext()) { iterator.next(); if (!iterator.key().startsWith(command, Qt::CaseInsensitive)) { continue; } ProviderResult *app = new ProviderResult; app->name = iterator.value() + args; app->completion = iterator.key(); app->icon = "system-run"; app->object = this; app->program = iterator.value() + args; app->type = i18n("Shell command"); - app->priority = QFileInfo(iterator.value()).lastModified().toSecsSinceEpoch(); + app->priority = QDateTime::currentSecsSinceEpoch() - QFileInfo(iterator.value()).lastModified().toSecsSinceEpoch(); list.append(app); } return list; } int Shell::launch(const QString &exec) { QStringList args = exec.split(" "); if (args.isEmpty()) { qWarning() << "Asked to launch invalid program:" << exec; return 0; } QString program(args.takeFirst()); QProcess::startDetached(program, args); return 0; } // kate: indent-mode cstyle; space-indent on; indent-width 4;