Skip to content

feat: 增加本地数据库查询条件 #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
winexw merged 1 commit into from
Jul 25, 2024
Merged

feat: 增加本地数据库查询条件 #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion src/Common/vendor/zdrivermanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@

#include <map>

#include <DConfig>
DCORE_USE_NAMESPACE

static QMutex g_mutex;
static QMap<QString, QMap<QString, QString>> g_ppds; //所有ppd文件的字典，以device_id(没有device_id则以make_and_model)作为key
static QMap<QString, QMap<QString, QString> *> g_ppdsDirct; //将厂商和型号格式化之后作为key生成的字典，键值为g_ppds的key
Expand All @@ -49,6 +52,26 @@ static const QString g_dbpath = "/opt/deepin/dde-printer/printer-drivers/deb-rep
static const QString g_ppddbname = "ppd.db";
static const QString g_dbversion = "0.1.2";

static bool isLastoreConfigVerAccord()
{
QString name = "org.deepin.lastore";
DConfig *config = DConfig::create(name, name);

if (config == nullptr) {
return false;
}

QString version = config->value("version").toByteArray();
config->deleteLater();

qCDebug(COMMONMOUDLE) << "config ver:" << version;
if (!version.isEmpty() && QVersionNumber::fromString(version) > QVersionNumber::fromString("1.0")) {
return true;
}

return false;
}

static QMap<QString, QVariant> stringToVariant(const QMap<QString, QString> &driver)
{
QMap<QString, QVariant> info;
Expand Down Expand Up @@ -886,7 +909,8 @@ void DriverSearcher::askForFinish()
if (m_drivers.isEmpty() || m_matchLocalDriver) {
getLocalDrivers();
}
if (m_drivers.isEmpty() && supportArchs.contains(g_Settings->getSystemArch())) {

if (m_drivers.isEmpty() && supportArchs.contains(g_Settings->getSystemArch()) && isLastoreConfigVerAccord()) {
getLocalDbDrivers();
}

Expand Down