Skip to content
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

Jump to bottom

Add ENABLE_LOG_UPLOADER CMake option #1506

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add ENABLE_LOG_UPLOADER CMake option #1506

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
37 changes: 27 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ IF (BUILD_SPARKLE_SUPPORT)
ENDIF()
ENDIF()

option(BUILD_LOG_UPLOADER "Enable log directory uploader" OFF)
IF (BUILD_LOG_UPLOADER)
ADD_DEFINITIONS(-DHAVE_LOG_UPLOADER -DQUAZIP_STATIC)
ENDIF()

MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")

## build in PIC mode
Expand Down Expand Up @@ -200,8 +205,6 @@ if (APPLE)
SET(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
endif()

ADD_DEFINITIONS(-DQUAZIP_STATIC)

# MOC FILES
SET(moc_headers
src/seafile-applet.h
Expand All @@ -222,7 +225,6 @@ SET(moc_headers
src/settings-mgr.h
src/traynotificationwidget.h
src/traynotificationmanager.h
src/log-uploader.h
src/api/api-client.h
src/api/api-request.h
src/api/requests.h
Expand Down Expand Up @@ -288,7 +290,6 @@ SET(moc_headers
src/filebrowser/transfer-mgr.h
src/filebrowser/thumbnail-service.h
third_party/QtAwesome/QtAwesome.h
third_party/quazip/quazipfile.h
${platform_specific_moc_headers}
)

Expand All @@ -300,6 +301,13 @@ IF (BUILD_SHIBBOLETH_SUPPORT)
SET(moc_headers ${moc_headers} src/shib/shib-login-dialog.h ${SHIB_EXTRA_HEADER})
ENDIF()

IF (BUILD_LOG_UPLOADER)
SET(moc_headers ${moc_headers}
src/log-uploader.h
third_party/quazip/quazipfile.h
)
ENDIF()

# UI FILES
SET(ui_files
ui/about-dialog.ui
Expand Down Expand Up @@ -419,7 +427,6 @@ SET(seafile_client_sources
src/traynotificationwidget.cpp
src/traynotificationmanager.cpp
src/certs-mgr.cpp
src/log-uploader.cpp
src/sync-error-service.cpp
src/api/api-client.cpp
src/api/api-request.cpp
Expand Down Expand Up @@ -508,14 +515,21 @@ IF (BUILD_SHIBBOLETH_SUPPORT)
SET(seafile_client_sources ${seafile_client_sources} src/shib/shib-login-dialog.cpp)
ENDIF()

IF (BUILD_LOG_UPLOADER)
SET(seafile_client_sources ${seafile_client_sources} src/log-uploader.cpp)
ENDIF()

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}/third_party/QtAwesome
${CMAKE_CURRENT_SOURCE_DIR}/third_party/quazip
)

IF (BUILD_LOG_UPLOADER)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/third_party/quazip)
ENDIF()

FOREACH(USE_QT_LIBRARY ${USE_QT_LIBRARIES})
INCLUDE_DIRECTORIES(
IF(QT_VERSION_MAJOR EQUAL 6)
Expand Down Expand Up @@ -613,8 +627,11 @@ ENDIF()

ADD_SC_LIBRARY(utils ${utils_sources})

SET(SC_LIBS utils)

# library quazip
LIST(APPEND quazip_sources
IF (BUILD_LOG_UPLOADER)
LIST(APPEND quazip_sources
third_party/quazip/JlCompress.cpp
third_party/quazip/quazip.cpp
third_party/quazip/quazipfile.cpp
Expand All @@ -630,10 +647,10 @@ LIST(APPEND quazip_sources
third_party/quazip/unzip.c
)

ADD_SC_LIBRARY(quazip ${quazip_sources})
ADD_SC_LIBRARY(quazip ${quazip_sources})

SET(SC_LIBS utils quazip)
#SET(SC_LIBS utils)
SET(SC_LIBS ${SC_LIBS} quazip)
ENDIF()

####################
###### end: lib
Expand Down
15 changes: 11 additions & 4 deletions src/ui/tray-icon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@ SeafileTrayIcon::SeafileTrayIcon(QObject *parent)
state_(STATE_DAEMON_UP),
next_message_msec_(0),
sync_errors_dialog_(nullptr),
about_dialog_(nullptr),
log_dir_uploader_(nullptr)
about_dialog_(nullptr)
{
setState(STATE_DAEMON_DOWN);
rotate_timer_ = new QTimer(this);
Expand Down Expand Up @@ -190,9 +189,11 @@ void SeafileTrayIcon::createActions()
open_log_directory_action_->setStatusTip(tr("open %1 log folder").arg(getBrand()));
connect(open_log_directory_action_, SIGNAL(triggered()), this, SLOT(openLogDirectory()));

#ifdef HAVE_LOG_UPLOADER
upload_log_directory_action_ = new QAction(tr("Upload log files"), this);
upload_log_directory_action_->setStatusTip(tr("upload %1 log files").arg(getBrand()));
connect(upload_log_directory_action_, SIGNAL(triggered()), this, SLOT(uploadLogDirectory()));
#endif // HAVE_LOG_UPLOADER

show_sync_errors_action_ = new QAction(tr("Show file sync errors"), this);
show_sync_errors_action_->setStatusTip(tr("Show file sync errors"));
Expand Down Expand Up @@ -223,7 +224,9 @@ void SeafileTrayIcon::createContextMenu()
context_menu_->addAction(shellext_fix_action_);
#endif
context_menu_->addSeparator();
//context_menu_->addAction(upload_log_directory_action_);
#ifdef HAVE_LOG_UPLOADER
context_menu_->addAction(upload_log_directory_action_);
#endif // HAVE_LOG_UPLOADER
context_menu_->addAction(show_sync_errors_action_);
// context_menu_->addMenu(help_menu_);
context_menu_->addSeparator();
Expand Down Expand Up @@ -274,7 +277,9 @@ void SeafileTrayIcon::createGlobalMenuBar()
global_menu_->addAction(open_seafile_folder_action_);
global_menu_->addAction(settings_action_);
global_menu_->addAction(open_log_directory_action_);
//global_menu_->addAction(upload_log_directory_action_);
#ifdef HAVE_LOG_UPLOADER
global_menu_->addAction(upload_log_directory_action_);
#endif // HAVE_LOG_UPLOADER
global_menu_->addAction(show_sync_errors_action_);
global_menu_->addSeparator();
global_menu_->addAction(enable_auto_sync_action_);
Expand Down Expand Up @@ -576,6 +581,7 @@ void SeafileTrayIcon::openLogDirectory()
QDesktopServices::openUrl(QUrl::fromLocalFile(log_path));
}

#ifdef HAVE_LOG_UPLOADER
void SeafileTrayIcon::uploadLogDirectory()
{
if (!seafApplet->accountManager()->currentAccount().isValid()) {
Expand All @@ -594,6 +600,7 @@ void SeafileTrayIcon::clearUploader()
{
log_dir_uploader_ = nullptr;
}
#endif // HAVE_LOG_UPLOADER

void SeafileTrayIcon::showSettingsWindow()
{
Expand Down
12 changes: 10 additions & 2 deletions src/ui/tray-icon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
#include <QQueue>

#include "account.h"
#ifdef HAVE_LOG_UPLOADER
#include "log-uploader.h"
#endif // HAVE_LOG_UPLOADER

class ApiError;
class QAction;
Expand Down Expand Up @@ -74,10 +76,12 @@ private slots:
void openSeafileFolder();
void openLogDirectory();
void shellExtFix();
void uploadLogDirectory();
void about();
void checkTrayIconMessageQueue();
#ifdef HAVE_LOG_UPLOADER
void uploadLogDirectory();
void clearUploader();
#endif // HAVE_LOG_UPLOADER

// only used on windows
void onMessageClicked();
Expand Down Expand Up @@ -109,7 +113,9 @@ private slots:
QAction *open_seafile_folder_action_;
QAction *open_log_directory_action_;
QAction *shellext_fix_action_;
#ifdef HAVE_LOG_UPLOADER
QAction *upload_log_directory_action_;
#endif
QAction *show_sync_errors_action_;

QAction *about_action_;
Expand Down Expand Up @@ -150,7 +156,9 @@ private slots:

SyncErrorsDialog *sync_errors_dialog_;
AboutDialog *about_dialog_;
LogDirUploader *log_dir_uploader_;
#ifdef HAVE_LOG_UPLOADER
LogDirUploader *log_dir_uploader_ = nullptr;
#endif // HAVE_LOG_UPLOADER
bool have_sync_errors_ = false;
};

Expand Down