Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 10:52:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kioslave: try different unrar version argument if "--version" does not work

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-08-03 20:45:34 +03:00
parent c92e12231e
commit 4f889e1438
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kioslave/thumbnail/comiccreator.cpp
View file

@ -81,7 +81,7 @@ bool ComicCreator::create(const QString& path, int width, int height, QImage& im
}
if (cover.isNull()) {
kWarning(KIO_THUMB) << "Error creating the comic book thumbnail.";
kDebug(KIO_THUMB) << "Error creating the comic book thumbnail.";
return false;
}
@ -175,7 +175,10 @@ QImage ComicCreator::extractRARImage(const QString& path)
/// Extracts the cover image out of the .cbr file.
// Check if unrar is available. Get its path in 'unrarPath'.
QString unrar = unrarPath();
QString unrar = unrarPath("--version");
if (unrar.isEmpty()) {
unrar = unrarPath("-v");
}
if (unrar.isEmpty()) {
kWarning(KIO_THUMB) << "A suitable version of unrar is not available.";
return QImage();
@ -217,7 +220,7 @@ QStringList ComicCreator::getRARFileList(const QString& path,
return entries;
}
QString ComicCreator::unrarPath() const
QString ComicCreator::unrarPath(const QString& versionarg) const
{
/// Check the standard paths to see if a suitable unrar is available.
QString unrar = KStandardDirs::findExe("unrar");
@ -229,7 +232,7 @@ QString ComicCreator::unrarPath() const
}
if (!unrar.isEmpty()) {
QProcess proc;
proc.start(unrar, QStringList() << "--version");
proc.start(unrar, QStringList() << versionarg);
proc.waitForFinished(-1);
const QStringList lines = QString::fromLocal8Bit(proc.readAllStandardOutput()).split
('\n', QString::SkipEmptyParts);

2
kioslave/thumbnail/comiccreator.h
View file

@ -67,7 +67,7 @@ class ComicCreator : public QObject, public ThumbCreator
// For "rar" type files.
// Uses the non-free 'unrar' executable, if available.
QImage extractRARImage(const QString& path);
QString unrarPath() const;
QString unrarPath(const QString& versionarg) const;
QStringList getRARFileList(const QString& path, const QString& unrarPath);
private slots: