public/ALTMediaWriter
1
0
Fork 0
mirror of https://github.com/altlinux/ALTMediaWriter.git synced 2024-10-26 17:25:05 +03:00
Code Issues Projects Releases Wiki Activity

Revert "rework file_type_from_filename()"

Browse Source 
This reverts commit a109f30c83.
revert because commit creates multiple problems
1. incorrect handling of ".tar"/"recovery.tar" case
2. incorrect handling of images with "." in name part, not
\ just the suffix
This commit is contained in:
Dmitry Degtyarev 2022-04-11 12:00:58 +04:00
parent 7299412cd1
commit 3b66dc4cfc
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/file_type.cpp
View File

@ -1,7 +1,6 @@
#include "file_type.h"
#include <QFileInfo>
#include <QObject>
const QList<FileType> file_type_all = []() {
@ -48,20 +47,25 @@ QString file_type_name(const FileType file_type) {
}
FileType file_type_from_filename(const QString &filename) {
const QFileInfo file_info = QFileInfo(filename);
const QString file_suffix = file_info.completeSuffix();
FileType matching_type = FileType_UNKNOWN;
QString matching_string = QString();
for (const FileType &type : file_type_all) {
const QStringList strings = file_type_strings(type);
const bool match = strings.contains(file_suffix);
for (const QString string : strings) {
// NOTE: need to select the longest string for cases like ".tar" and "recovery.tar"
const bool string_matches = filename.endsWith(string, Qt::CaseInsensitive);
const bool this_string_is_longer = (string.length() > matching_string.length());
if (match) {
return type;
if (string_matches && this_string_is_longer) {
matching_type = type;
matching_string = string;
}
}
}
return FileType_UNKNOWN;
return matching_type;
}
bool file_type_can_write(const FileType file_type) {