Initial progress towards new remote project ux

Author: negasora

binaryninjaapi.h

@@ -2752,6 +2752,10 @@ namespace BinaryNinja {
 		bool Export(const std::string& destination, const std::function<bool(size_t progress, size_t total)>& progressCallback = {}) const;
 	};
 
+	namespace Collaboration
+	{
+		class RemoteFile;
+	}
 	/*!
 
 	\ingroup project
@@ -2773,6 +2777,7 @@ namespace BinaryNinja {
 		void SetFolder(Ref<ProjectFolder> folder);
 		bool Export(const std::string& destination) const;
 		int64_t GetCreationTimestamp() const;
+		Ref<Collaboration::RemoteFile> GetRemoteFile() const;
 	};
 
 
@@ -20436,8 +20441,9 @@ namespace BinaryNinja::Collaboration
 		Ref<RemoteFile> GetFileByName(const std::string& name);
 		void PullFiles(std::function<bool(size_t, size_t)> progress = {});
 		void PullFolders(std::function<bool(size_t, size_t)> progress = {});
-		Ref<RemoteFile> CreateFile(const std::string& filename, std::vector<uint8_t>& contents, const std::string& name, const std::string& description, Ref<RemoteFolder> folder, BNRemoteFileType type, std::function<bool(size_t, size_t)> progress = {}, Ref<ProjectFile> coreFile = nullptr);
-		Ref<RemoteFolder> CreateFolder(const std::string& name, const std::string& description, Ref<RemoteFolder> parent, std::function<bool(size_t, size_t)> progress = {}, Ref<ProjectFolder> coreFolder = nullptr);
+		Ref<RemoteFile> UploadProjectFile(Ref<ProjectFile> projectFile, std::function<bool(size_t, size_t)> progress);
+		Ref<RemoteFile> CreateFile(const std::string& filename, std::vector<uint8_t>& contents, const std::string& name, const std::string& description, Ref<RemoteFolder> folder, BNRemoteFileType type, std::function<bool(size_t, size_t)> progress = {});
+		Ref<RemoteFolder> CreateFolder(const std::string& name, const std::string& description, Ref<RemoteFolder> parent, std::function<bool(size_t, size_t)> progress = {});
 		void PushFile(Ref<RemoteFile> file, const std::vector<std::pair<std::string, std::string>>& extraFields = {});
 		void PushFolder(Ref<RemoteFolder> folder, const std::vector<std::pair<std::string, std::string>>& extraFields = {});
 		void DeleteFolder(const Ref<RemoteFolder> folder);

binaryninjacore.h

@@ -3924,6 +3924,7 @@ extern "C"
 	BINARYNINJACOREAPI BNProject* BNProjectFileGetProject(BNProjectFile* file);
 	BINARYNINJACOREAPI bool BNProjectFileExport(BNProjectFile* file, const char* destination);
 	BINARYNINJACOREAPI int64_t BNProjectFileGetCreationTimestamp(BNProjectFile* file);
+	BINARYNINJACOREAPI BNRemoteFile* BNProjectFileGetRemoteFile(BNProjectFile* file);
 
 
 	// ProjectFolder object
@@ -7916,6 +7917,7 @@ extern "C"
 	BINARYNINJACOREAPI BNRemoteFile* BNRemoteProjectGetFileById(BNRemoteProject* project, const char* id);
 	BINARYNINJACOREAPI BNRemoteFile* BNRemoteProjectGetFileByName(BNRemoteProject* project, const char* name);
 	BINARYNINJACOREAPI bool BNRemoteProjectPullFiles(BNRemoteProject* project, BNProgressFunction progress, void* progressContext);
+	BINARYNINJACOREAPI BNRemoteFile* BNRemoteProjectUploadProjectFile(BNRemoteProject* project, BNProjectFile* file, BNProgressFunction progress, void* progressContext);
 	BINARYNINJACOREAPI BNRemoteFile* BNRemoteProjectCreateFile(BNRemoteProject* project, const char* filename, uint8_t* contents, size_t contentsSize, const char* name, const char* description, BNRemoteFolder* folder, BNRemoteFileType type, BNProgressFunction progress, void* progressContext);
 	BINARYNINJACOREAPI bool BNRemoteProjectPushFile(BNRemoteProject* project, BNRemoteFile* file, const char** extraFieldKeys, const char** extraFieldValues, size_t extraFieldCount);
 	BINARYNINJACOREAPI bool BNRemoteProjectDeleteFile(BNRemoteProject* project, BNRemoteFile* file);

collaboration.cpp

@@ -1353,7 +1353,18 @@ void RemoteProject::PullFolders(std::function<bool(size_t, size_t)> progress)
 }
 
 
-Ref<RemoteFile> RemoteProject::CreateFile(const std::string& filename, std::vector<uint8_t>& contents, const std::string& name, const std::string& description, Ref<RemoteFolder> folder, BNRemoteFileType type, std::function<bool(size_t, size_t)> progress, Ref<ProjectFile> coreFile)
+Ref<RemoteFile> RemoteProject::UploadProjectFile(Ref<ProjectFile> projectFile, std::function<bool(size_t, size_t)> progress)
+{
+	ProgressContext pctxt;
+	pctxt.callback = progress;
+	BNRemoteFile* remoteFile = BNRemoteProjectUploadProjectFile(m_object, projectFile->m_object, ProgressCallback, &pctxt);
+	if (remoteFile == nullptr)
+		return nullptr;
+	return new RemoteFile(remoteFile);
+}
+
+
+Ref<RemoteFile> RemoteProject::CreateFile(const std::string& filename, std::vector<uint8_t>& contents, const std::string& name, const std::string& description, Ref<RemoteFolder> folder, BNRemoteFileType type, std::function<bool(size_t, size_t)> progress)
 {
 	ProgressContext pctxt;
 	pctxt.callback = progress;
@@ -1364,7 +1375,7 @@ Ref<RemoteFile> RemoteProject::CreateFile(const std::string& filename, std::vect
 }
 
 
-Ref<RemoteFolder> RemoteProject::CreateFolder(const std::string& name, const std::string& description, Ref<RemoteFolder> parent, std::function<bool(size_t, size_t)> progress, Ref<ProjectFolder> coreFolder)
+Ref<RemoteFolder> RemoteProject::CreateFolder(const std::string& name, const std::string& description, Ref<RemoteFolder> parent, std::function<bool(size_t, size_t)> progress)
 {
 	ProgressContext pctxt;
 	pctxt.callback = progress;

project.cpp

@@ -625,6 +625,17 @@ int64_t ProjectFile::GetCreationTimestamp() const
 }
 
 
+Ref<Collaboration::RemoteFile> ProjectFile::GetRemoteFile() const
+{
+
+	BNRemoteFile* remoteFile = BNProjectFileGetRemoteFile(m_object);
+	if (remoteFile == nullptr)
+		return nullptr;
+	return new Collaboration::RemoteFile(remoteFile);
+}
+
+
+
 ProjectFolder::ProjectFolder(BNProjectFolder* folder)
 {
 	m_object = folder;

ui/projectbrowser.h

@@ -41,6 +41,19 @@ class BINARYNINJAUIAPI ProjectStatusWidget: public MenuHelper
 };
 
 
+class BINARYNINJAUIAPI ProjectItemDelegate: public QStyledItemDelegate
+{
+	Q_OBJECT
+
+	ProjectRef m_project;
+
+public:
+	ProjectItemDelegate(ProjectRef project, QObject* parent = nullptr);
+
+	virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+};
+
+
 class BINARYNINJAUIAPI ProjectItemModel: public QStandardItemModel, public BinaryNinja::ProjectNotification
 {
 	Q_OBJECT
@@ -101,15 +114,27 @@ class BINARYNINJAUIAPI ProjectItemModel: public QStandardItemModel, public Binar
 		IdRole,
 		DiskPathRole,
 		SortRole,
+		SyncStateRole,
 	};
 
 	enum {
 		FileType,
 		FolderType,
 	};
 
+	enum SyncState {
+		Synced,
+		Unknown,
+		MissingFromRemote,
+		MissingFromLocal,
+		MissingFromLocalAndRemote, // For folders that have some contents missing from either
+		Uploading,
+		Downloading,
+	};
+
 	enum {
 		COL_NAME = 0,
+		COL_SYNC_STATUS,
 		COL_TYPE,
 		COL_SIZE_ON_DISK,
 		COL_CREATED,
@@ -342,6 +367,8 @@ private slots:
 	void PromptEditProjectDetails();
 	void Refresh();
 	void DownloadSelectedFilesRecursive();
+	void UploadSelectedFilesRecursive();
+
 
 public:
 	ProjectBrowser(QWidget* parent, ProjectRef project);