andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Add support for reading capacity and changing label/uuid on UDF filesystem

This commit is contained in:
Pali Rohár 2018-01-03 20:09:45 +02:00 committed by Andrius Štikonas
parent 8b9451c8d7
commit 2f4aeaf851
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/fs/udf.cpp
View File

@ -30,9 +30,12 @@
namespace FS
{
constexpr qint64 MIN_UDF_BLOCKS = 282;
constexpr qint64 MIN_UDF_BLOCKS = 300;
constexpr qint64 MAX_UDF_BLOCKS = ((1ULL << 32) - 1);
FileSystem::CommandSupportType udf::m_GetUsed = FileSystem::cmdSupportNone;
FileSystem::CommandSupportType udf::m_SetLabel = FileSystem::cmdSupportNone;
FileSystem::CommandSupportType udf::m_UpdateUUID = FileSystem::cmdSupportNone;
FileSystem::CommandSupportType udf::m_Create = FileSystem::cmdSupportNone;
bool udf::oldMkudffsVersion = false;
@ -43,6 +46,8 @@ udf::udf(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QStrin
void udf::init()
{
m_GetUsed = findExternal(QStringLiteral("udfinfo"), {}, 1) ? cmdSupportFileSystem : cmdSupportNone;
m_SetLabel = m_UpdateUUID = findExternal(QStringLiteral("udflabel"), {}, 1) ? cmdSupportFileSystem : cmdSupportNone;
m_Create = findExternal(QStringLiteral("mkudffs"), {}, 1) ? cmdSupportFileSystem : cmdSupportNone;
if (m_Create == cmdSupportFileSystem) {
@ -54,7 +59,11 @@ void udf::init()
bool udf::supportToolFound() const
{
return m_Create != cmdSupportNone;
return
m_GetUsed != cmdSupportNone &&
m_SetLabel != cmdSupportNone &&
m_UpdateUUID != cmdSupportNone &&
m_Create != cmdSupportNone;
}
FileSystem::SupportTool udf::supportToolName() const
@ -93,6 +102,36 @@ QValidator* udf::labelValidator(QObject *parent) const
return m_LabelValidator;
}
qint64 udf::readUsedCapacity(const QString& deviceNode) const
{
ExternalCommand cmd(QStringLiteral("udfinfo"), { QStringLiteral("--utf8"), deviceNode });
if (!cmd.run(-1) || cmd.exitCode() != 0)
return -1;
QRegularExpressionMatch reBlockSize = QRegularExpression(QStringLiteral("^blocksize=([0-9]+)$"), QRegularExpression::MultilineOption).match(cmd.output());
QRegularExpressionMatch reUsedBlocks = QRegularExpression(QStringLiteral("^usedblocks=([0-9]+)$"), QRegularExpression::MultilineOption).match(cmd.output());
if (!reBlockSize.hasMatch() || !reUsedBlocks.hasMatch())
return -1;
qint64 blockSize = reBlockSize.captured(1).toLongLong();
qint64 usedBlocks = reUsedBlocks.captured(1).toLongLong();
return usedBlocks * blockSize;
}
bool udf::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel)
{
ExternalCommand cmd(report, QStringLiteral("udflabel"), { QStringLiteral("--utf8"), deviceNode, newLabel });
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool udf::updateUUID(Report& report, const QString& deviceNode) const
{
ExternalCommand cmd(report, QStringLiteral("udflabel"), { QStringLiteral("--utf8"), QStringLiteral("--uuid=random"), deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool udf::create(Report& report, const QString& deviceNode)
{
return createWithLabel(report, deviceNode, QString());

15
src/fs/udf.h
View File

@ -42,9 +42,15 @@ public:
public:
void init() override;
qint64 readUsedCapacity(const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool createWithLabel(Report& report, const QString& deviceNode, const QString& label) override;
bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
bool updateUUID(Report& report, const QString& deviceNode) const override;
CommandSupportType supportGetUsed() const override {
return m_GetUsed;
}
CommandSupportType supportGetLabel() const override {
return cmdSupportCore;
}
@ -63,6 +69,12 @@ public:
CommandSupportType supportBackup() const override {
return cmdSupportCore;
}
CommandSupportType supportSetLabel() const override {
return m_SetLabel;
}
CommandSupportType supportUpdateUUID() const override {
return m_UpdateUUID;
}
CommandSupportType supportGetUUID() const override {
return cmdSupportCore;
}
@ -75,6 +87,9 @@ public:
bool supportToolFound() const override;
public:
static CommandSupportType m_GetUsed;
static CommandSupportType m_SetLabel;
static CommandSupportType m_UpdateUUID;
static CommandSupportType m_Create;
private: