|
6 | 6 | #include "defendercontroller.h" |
7 | 7 |
|
8 | 8 | #include <dfm-base/dfm_global_defines.h> |
9 | | -#include <dfm-base/dbusservice/global_server_defines.h> |
10 | | -#include <dfm-base/base/application/application.h> |
11 | | -#include <dfm-base/base/application/settings.h> |
12 | 9 | #include <dfm-base/base/device/deviceutils.h> |
13 | 10 | #include <dfm-base/base/configs/dconfig/dconfigmanager.h> |
14 | 11 | #include <dfm-base/dbusservice/global_server_defines.h> |
| 12 | +#include <dfm-base/dbusservice/opticalshareproxy.h> |
15 | 13 | #include <dfm-base/dialogs/mountpasswddialog/mountaskpassworddialog.h> |
16 | 14 | #include <dfm-base/utils/universalutils.h> |
17 | 15 | #include <dfm-base/utils/dialogmanager.h> |
|
34 | 32 | #include <dfm-burn/dburn_global.h> |
35 | 33 | #include <sys/statvfs.h> |
36 | 34 |
|
37 | | -static constexpr char kBurnAttribute[] { "BurnAttribute" }; |
38 | | -static constexpr char kBurnTotalSize[] { "BurnTotalSize" }; |
39 | | -static constexpr char kBurnUsedSize[] { "BurnUsedSize" }; |
40 | | -static constexpr char kBurnMediaType[] { "BurnMediaType" }; |
41 | | -static constexpr char kBurnWriteSpeed[] { "BurnWriteSpeed" }; |
42 | | - |
43 | 35 | using namespace dfmbase; |
44 | 36 |
|
45 | 37 | namespace { |
@@ -462,32 +454,39 @@ void DeviceHelper::persistentOpticalInfo(const QVariantMap &datas) |
462 | 454 | QVariantMap info; |
463 | 455 | QString tag { datas.value(DeviceProperty::kDevice).toString().mid(5) }; |
464 | 456 |
|
465 | | - info[kBurnTotalSize] = datas.value(DeviceProperty::kSizeTotal); |
466 | | - info[kBurnUsedSize] = datas.value(DeviceProperty::kSizeUsed); |
467 | | - info[kBurnMediaType] = datas.value(DeviceProperty::kOpticalMediaType); |
468 | | - info[kBurnWriteSpeed] = datas.value(DeviceProperty::kOpticalWriteSpeed); |
| 457 | + info[OpticalShareField::kTotalSize] = datas.value(DeviceProperty::kSizeTotal); |
| 458 | + info[OpticalShareField::kUsedSize] = datas.value(DeviceProperty::kSizeUsed); |
| 459 | + info[OpticalShareField::kMediaType] = datas.value(DeviceProperty::kOpticalMediaType); |
| 460 | + info[OpticalShareField::kWriteSpeed] = datas.value(DeviceProperty::kOpticalWriteSpeed); |
469 | 461 |
|
470 | | - Application::dataPersistence()->setValue(kBurnAttribute, tag, info); |
471 | | - Application::dataPersistence()->sync(); |
| 462 | + OpticalShareProxy::instance().setBurnAttribute(tag, info); |
472 | 463 |
|
473 | 464 | qCDebug(logDFMBase) << "Optical device usage info persisted for device:" << tag |
474 | | - << "total size:" << info[kBurnTotalSize].toULongLong() |
475 | | - << "used size:" << info[kBurnUsedSize].toULongLong(); |
| 465 | + << "total size:" << info[OpticalShareField::kTotalSize].toULongLong() |
| 466 | + << "used size:" << info[OpticalShareField::kUsedSize].toULongLong(); |
| 467 | +} |
| 468 | + |
| 469 | +void DeviceHelper::clearOpticalInfo(const QString &tag) |
| 470 | +{ |
| 471 | + if (tag.isEmpty()) |
| 472 | + return; |
| 473 | + |
| 474 | + OpticalShareProxy::instance().clearBurnAttribute(tag); |
476 | 475 | } |
477 | 476 |
|
478 | 477 | void DeviceHelper::readOpticalInfo(QVariantMap &datas) |
479 | 478 | { |
480 | 479 | using namespace GlobalServerDefines; |
481 | 480 | QString tag { datas.value(DeviceProperty::kDevice).toString().mid(5) }; |
| 481 | + const QVariantMap info = OpticalShareProxy::instance().burnAttribute(tag); |
| 482 | + if (info.isEmpty()) |
| 483 | + return; |
482 | 484 |
|
483 | | - if (Application::dataPersistence()->keys(kBurnAttribute).contains(tag)) { |
484 | | - const QMap<QString, QVariant> &info = Application::dataPersistence()->value(kBurnAttribute, tag).toMap(); |
485 | | - datas[DeviceProperty::kSizeTotal] = static_cast<qint64>(info.value(kBurnTotalSize).toULongLong()); |
486 | | - datas[DeviceProperty::kSizeUsed] = static_cast<qint64>(info.value(kBurnUsedSize).toULongLong()); |
487 | | - datas[DeviceProperty::kSizeFree] = datas[DeviceProperty::kSizeTotal].toULongLong() - datas[DeviceProperty::kSizeUsed].toULongLong(); |
488 | | - datas[DeviceProperty::kOpticalMediaType] = info.value(kBurnMediaType).toInt(); |
489 | | - datas[DeviceProperty::kOpticalWriteSpeed] = info.value(kBurnWriteSpeed).toStringList(); |
490 | | - } |
| 485 | + datas[DeviceProperty::kSizeTotal] = static_cast<qint64>(info.value(OpticalShareField::kTotalSize).toULongLong()); |
| 486 | + datas[DeviceProperty::kSizeUsed] = static_cast<qint64>(info.value(OpticalShareField::kUsedSize).toULongLong()); |
| 487 | + datas[DeviceProperty::kSizeFree] = datas[DeviceProperty::kSizeTotal].toULongLong() - datas[DeviceProperty::kSizeUsed].toULongLong(); |
| 488 | + datas[DeviceProperty::kOpticalMediaType] = info.value(OpticalShareField::kMediaType).toInt(); |
| 489 | + datas[DeviceProperty::kOpticalWriteSpeed] = info.value(OpticalShareField::kWriteSpeed).toStringList(); |
491 | 490 | } |
492 | 491 |
|
493 | 492 | bool DeviceHelper::checkNetworkConnection(const QString &id) |
|
0 commit comments