Code synchronization

.reuse/dep5

@@ -14,7 +14,7 @@ Copyright: None
 License: CC0-1.0
 
 # desktop json policy
-Files:  *.desktop *.json *.policy
+Files:  *.desktop *.json *.policy *.pdf
 Copyright: None
 License: CC0-1.0
 

dde-printer.pro

@@ -8,7 +8,9 @@ TEMPLATE = subdirs
 SUBDIRS += \
     src/cppcups/cppcups.pro \
     src/Printer/Printer.pro \
-    src/Deamon
+    src/Deamon              \
+    src/plugin              \
+    src/service
 
 CONFIG += ordered
 DEFINES += QT_MESSAGELOGCONTEXT

debian/changelog

@@ -1,3 +1,9 @@
+dde-printer (1.0.6-1+1060) unstable; urgency=medium
+
+  * Fix bug
+
+ -- LiuJingLin <liujinglin@uniontech.com>  Mon, 20 May 2024 17:30:00 +0800
+
 dde-printer (0.9.21-1) unstable; urgency=medium
 
   * update version

debian/control

@@ -22,7 +22,7 @@ Homepage: http://www.linuxdeepin.com/
 
 Package: dde-printer
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libnss-winbind
+Depends: ${shlibs:Depends}, ${misc:Depends}, libnss-winbind,libdeepin-service-framework,deepin-service-manager
 Description: Deepin Print Manager is a eazy tool to manage printers.
  Deepin Print Manager is a printer management tool,which supports adding and removing printers,managing print jobs and so on.
 

src/Common/Common.pri

@@ -13,6 +13,7 @@ HEADERS +=  \
     $$PWD/zjobmanager.h \
     $$PWD/cupsattrnames.h \
     $$PWD/config.h \
+    $$PWD/reviselogger.h \
     $$PWD/vendor/addprinter_p.h \
     $$PWD/vendor/addprinter.h \
     $$PWD/vendor/printerservice.h \
@@ -29,6 +30,7 @@ SOURCES +=  \
     $$PWD/cupsconnectionfactory.cpp \
     $$PWD/ztaskinterface.cpp \
     $$PWD/zjobmanager.cpp \
+    $$PWD/reviselogger.cpp \
     $$PWD/vendor/addprinter.cpp \
     $$PWD/vendor/printerservice.cpp \
     $$PWD/vendor/zdevicemanager.cpp \

src/Common/common.cpp

@@ -19,10 +19,86 @@
 #include <QDBusReply>
 #include <QRegExpValidator>
 #include <QDebug>
+#include <QDateTime>
+#include <QLibrary>
 
 #include <netdb.h>
 
-static QString g_strModelFull;
+static bool isSdkInit = false;
+typedef bool (*pfInitialize)(const std::string&, bool);
+static pfInitialize InitializeSdk = nullptr;
+static pfWriteEventLog WriteEventLog = nullptr;
+const QString LibEventLog = "/usr/lib/libdeepin-event-log.so";
+static QLibrary *eventLib = nullptr;
+static QStringList timeList;
+
+Q_LOGGING_CATEGORY(COMMONMOUDLE, "org.deepin.dde-printer.common")
+
+void loadEventlib()
+{
+    if (!isSdkInit) {
+        eventLib = new QLibrary(LibEventLog);
+        if (eventLib == nullptr) {
+            qCWarning(COMMONMOUDLE) << "no mem";
+            return;
+        }
+
+        eventLib->load();
+        if (!eventLib->isLoaded()) {
+            delete eventLib;
+            eventLib = nullptr;
+            qCWarning(COMMONMOUDLE) << "Load libdeepin-event-log.so failed!";
+            return;
+        }
+
+        InitializeSdk = (pfInitialize)(eventLib->resolve("Initialize"));
+        WriteEventLog = (pfWriteEventLog)eventLib->resolve("WriteEventLog");
+        if (InitializeSdk && InitializeSdk(APPNAME, true)) {
+            qCDebug(COMMONMOUDLE) << "sdk load success" ;
+            isSdkInit = true; // sdk初始化状态
+        }
+    }
+}
+
+bool isEventSdkInit()
+{
+    return isSdkInit;
+}
+
+void unloadEventLib()
+{
+    if (eventLib != nullptr && eventLib->isLoaded()) {
+        eventLib->unload();
+        delete eventLib;
+        eventLib = nullptr;
+    }
+
+    if (isSdkInit) {
+        isSdkInit = false;
+        InitializeSdk = nullptr;
+        WriteEventLog = nullptr;
+    }
+}
+
+pfWriteEventLog getWriteEventLog()
+{
+    return WriteEventLog;
+}
+
+QStringList getCurrentTime(time_record_t type)
+{
+    QDateTime current_date_time = QDateTime::currentDateTime();
+    QString time = current_date_time.toString("yyyy-MM-dd hh:mm:ss");
+    if (type == RESET_TIME) {
+        timeList.clear();
+    } else {
+        if (type == ADD_TIME) {
+            timeList.clear();
+        }
+        timeList << time;
+    }
+    return timeList;
+}
 
 QString getPrinterPPD(const char *name)
 {
@@ -33,7 +109,7 @@ QString getPrinterPPD(const char *name)
         if (conPtr)
             strPPD = STQ(conPtr->getPPD(name));
     } catch (const std::exception &ex) {
-        qWarning() << "Got execpt: " << QString::fromUtf8(ex.what());
+        qCWarning(COMMONMOUDLE) << "Got execpt: " << QString::fromUtf8(ex.what());
         return QString();
     };
 
@@ -67,7 +143,7 @@ QString getPrinterUri(const char *name)
         if (conPtr)
             attrs = conPtr->getPrinterAttributes(name, nullptr, &requestList);
     } catch (const std::exception &ex) {
-        qWarning() << "Got execpt: " << QString::fromUtf8(ex.what());
+        qCWarning(COMMONMOUDLE) << "Got execpt: " << QString::fromUtf8(ex.what());
         return QString();
     };
 
@@ -183,16 +259,16 @@ QVariant ipp_attribute_value(ipp_attribute_t *attr, int i)
     case IPP_TAG_CHARSET:
     case IPP_TAG_MIMETYPE:
     case IPP_TAG_LANGUAGE:
-        qDebug() << QString("Got %1 : %2").arg(UTF8_T_S(ippGetName(attr))).arg(UTF8_T_S(ippGetString(attr, i, nullptr)));
+        qCDebug(COMMONMOUDLE) << QString("Got %1 : %2").arg(UTF8_T_S(ippGetName(attr))).arg(UTF8_T_S(ippGetString(attr, i, nullptr)));
         val = QVariant(UTF8_T_S(ippGetString(attr, i, nullptr)).trimmed());
         break;
     case IPP_TAG_INTEGER:
     case IPP_TAG_ENUM:
-        qDebug() << QString("Got %1 : %2").arg(UTF8_T_S(ippGetName(attr))).arg(ippGetInteger(attr, i));
+        qCDebug(COMMONMOUDLE) << QString("Got %1 : %2").arg(UTF8_T_S(ippGetName(attr))).arg(ippGetInteger(attr, i));
         val = QVariant(ippGetInteger(attr, i));
         break;
     case IPP_TAG_BOOLEAN:
-        qDebug() << QString("Got %1 : %2").arg(UTF8_T_S(ippGetName(attr))).arg(ippGetBoolean(attr, i) ? "true" : "false");
+        qCDebug(COMMONMOUDLE) << QString("Got %1 : %2").arg(UTF8_T_S(ippGetName(attr))).arg(ippGetBoolean(attr, i) ? "true" : "false");
         val = QVariant(ippGetBoolean(attr, i));
         break;
     //    case IPP_TAG_RANGE:
@@ -233,12 +309,12 @@ int shellCmd(const QString &cmd, QString &out, QString &strErr, int timeout)
         out = proc.readAll();
         if (proc.exitCode() != 0 || proc.exitStatus() != QProcess::NormalExit) {
             strErr = QString("err %1, string: %2").arg(proc.exitCode()).arg(QString::fromUtf8(proc.readAllStandardError()));
-            qDebug() << cmd;
-            qWarning() << "shellCmd exit with err: " << strErr;
+            qCDebug(COMMONMOUDLE) << cmd;
+            qCWarning(COMMONMOUDLE) << "shellCmd exit with err: " << strErr;
             return -1;
         }
     } else {
-        qWarning() << "shellCmd timeout";
+        qCWarning(COMMONMOUDLE) << "shellCmd timeout";
         return -2;
     }
 
@@ -546,9 +622,6 @@ void formatModelName(const QString &strMake, QString &strModel)
         }
     }
 
-    // 用于在平台上查询驱动，需保留原始型号
-    g_strModelFull = strModel;
-
     //remove right string contains ignores suffix
     int index = modell.indexOf(QRegularExpression(_RE_ignore_suffix));
     if (index > 0) {
@@ -594,7 +667,3 @@ bool isIpv4Address(const QString &str)
     return reg.match(str).hasMatch();
 }
 
-QString getPrinterFullModel()
-{
-    return g_strModelFull;
-}

src/Common/common.h

@@ -12,6 +12,17 @@
 #include <QDebug>
 #include <cups/adminutil.h>
 
+#define APPNAME "dde-printer"
+
+Q_DECLARE_LOGGING_CATEGORY(COMMONMOUDLE)
+
+typedef enum time_record_e {
+    ADD_TIME = 0,
+    START_TIME,
+    FINISH_TIME,
+    RESET_TIME,
+    MAX_TIME
+} time_record_t;
 //将输入字符串转为小写，分隔出字母和数字
 QString normalize(const QString &strin);
 
@@ -54,5 +65,14 @@ QString toNormalName(const QString &name);
 
 bool isIpv4Address(const QString &str);
 
-QString getPrinterFullModel();
+void loadEventlib();
+
+bool isEventSdkInit();
+
+QStringList getCurrentTime(time_record_t type);
+
+typedef void (*pfWriteEventLog)(const std::string &);
+pfWriteEventLog getWriteEventLog();
+void unloadEventLib();
+
 #endif // COMMON_H

src/Common/cupsconnectionfactory.cpp

@@ -6,18 +6,21 @@
 #include "zsettings.h"
 
 #include <QDebug>
+#include <QLoggingCategory>
+
+Q_LOGGING_CATEGORY(FACTORY, "org.deepin.dde-printer.factory")
 
 std::unique_ptr<Connection> CupsConnectionFactory::createConnection(QString strHost, int port, int encryption)
 
 {
     std::unique_ptr<Connection> connectionPtr = std::unique_ptr<Connection>(new Connection());
     try {
         if (0 != connectionPtr->init(strHost.toUtf8().data(), port, encryption)) {
-            qWarning() << "Unable to connect cups server"  ;
+            qCWarning(FACTORY) << "Unable to connect cups server"  ;
             connectionPtr.reset();
         }
     } catch (const std::exception &ex) {
-        qWarning() << "Got execpt: " << QString::fromUtf8(ex.what());
+        qCWarning(FACTORY) << "Got execpt: " << QString::fromUtf8(ex.what());
         connectionPtr.reset();
 
     }
@@ -29,11 +32,11 @@ std::unique_ptr<Connection> CupsConnectionFactory::createConnectionBySettings()
     std::unique_ptr<Connection> connectionPtr = std::unique_ptr<Connection>(new Connection());
     try {
         if (0 != connectionPtr->init(g_Settings->getCupsServerHost().toLocal8Bit(), g_Settings->getCupsServerPort(), g_Settings->getCupsServerEncryption())) {
-            qWarning() << "Unable to connect deafult cups server";
+            qCWarning(FACTORY) << "Unable to connect deafult cups server";
             connectionPtr.reset();
         }
     } catch (const std::exception &ex) {
-        qWarning() << "Got execpt: " << QString::fromUtf8(ex.what());
+        qCWarning(FACTORY) << "Got execpt: " << QString::fromUtf8(ex.what());
         connectionPtr.reset();
     }
     return connectionPtr;

src/Common/reviselogger.cpp

@@ -0,0 +1,69 @@
+// SPDX-FileCopyrightText: 2019 - 2022 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "reviselogger.h"
+
+#include <dtkcore_global.h>
+#include <qglobal.h>
+
+#include <QLoggingCategory>
+#include <QObject>
+
+#include <DConfig>
+
+DCORE_USE_NAMESPACE
+
+MLogger::MLogger(QObject *parent) : QObject(parent), m_rules(""), m_config(nullptr)
+{
+    QByteArray logRules = qgetenv("QT_LOGGING_RULES");
+    // qunsetenv 之前一定不要有任何日志打印，否则取消环境变量设置不会生效
+    qunsetenv("QT_LOGGING_RULES");
+
+    // set env
+    m_rules = logRules;
+
+    // set dconfig
+    m_config = DConfig::create("dde-printer", "org.deepin.dde.printer");
+    logRules = m_config->value("log_rules").toByteArray();
+    appendRules(logRules);
+    setRules(m_rules);
+
+    // watch dconfig
+    connect(m_config, &DConfig::valueChanged, this, [this](const QString &key) {
+        qDebug() << "value changed:" << key;
+        if (key == "log_rules") {
+            setRules(m_config->value(key).toByteArray());
+        }
+    });
+}
+
+MLogger::~MLogger()
+{
+    m_config->deleteLater();
+}
+
+void MLogger::setRules(const QString &rules) {
+    auto tmpRules = rules;
+    m_rules = tmpRules.replace(";", "\n");
+    QLoggingCategory::setFilterRules(m_rules);
+}
+
+void MLogger::appendRules(const QString &rules) {
+    QString tmpRules = rules;
+    tmpRules = tmpRules.replace(";", "\n");
+    auto tmplist = tmpRules.split('\n');
+    for (int i = 0; i < tmplist.count(); ++i)
+        if (m_rules.contains(tmplist.at(i))) {
+        tmplist.removeAt(i);
+        --i;
+    }
+
+    if (tmplist.isEmpty()) {
+        return;
+    }
+
+    m_rules.isEmpty() ? m_rules = tmplist.join("\n")
+                      : m_rules += "\n" + tmplist.join("\n");
+}
+

src/Common/reviselogger.h

@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2019 - 2022 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <QObject>
+#include <dtkcore_global.h>
+
+DCORE_BEGIN_NAMESPACE
+class DConfig;
+DCORE_END_NAMESPACE
+
+class MLogger : public QObject {
+    Q_OBJECT
+
+public:
+    explicit MLogger(QObject *parent = nullptr);
+    ~MLogger();
+
+    inline QString rules() const { return m_rules; }
+    void setRules(const QString &rules);
+
+private:
+    void appendRules(const QString &rules);
+
+private:
+    QString m_rules;
+    Dtk::Core::DConfig *m_config;
+};
+