Skip to content

Decouple selective sync #4719

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

Open
tomasMizera wants to merge 5 commits into from
Open

Decouple selective sync #4719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
30abf5b
Decouple selective sync configuration
tomasMizera Sep 25, 2026
99aebcf
Fix errors in autotests - 1
tomasMizera Sep 25, 2026
304cbec
Fix errors in autotests - 2 - lookup project id after project creation
tomasMizera Sep 25, 2026
10a4554
Fix errors in autotests - 3
tomasMizera Sep 25, 2026
95e026b
Fix errors in autotests - 4
tomasMizera Sep 25, 2026
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
18 changes: 9 additions & 9 deletions app/projectsmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ QVariant ProjectsModel::data( const QModelIndex &index, int role ) const
}
else
{
ProjectStatus::Status status = ProjectStatus::projectStatus( project, *mBackend );
ProjectStatus::Status status = ProjectStatus::projectStatus( project );

if ( status == ProjectStatus::NeedsSync )
{
Expand Down Expand Up @@ -285,7 +285,7 @@ void ProjectsModel::mergeProjects( const MerginProjectsList &merginProjects, Mer
if ( res != merginProjects.end() )
{
project.mergin = *res;
project.mergin.status = ProjectStatus::projectStatus( project, *mBackend );
project.mergin.status = ProjectStatus::projectStatus( project );
}
else if ( project.local.hasMerginMetadata() )
{
Expand All @@ -295,7 +295,7 @@ void ProjectsModel::mergeProjects( const MerginProjectsList &merginProjects, Mer
// (listProjectsByName API limits response to max 50 projects)
project.mergin.projectName = project.local.projectName;
project.mergin.projectNamespace = project.local.projectNamespace;
project.mergin.status = ProjectStatus::projectStatus( project, *mBackend );
project.mergin.status = ProjectStatus::projectStatus( project );
}

mProjects << project;
Expand All @@ -317,7 +317,7 @@ void ProjectsModel::mergeProjects( const MerginProjectsList &merginProjects, Mer
Project project;

MerginApi::extractProjectName( pendingProjectName, project.mergin.projectNamespace, project.mergin.projectName );
project.mergin.status = ProjectStatus::projectStatus( project, *mBackend );
project.mergin.status = ProjectStatus::projectStatus( project );

mProjects << project;
}
Expand All @@ -340,7 +340,7 @@ void ProjectsModel::mergeProjects( const MerginProjectsList &merginProjects, Mer
{
project.local = *match;
}
project.mergin.status = ProjectStatus::projectStatus( project, *mBackend );
project.mergin.status = ProjectStatus::projectStatus( project );

mProjects << project;
}
Expand Down Expand Up @@ -429,7 +429,7 @@ void ProjectsModel::onProjectSyncFinished( const QString &projectFullName, bool
project.mergin.serverVersion = newVersion;
}

project.mergin.status = ProjectStatus::projectStatus( project, *mBackend );
project.mergin.status = ProjectStatus::projectStatus( project );

QModelIndex changeIndex = index( ix );
emit dataChanged( changeIndex, changeIndex, { ProjectSyncPending, ProjectSyncProgress, ProjectStatus } );
Expand Down Expand Up @@ -474,7 +474,7 @@ void ProjectsModel::onProjectAdded( const LocalProject &localProject )
project.local = localProject;
if ( project.isMergin() )
{
project.mergin.status = ProjectStatus::projectStatus( project, *mBackend );
project.mergin.status = ProjectStatus::projectStatus( project );
}

QModelIndex modelIx = index( ix );
Expand Down Expand Up @@ -510,7 +510,7 @@ void ProjectsModel::onAboutToRemoveProject( const LocalProject &localProject )
{
// just remove local part
mProjects[ix].local = LocalProject();
mProjects[ix].mergin.status = ProjectStatus::projectStatus( mProjects[ix], *mBackend );
mProjects[ix].mergin.status = ProjectStatus::projectStatus( mProjects[ix] );

QModelIndex modelIx = index( ix );
emit dataChanged( modelIx, modelIx );
Expand All @@ -531,7 +531,7 @@ void ProjectsModel::onProjectDataChanged( const LocalProject &localProject )

if ( project.isMergin() )
{
project.mergin.status = ProjectStatus::projectStatus( project, *mBackend );
project.mergin.status = ProjectStatus::projectStatus( project );
}

QModelIndex editIndex = index( ix );
Expand Down
220 changes: 116 additions & 104 deletions app/test/testmerginapi.cpp
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/test/testmerginapi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class TestMerginApi: public QObject
void testAutosync();
void testAutosyncFailure();
void testUpdateProjectMetadataRole();
void testMerginConfigFromFile();
void testSelectiveSyncConfigFromFile();
void testHasLocalChangesWithSelectiveSyncEnabled();
void testHasLocalProjectChanges();
void testOfflineCache();
Expand Down Expand Up @@ -200,8 +200,8 @@ class TestMerginApi: public QObject
void deleteRemoteProjectNow( MerginApi *api, const QString &projectNamespace, const QString &projectName );

//! Downloads a remote project to the local drive, extended version also sets server version
void downloadRemoteProject( MerginApi *api, const QString &projectNamespace, const QString &projectName, int &serverVersion );
void downloadRemoteProject( MerginApi *api, const QString &projectNamespace, const QString &projectName );
void downloadRemoteProject( MerginApi *api, const QString &projectNamespace, const QString &projectName, int &serverVersion, bool ignoreSelectiveSync = false );
void downloadRemoteProject( MerginApi *api, const QString &projectNamespace, const QString &projectName, bool ignoreSelectiveSync = false );

//! Uploads any local changes in the local project to the remote project, extended version also sets server version
void uploadRemoteProject( MerginApi *api, const QString &projectNamespace, const QString &projectName, int &serverVersion );
Expand Down
4 changes: 2 additions & 2 deletions app/test/testutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void TestUtils::generateRandomUser( MerginApi *api, QString &username, QString &

// change the data plan
QString workspaceId = QString::number( api->userInfo()->activeWorkspaceId() );
QSignalSpy wsStorageSpy( api, &MerginApi::updateWorkspaceService );
QSignalSpy wsStorageSpy( api, &MerginApi::workspaceLimitsUpdated );

// Create JSON payload to change the data plan
QString payload = QString( R"({
Expand All @@ -200,7 +200,7 @@ void TestUtils::generateRandomUser( MerginApi *api, QString &username, QString &
qDebug() << "Updated the storage limit" << username;
}

// this needs to be cleared, as the user will be authorized in the test cases.
// this needs to be cleared, as the user will be authorized in the test cases.
api->clearAuth();

}
Expand Down
2 changes: 1 addition & 1 deletion core/localprojectsmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ QString LocalProjectsManager::projectChanges( const QString &projectId )

if ( project.isValid() )
{
return MerginApi::localProjectChanges( project.projectDir ).dump();
return MerginApi::localChanges( project.projectDir ).dump();
}

return QString();
Expand Down
Loading
Loading