Skip to content

refactor: update notification handling and data access logic #1181

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
18202781743 merged 1 commit into from
Jul 10, 2025
Merged

refactor: update notification handling and data access logic #1181

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions panels/notification/center/notifystagingmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ void NotifyStagingModel::remove(qint64 id)

qDebug(notifyLog) << "Insert notify" << newEntity.bubbleId();
beginInsertRows(QModelIndex(), insertedIndex, insertedIndex);
auto notify = new BubbleNotifyItem(newEntity);
auto notify = new AppNotifyItem(newEntity);
m_appNotifies.insert(insertedIndex, notify);
endInsertRows();
}
Expand All @@ -170,7 +170,7 @@ void NotifyStagingModel::open()

const auto count = std::min(static_cast<int>(entities.size()), BubbleMaxCount);
for (int i = 0; i < count; i++) {
auto notify = new BubbleNotifyItem(entities.at(i));
auto notify = new AppNotifyItem(entities.at(i));
m_appNotifies << notify;
}
updateOverlapCount(entities.size());
Expand Down
88 changes: 32 additions & 56 deletions panels/notification/common/dataaccessorproxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ DataAccessorProxy *DataAccessorProxy::instance()
if (!gInstance) {
gInstance = new DataAccessorProxy();
gInstance->m_impl = new MemoryAccessor();
gInstance->m_source = new MemoryAccessor();
}
return gInstance;
}
Expand All @@ -30,6 +31,12 @@ DataAccessorProxy::~DataAccessorProxy()

void DataAccessorProxy::setSource(DataAccessor *source)
{
if (!source)
return;

if (m_source) {
delete m_source;
}
m_source = source;
}

Expand All @@ -38,139 +45,108 @@ qint64 DataAccessorProxy::addEntity(const NotifyEntity &entity)
if (entity.processedType() == NotifyEntity::NotProcessed) {
return m_impl->addEntity(entity);
} else {
if (m_source && m_source->isValid() && !filterToSource(entity)) {
if (!filterToSource(entity)) {
return m_source->addEntity(entity);
}
}
return m_impl->addEntity(entity);
return -1;
}

qint64 DataAccessorProxy::replaceEntity(qint64 id, const NotifyEntity &entity)
{
if (entity.processedType() == NotifyEntity::NotProcessed) {
return m_impl->replaceEntity(id, entity);
} else {
if (m_source && m_source->isValid()) {
return m_source->replaceEntity(id, entity);
}
return m_source->replaceEntity(id, entity);
}
return m_impl->replaceEntity(id, entity);
}

void DataAccessorProxy::updateEntityProcessedType(qint64 id, int processedType)
{
if (routerToSource(id, processedType)) {
m_impl->updateEntityProcessedType(id, processedType);
if (m_source && m_source->isValid()) {
auto entity = m_impl->fetchEntity(id);
if (!filterToSource(entity)) {
const auto sId = m_source->addEntity(entity);
if (sId > 0) {
m_impl->removeEntity(id);
entity.setId(sId);
}
} else {
auto entity = m_impl->fetchEntity(id);
if (!filterToSource(entity)) {
const auto sId = m_source->addEntity(entity);
if (sId > 0) {
m_impl->removeEntity(id);
entity.setId(sId);
}
} else {
m_impl->removeEntity(id);
}
return;
}
if (m_source && m_source->isValid()) {
} else {
return m_source->updateEntityProcessedType(id, processedType);
}
return m_impl->updateEntityProcessedType(id, processedType);
}

NotifyEntity DataAccessorProxy::fetchEntity(qint64 id)
{
auto entity = m_impl->fetchEntity(id);
if (entity.isValid())
return entity;
if (m_source && m_source->isValid()) {
return m_source->fetchEntity(id);
}
return {};

return m_source->fetchEntity(id);
}

int DataAccessorProxy::fetchEntityCount(const QString &appName, int processedType) const
{
if (processedType == NotifyEntity::NotProcessed) {
return m_impl->fetchEntityCount(appName, processedType);
} else {
if (m_source && m_source->isValid()) {
return m_source->fetchEntityCount(appName, processedType);
}
return m_source->fetchEntityCount(appName, processedType);
}
return m_impl->fetchEntityCount(appName, processedType);
}

NotifyEntity DataAccessorProxy::fetchLastEntity(const QString &appName, int processedType)
{
if (processedType == NotifyEntity::NotProcessed) {
return m_impl->fetchLastEntity(appName, processedType);
} else {
if (m_source && m_source->isValid()) {
return m_source->fetchLastEntity(appName, processedType);
}
return m_source->fetchLastEntity(appName, processedType);
}
return m_impl->fetchLastEntity(appName, processedType);
}

NotifyEntity DataAccessorProxy::fetchLastEntity(uint notifyId)
{
auto entity = m_impl->fetchLastEntity(notifyId);
if (entity.isValid())
return entity;
if (m_source && m_source->isValid()) {
return m_source->fetchLastEntity(notifyId);
}
return {};

return m_source->fetchLastEntity(notifyId);
}

QList<NotifyEntity> DataAccessorProxy::fetchEntities(const QString &appName, int processedType, int maxCount)
{
if (processedType == NotifyEntity::NotProcessed) {
return m_impl->fetchEntities(appName, processedType, maxCount);
}
if (m_source && m_source->isValid()) {
return m_source->fetchEntities(appName, processedType, maxCount);
}
return m_impl->fetchEntities(appName, processedType, maxCount);

return m_source->fetchEntities(appName, processedType, maxCount);
}

QList<QString> DataAccessorProxy::fetchApps(int maxCount) const
{
if (m_source && m_source->isValid()) {
return m_source->fetchApps(maxCount);
}
return m_impl->fetchApps(maxCount);
return m_source->fetchApps(maxCount);
}

void DataAccessorProxy::removeEntity(qint64 id)
{
m_impl->removeEntity(id);

if (m_source && m_source->isValid()) {
if (m_impl->fetchEntity(id).isValid()) {
m_impl->removeEntity(id);
} else {
m_source->removeEntity(id);
}
}

void DataAccessorProxy::removeEntityByApp(const QString &appName)
{
m_impl->removeEntityByApp(appName);

if (m_source && m_source->isValid()) {
m_source->removeEntityByApp(appName);
}
m_source->removeEntityByApp(appName);
}

void DataAccessorProxy::clear()
{
m_impl->clear();

if (m_source && m_source->isValid()) {
m_source->clear();
}
m_source->clear();
}

bool DataAccessorProxy::routerToSource(qint64 id, int processedType) const
Expand Down