Differential D7401 Diff 27395 src/solid/devices/backends/iokit/iokitvolume.cpp

Changeset View

Standalone View

View Options

src/solid/devices/backends/iokit/iokitvolume.cpp

  • This file was added.
1​/*
2​ Copyright 2017 René J.V. Bertin <rjvbertin@gmail.com>
3​
4​ This library is free software; you can redistribute it and/or
5​ modify it under the terms of the GNU Lesser General Public
6​ License as published by the Free Software Foundation; either
7​ version 2.1 of the License, or (at your option) version 3, or any
8​ later version accepted by the membership of KDE e.V. (or its
9​ successor approved by the membership of KDE e.V.), which shall
10​ act as a proxy defined in Section 6 of version 3 of the license.
11​
12​ This library is distributed in the hope that it will be useful,
13​ but WITHOUT ANY WARRANTY; without even the implied warranty of
14​ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15​ Lesser General Public License for more details.
16​
17​ You should have received a copy of the GNU Lesser General Public
18​ License along with this library. If not, see <http://www.gnu.org/licenses/>.
19​*/
20​
21​#include "iokitvolume.h"
22​#include "iokitgenericinterface.h"
23​
24​#include <QDebug>
25​
26​#include <CoreFoundation/CoreFoundation.h>
27​#include <DiskArbitration/DiskArbitration.h>
28​
29​using namespace Solid::Backends::IOKit;
30​
31​IOKitVolume::IOKitVolume(IOKitDevice *device)
32​ : Block(device)
33​ , daDict(new DADictionary(device))
34​{
35​}
36​
37​IOKitVolume::IOKitVolume(const IOKitDevice *device)
38​ : Block(device)
39​ , daDict(new DADictionary(device))
40​{
41​}
42​
43​IOKitVolume::~IOKitVolume()
kfunkUnsubmitted
Done

Here and below: nullptr

kfunk: Here and below: `nullptr`
44​{
45​ delete daDict;
46​}
47​
48​bool IOKitVolume::isIgnored() const
49​{
50​ // ignore storage volumes that aren't mounted
51​ bool isIgnored = m_device->property(QStringLiteral("Open")).toBool() == false;
52​ m_device->setProperty("isIgnored", isIgnored);
53​ m_device->setProperty("isMounted", !isIgnored);
54​ return isIgnored;
55​}
56​
57​Solid::StorageVolume::UsageType IOKitVolume::usage() const
58​{
59​ const QString content = m_device->property(QStringLiteral("Content")).toString();
60​ if (content == QStringLiteral("CD_DA")) {
61​ // this is (probably) a CD track
62​ return Solid::StorageVolume::Other;
63​ }
64​ if (content.contains(QStringLiteral("partition_scheme"))) {
65​ return Solid::StorageVolume::PartitionTable;
66​ }
67​ return Solid::StorageVolume::FileSystem;
68​}
69​
70​QString IOKitVolume::fsType() const
71​{
kfunkUnsubmitted
Done

Dito, inconsistent member naming.

And given that I've noticed that three times now, this again leads to the conclusion this is very repetitive code amongst . {IOKitStorageAccess,IOKitVolume,IOKitStorage}::Private.

Maybe there should be helper class for accessing a CFDictionary instead which all these classes use?

I'm not trying to piss you off René, but this is slightly sloppy coding which easy for the initial writer to do, but will bite us any time in the future when someone unfamiliar with the code needs to do fixes to this code and potentially fixes only one copy of these snippets. Please think about your architecture more carefully.

kfunk: Dito, inconsistent member naming. And given that I've noticed that three times now, this again…
rjvbbAuthorUnsubmitted
Not Done

Not really certain why I didn't decide to this myself, I'm pretty certain it did cross my mind.

rjvbb: Not really certain why I didn't decide to this myself, I'm pretty certain it did cross my mind.
72​ return daDict->stringForKey(kDADiskDescriptionVolumeKindKey);
73​}
74​
75​QString IOKitVolume::label() const
76​{
77​ return daDict->stringForKey(kDADiskDescriptionVolumeNameKey);
78​}
79​
80​QString IOKitVolume::uuid() const
81​{
82​ return m_device->property(QStringLiteral("UUID")).toString();
83​}
84​
85​qulonglong IOKitVolume::size() const
86​{
87​ return m_device->property(QStringLiteral("Size")).toULongLong();
88​}
89​
90​QString IOKitVolume::encryptedContainerUdi() const
91​{
92​ return QString();
93​}
94​
95​QString IOKitVolume::vendor() const
96​{
97​ return daDict->stringForKey(kDADiskDescriptionDeviceVendorKey);
98​}
99​
100​QString IOKitVolume::product() const
101​{
102​ return daDict->stringForKey(kDADiskDescriptionDeviceModelKey);
103​}
104​
105​QString IOKitVolume::description() const
106​{
107​ return daDict->stringForKey(kDADiskDescriptionMediaNameKey);
108​}
109​
110​DADiskRef IOKitVolume::daRef() const
111​{
112​ return daDict->daRef;
113​}
kfunkUnsubmitted
Done

Remove commented code.

kfunk: Remove commented code.
kfunkUnsubmitted
Done

That's a lot of copy-pasted code amongst fsType, label, vendor, product, description`. I'm sure that can be done better.

kfunk: That's a lot of copy-pasted code amongst `fsType`, `label`, `vendor`, `product, `description`.
rjvbbAuthorUnsubmitted
Not Done

Somewhat.

rjvbb: Somewhat.