diff --git a/OneDriveGUI/OneDriveGUI.py b/OneDriveGUI/OneDriveGUI.py index cf71d65..5702f86 100644 --- a/OneDriveGUI/OneDriveGUI.py +++ b/OneDriveGUI/OneDriveGUI.py @@ -1,20 +1,37 @@ #!/usr/bin/env python3 import os -import psutil import re import subprocess import sys -import time from configparser import ConfigParser -from PySide6.QtCore import QThread, QTimer, QUrl, Signal, QFileInfo, Qt -from PySide6.QtGui import QIcon -from PySide6.QtWidgets import ( QWidget, QApplication, QMainWindow, QMenu, QSystemTrayIcon, - QListWidget, QListWidgetItem, QFileIconProvider, QStackedLayout, - QVBoxLayout, QLabel, QAbstractItemView) +from PySide6.QtCore import QThread, QTimer, QUrl, Signal, QFileInfo, Qt, QDir +from PySide6.QtGui import QIcon, QPixmap +from PySide6.QtWidgets import ( + QWidget, + QApplication, + QMainWindow, + QMenu, + QSystemTrayIcon, + QListWidget, + QListWidgetItem, + QFileIconProvider, + QStackedLayout, + QVBoxLayout, + QLabel, + QAbstractItemView, + QWizard, + QWizardPage, + QLineEdit, + QCheckBox, + QPushButton, + QFormLayout, + QGridLayout, + QFileDialog, +) -# TODO: Split into multiple files once all main features are implemented. +# TODO: Split into multiple files once all main features are implemented. # Import for login window. from ui.ui_login import Ui_LoginWindow @@ -31,8 +48,406 @@ from ui.ui_profile_settings_page import Ui_profile_settings from ui.ui_import_existing_profile import Ui_import_profile from ui.ui_create_new_profile import Ui_create_new_profile +# Imports for setup wizards +# from ui.ui_setup_wizard import Ui_SetupWizard +# from setup_wizard import SetupWizard -PROFILES_FILE = os.path.expanduser('~/.config/onedrive-gui/profiles') + +PROFILES_FILE = os.path.expanduser("~/.config/onedrive-gui/profiles") + + +class SetupWizard(QWizard): + def __init__(self, parent=None): + super(SetupWizard, self).__init__(parent) + self.setWindowIcon(QIcon("resources/images/icons8-clouds-48.png")) + + self.setPage(1, WizardPage_welcome(self)) + self.setPage(2, wizardPage_version_check(self)) + self.setPage(3, wizardPage_create_import(self)) + self.setPage(4, wizardPage_create(self)) + self.setPage(5, wizardPage_import(self)) + self.setPage(6, wizardPage_finish(self)) + # self.setPage(7, wizardPage_extra(self)) + # self.page(6).setFinalPage(True) + + self.setWindowTitle("OneDriveGUI Setup Wizard") + self.resize(640, 480) + + self.currentIdChanged.connect(self.on_page_change) + + def on_page_change(self): + if self.currentId() == 2: + print("Checking installed OneDrive version") + self.page(2).check_onedrive_version() + + def nextId(self): + if self.currentPage() == self.page(1): + return 2 + if self.currentPage() == self.page(2): + return 3 + if self.currentPage() == self.page(3): + if self.page(3).checkBox_create.isChecked(): + return 4 + elif self.page(3).checkBox_import.isChecked(): + return 5 + if self.currentPage() == self.page(4): + return 6 + if self.currentPage() == self.page(5): + return 6 + if self.currentPage() == self.page(6): + return -1 + + +class WizardPage_welcome(QWizardPage): + def __init__(self, parent=None): + super(WizardPage_welcome, self).__init__(parent) + + self.setTitle("Welcome to OneDriveGUI") + # self.setSubTitle("SubTitle") + + # self.label1 = QLabel() + # self.label1.setText("Welcome to OneDriveGUI") + + self.label_2 = QLabel() + self.label_2.setText("This wizard will help you with initial OneDrive profile creation/import.") + + layout = QVBoxLayout() + # layout.addWidget(self.label1) + layout.addWidget(self.label_2) + self.setLayout(layout) + + +class wizardPage_version_check(QWizardPage): + def __init__(self, parent=None): + super(wizardPage_version_check, self).__init__(parent) + self.setTitle("OneDrive version check") + + # self.label_3 = QLabel() + # self.label_3.setText("Installed OneDrive version:") + + self.label_4 = QLabel() + self.label_4.setText("Installed/Not Installed/ version") + + self.label_5 = QLabel() + self.label_5.setWordWrap(True) + self.label_5.setText( + "OneDrive Client for Linux does not seem to be installed. Please install it by following " + "instructions for your distro. " + ) + + layout = QVBoxLayout() + # layout.addWidget(self.label_3) + layout.addWidget(self.label_4) + layout.addWidget(self.label_5) + self.setLayout(layout) + + def check_onedrive_version(self): + # Check if OneDrive is installed + od_version_check = subprocess.check_output(["onedrive", "--version"]) + if "onedrive v" in str(od_version_check): + self.od_version = re.search(r".\s(v[0-9.]+)", str(od_version_check)).group(1) + print(f"OneDrive {self.od_version} detected.") + self.label_4.setText(f"OneDrive {self.od_version} detected.") + self.label_5.hide() + return True + else: + self.label_4.setText("OneDrive not detected.") + return False + + +class wizardPage_create_import(QWizardPage): + def __init__(self, parent=None): + super(wizardPage_create_import, self).__init__(parent) + self.setTitle("Create/Import OneDrive profile") + + self.checkBox_create = QCheckBox() + self.checkBox_create.setText("Create new OneDrive profile") + self.checkBox_create.stateChanged.connect(self.on_checkbox_change) + + self.checkBox_import = QCheckBox() + self.checkBox_import.setText("Import existing OneDrive profile/config") + self.checkBox_import.stateChanged.connect(self.on_checkbox_change) + + layout = QVBoxLayout() + layout.addWidget(self.checkBox_create) + layout.addWidget(self.checkBox_import) + self.setLayout(layout) + + def on_checkbox_change(self): + if self.checkBox_create.isChecked(): + print(f"Create new profile is checked") + self.checkBox_import.setDisabled(True) + self.completeChanged.emit() + + elif self.checkBox_import.isChecked(): + print(f"Import profile is checked") + self.checkBox_create.setDisabled(True) + self.completeChanged.emit() + + else: + print(f"No option is unchecked") + self.checkBox_import.setDisabled(False) + self.checkBox_create.setDisabled(False) + self.completeChanged.emit() + + def isComplete(self): + if self.checkBox_create.isChecked() == False and self.checkBox_import.isChecked() == False: + print("not complete") + return False + else: + print("complete") + return True + + +class wizardPage_create(QWizardPage): + def __init__(self, parent=None): + super(wizardPage_create, self).__init__(parent) + self.setTitle("Create OneDrive profile") + + # self.label_10 = QLabel() + # self.label_10.setText("Create new profile") + + self.label_new_profile_name = QLabel() + self.label_new_profile_name.setText("New profile name") + + self.lineEdit_new_profile_name = QLineEdit() + self.lineEdit_new_profile_name.setPlaceholderText("E.g. john@live.com") + self.lineEdit_new_profile_name.textChanged.connect(self.update_sync_dir) + + self.label_sync_dir = QLabel() + self.label_sync_dir.setText("Sync directory") + + self.lineEdit_sync_dir = QLineEdit() + self.lineEdit_sync_dir.setPlaceholderText("E.g. ~/OneDrive_john@live.com/") + + self.pushButton_browse = QPushButton() + self.pushButton_browse.setText("Browse") + self.pushButton_browse.clicked.connect(self.get_dir_name) + + self.pushButton_create = QPushButton() + self.pushButton_create.setText("Create new profile") + self.pushButton_create.clicked.connect(self.create_profile) + + layout = QGridLayout() + # layout.addRow("Profile Name", self.lineEdit_new_profile_name) + # layout.addRow("Sync Directory", self.lineEdit_sync_dir) + # layout.addRow(self.pushButton_create) + + # layout.addWidget(self.label_10) + layout.addWidget(self.label_new_profile_name, 0, 0) + layout.addWidget(self.lineEdit_new_profile_name, 0, 1) + layout.addWidget(self.label_sync_dir, 1, 0) + layout.addWidget(self.lineEdit_sync_dir, 1, 1) + layout.addWidget(self.pushButton_browse, 1, 2) + layout.addWidget(self.pushButton_create, 2, 0, 1, 3) + self.setLayout(layout) + + def isComplete(self): + if self.pushButton_create.text() == "Done": + return True + return False + + def get_dir_name(self): + self.file_dialog = QFileDialog.getExistingDirectory( + dir=os.path.expanduser("~/") + ) # getOpenFileName(self, dir=os.path.expanduser("~/.config/")) + + dir_name = self.file_dialog + + print(dir_name) + self.lineEdit_sync_dir.setText(dir_name) + + def update_sync_dir(self, text): + self.lineEdit_sync_dir.setText(f"~/OneDrive_{text}") + + def create_profile(self): + """ + Creates new profile and loads default settings. + TODO: Consolidate with import_profile() + """ + profile_name = self.lineEdit_new_profile_name.text() + sync_dir = self.lineEdit_sync_dir.text() + config_path = os.path.expanduser(f"~/.config/onedrive/accounts/{profile_name}/config") + + # Load all default values. + _default_od_config = read_config("resources/default_config") + default_od_config = _default_od_config._sections + + # Construct dict with user profile settings. + new_profile = {profile_name: {"config_file": config_path, "enable_debug": False, "mode": "monitor"}} + + # Load existing user profiles and add the new profile. + _profiles = ConfigParser() + _profiles.read(PROFILES_FILE) + _profiles[profile_name] = new_profile[profile_name] + + # Create profile config file if it does not exist. + profiles_dir = re.search(r"(.+)/profiles$", PROFILES_FILE).group(1) + if not os.path.exists(profiles_dir): + os.makedirs(profiles_dir) + + # Save the new profile. + with open(PROFILES_FILE, "w") as profilefile: + _profiles.write(profilefile) + + # Append default OD config + new_profile[profile_name].update(default_od_config) + + # Configure sync directory + new_profile[profile_name]["onedrive"]["sync_dir"] = f'"{sync_dir}"' + + # Append new profile into running global profile + global_config.update(new_profile) + + # Automatically save global config to prevent loss if user does not press 'Save' button. + save_global_config() + + # Add Setting page widget for new profile + settings_window.listWidget_profiles.addItem(profile_name) + self.setting_page = ProfileSettingsPage(profile_name) + settings_window.stackedLayout.addWidget(self.setting_page) + + # Add status page widget for new profile + main_window.comboBox.addItem(profile_name) + main_window.profile_status_pages[profile_name] = ProfileStatusPage(profile_name) + main_window.stackedLayout.addWidget(main_window.profile_status_pages[profile_name]) + + # Hide "Create profile" push button from main windows. + main_window.pushButton_new_profile.hide() + + print(f"Account {profile_name} has been created") + self.pushButton_create.setText("Done") + self.pushButton_create.setDisabled(True) + self.completeChanged.emit() + + +class wizardPage_import(QWizardPage): + def __init__(self, parent=None): + super(wizardPage_import, self).__init__(parent) + self.setTitle("Import OneDrive profile") + + self.label_profile_name = QLabel() + self.label_profile_name.setText("Profile name") + + self.label_config_path = QLabel() + self.label_config_path.setText("Config file path") + + self.lineEdit_profile_name = QLineEdit() + self.lineEdit_profile_name.setPlaceholderText("E.g. john@live.com") + + self.lineEdit_config_path = QLineEdit() + self.lineEdit_config_path.setPlaceholderText("E.g. ~/.config/onedrive/config") + + self.pushButton_browse = QPushButton() + self.pushButton_browse.setText("Browse") + self.pushButton_browse.clicked.connect(self.get_config_name) + + self.pushButton_import = QPushButton() + self.pushButton_import.setText("Import") + self.pushButton_import.clicked.connect(self.import_profile) + + # self.registerField("label_profile_name*",self.label_profile_name) + + layout = QGridLayout() + layout.addWidget(self.label_profile_name, 0, 0) + layout.addWidget(self.label_config_path, 1, 0) + layout.addWidget(self.lineEdit_profile_name, 0, 1) + layout.addWidget(self.lineEdit_config_path, 1, 1) + layout.addWidget(self.pushButton_browse, 1, 2) + layout.addWidget(self.pushButton_import, 2, 0, 2, 3) + self.setLayout(layout) + + def isComplete(self): + if self.pushButton_import.text() == "Done": + return True + return False + + def get_config_name(self): + self.file_dialog = QFileDialog.getOpenFileName(self, dir=os.path.expanduser("~/.config/")) + + file_name = self.file_dialog[0] + + print(file_name) + self.lineEdit_config_path.setText(file_name) + + def import_profile(self): + """ + Imports pre-existing OneDrive profile. + Loads default values firt, then overwrite them with user settings. + This is to handle cases where imported config contains only some properties. + """ + + profile_name = self.lineEdit_profile_name.text() + config_path = os.path.expanduser(self.lineEdit_config_path.text()) + + # Load all default values. + _default_od_config = read_config("resources/default_config") + default_od_config = _default_od_config._sections + + # Load user's settings. + _new_od_config = read_config(config_path) + new_od_config = _new_od_config._sections + + # Construct dict with user profile settings. + new_profile = {profile_name: {"config_file": config_path, "enable_debug": False, "mode": "monitor"}} + + # Load existing user profiles and add the new profile. + _profiles = ConfigParser() + _profiles.read(PROFILES_FILE) + _profiles[profile_name] = new_profile[profile_name] + + # Create profile config file if it does not exist. + profiles_dir = re.search(r"(.+)/profiles$", PROFILES_FILE).group(1) + if not os.path.exists(profiles_dir): + os.makedirs(profiles_dir) + + # Save the new profile. + with open(PROFILES_FILE, "w") as configfile: + _profiles.write(configfile) + + # Append OD config + new_profile[profile_name].update(default_od_config) + new_profile[profile_name].update(new_od_config) + + # Append new profile into running global profile + global_config.update(new_profile) + # print(new_profile) + # print(global_config) + + settings_window.listWidget_profiles.addItem(profile_name) + self.setting_page = ProfileSettingsPage(profile_name) + settings_window.stackedLayout.addWidget(self.setting_page) + + # Add status page widget for new profile + main_window.comboBox.addItem(profile_name) + main_window.profile_status_pages[profile_name] = ProfileStatusPage(profile_name) + main_window.stackedLayout.addWidget(main_window.profile_status_pages[profile_name]) + + # Hide "Create profile" push button from main windows. + main_window.pushButton_new_profile.hide() + + print(f"Account {profile_name} has been imported") + self.pushButton_import.setText("Done") + self.pushButton_import.setDisabled(True) + self.completeChanged.emit() + + +class wizardPage_finish(QWizardPage): + def __init__(self, parent=None): + super(wizardPage_finish, self).__init__(parent) + self.setTitle("Finished") + self.label_13 = QLabel() + self.label_13.setWordWrap(True) + self.label_13.setText( + "

Your OneDrive profile has been created. " + "


You can adjust advanced profile options if needed. " + "Once you are happy with the profile settings, start sync with OneDrive. " + "You will be automatically presented with a OneDrive login page if you have not logged on previously.

" + ) + + layout = QFormLayout() + layout.addWidget(self.label_13) + self.setLayout(layout) class SettingsWindow(QWidget, Ui_settings_window): @@ -42,7 +457,7 @@ class SettingsWindow(QWidget, Ui_settings_window): # Set up the user interface from Designer. self.setupUi(self) self.setWindowIcon(QIcon("resources/images/icons8-clouds-48.png")) - + self.stackedLayout = QStackedLayout() for profile in global_config: @@ -57,7 +472,7 @@ class SettingsWindow(QWidget, Ui_settings_window): self.pushButton_open_import.clicked.connect(self.import_profile_window) self.pushButton_remove.clicked.connect(self.remove_profile) self.show() - + def switch_account_settings_page(self): self.stackedLayout.setCurrentIndex(self.listWidget_profiles.currentRow()) @@ -71,10 +486,9 @@ class SettingsWindow(QWidget, Ui_settings_window): self.create_ui.pushButton_create.clicked.connect(self.create_profile) - # Hide window once account is created. + # Hide window once account is created. self.create_ui.pushButton_create.clicked.connect(self.create_window.hide) - def import_profile_window(self): # Show profile import window self.import_window = QWidget() @@ -83,12 +497,11 @@ class SettingsWindow(QWidget, Ui_settings_window): self.import_ui.setupUi(self.import_window) self.import_window.show() - self.import_ui.pushButton_import.clicked.connect(self.import_profile) + self.import_ui.pushButton_import.clicked.connect(self.import_profile) # Hide window once account is created self.import_ui.pushButton_import.clicked.connect(self.import_window.hide) - def remove_profile(self): # Remove profile from settings window. selected_profile_name = self.listWidget_profiles.currentItem().text() @@ -109,10 +522,9 @@ class SettingsWindow(QWidget, Ui_settings_window): _profiles.read(PROFILES_FILE) _profiles.remove_section(selected_profile_name) - # Save the new profile. - with open(PROFILES_FILE, 'w') as profilefile: - _profiles.write(profilefile) - + # Save the new profile. + with open(PROFILES_FILE, "w") as profilefile: + _profiles.write(profilefile) def create_profile(self): """ @@ -128,13 +540,7 @@ class SettingsWindow(QWidget, Ui_settings_window): default_od_config = _default_od_config._sections # Construct dict with user profile settings. - new_profile = { - profile_name: { - "config_file": config_path, - "enable_debug": False, - "mode": "monitor" - } - } + new_profile = {profile_name: {"config_file": config_path, "enable_debug": False, "mode": "monitor"}} # Load existing user profiles and add the new profile. _profiles = ConfigParser() @@ -146,16 +552,15 @@ class SettingsWindow(QWidget, Ui_settings_window): if not os.path.exists(profiles_dir): os.makedirs(profiles_dir) - # Save the new profile. - with open(PROFILES_FILE, 'w') as profilefile: - _profiles.write(profilefile) - + # Save the new profile. + with open(PROFILES_FILE, "w") as profilefile: + _profiles.write(profilefile) # Append default OD config new_profile[profile_name].update(default_od_config) # Configure sync directory - new_profile[profile_name]['onedrive']['sync_dir'] = f'"{sync_dir}"' + new_profile[profile_name]["onedrive"]["sync_dir"] = f'"{sync_dir}"' # Append new profile into running global profile global_config.update(new_profile) @@ -171,17 +576,15 @@ class SettingsWindow(QWidget, Ui_settings_window): # Add status page widget for new profile main_window.comboBox.addItem(profile_name) main_window.profile_status_pages[profile_name] = ProfileStatusPage(profile_name) - main_window.stackedLayout.addWidget(main_window.profile_status_pages[profile_name]) - - # Hide "Create profile" push button from main windows. - main_window.pushButton_new_profile.hide() - + main_window.stackedLayout.addWidget(main_window.profile_status_pages[profile_name]) + # Hide "Create profile" push button from main windows. + main_window.pushButton_new_profile.hide() def import_profile(self): - """ - Imports pre-existing OneDrive profile. - Loads default values firt, then overwrite them with user settings. + """ + Imports pre-existing OneDrive profile. + Loads default values firt, then overwrite them with user settings. This is to handle cases where imported config contains only some properties. """ @@ -194,17 +597,10 @@ class SettingsWindow(QWidget, Ui_settings_window): # Load user's settings. _new_od_config = read_config(config_path) - new_od_config = _new_od_config._sections + new_od_config = _new_od_config._sections # Construct dict with user profile settings. - new_profile = { - profile_name: { - "config_file": config_path, - "enable_debug": False, - "mode": "monitor" - } - } - + new_profile = {profile_name: {"config_file": config_path, "enable_debug": False, "mode": "monitor"}} # Load existing user profiles and add the new profile. _profiles = ConfigParser() @@ -216,61 +612,64 @@ class SettingsWindow(QWidget, Ui_settings_window): if not os.path.exists(profiles_dir): os.makedirs(profiles_dir) - # Save the new profile. - with open(PROFILES_FILE, 'w') as configfile: + # Save the new profile. + with open(PROFILES_FILE, "w") as configfile: _profiles.write(configfile) - # Append OD config new_profile[profile_name].update(default_od_config) new_profile[profile_name].update(new_od_config) # Append new profile into running global profile global_config.update(new_profile) - # print(new_profile) + # print(new_profile) # print(global_config) - self.listWidget_profiles.addItem(profile_name) self.page = ProfileSettingsPage(profile_name) self.stackedLayout.addWidget(self.page) - # Hide "Create profile" push button from main windows. - main_window.pushButton_new_profile.hide() + # Hide "Create profile" push button from main windows. + main_window.pushButton_new_profile.hide() class ProfileStatusPage(QWidget, Ui_status_page): - def __init__(self, profile): + def __init__(self, profile_name): super(ProfileStatusPage, self).__init__() + self.profile_name = profile_name + # Set up the user interface from Designer. self.setupUi(self) - # Show selected profile name - self.label_4.setText(profile) - # Temporary start/stop buttons - self.toolButton_start.clicked.connect(lambda: main_window.start_onedrive_monitor(profile)) - self.toolButton_stop.clicked.connect(lambda: main_window.workers[profile].stop_worker()) - # self.toolButton_stop.clicked.connect(lambda: main_window.workers[profile].exit()) - # self.toolButton_stop.clicked.connect(lambda: main_window.workers[profile].quit()) - # self.toolButton_stop.clicked.connect(lambda: main_window.workers[profile].terminate()) - # self.toolButton_stop.clicked.connect(lambda: main_window.workers.pop(profile, None)) + self.toolButton_start.clicked.connect(self.start_monitor) + self.toolButton_stop.clicked.connect(self.stop_monitor) + # Open Settings window + self.pushButton_settings.clicked.connect(lambda: settings_window.show()) - # # Open Settings window - self.pushButton_settings.clicked.connect(self.show_settings_window) + self.pushButton_2.setText("Wizard") + self.pushButton_2.clicked.connect(self.show_setup_wizard) - # Open login form TODO: testing - # self.pushButton_2.setText("login") - # self.pushButton_2.clicked.connect(lambda: self.show_login()) + def show_setup_wizard(self): + self.setup_wizard = SetupWizard() + self.setup_wizard.show() + # self.currentIdChanged.connect(print("print test")) - def show_settings_window(self): - self.settings_window = SettingsWindow() - self.settings_window.show() + def stop_monitor(self): + if self.profile_name in main_window.workers: + main_window.workers[self.profile_name].stop_worker() + self.label_onedrive_status.setText("OneDrive sync has been stopped") + else: + print(f"OneDrive for profile {self.profile_name} is not running") - # def stop_worker(self, profile): - # main_window.workers[profile].onedrive_process.kill() + def start_monitor(self): + main_window.start_onedrive_monitor(self.profile_name) + + # def show_settings_window(self): + # # self.settings_window = SettingsWindow() + # settings_window.show() class ProfileSettingsPage(QWidget, Ui_profile_settings): @@ -283,7 +682,7 @@ class ProfileSettingsPage(QWidget, Ui_profile_settings): self.setupUi(self) temp_global_config = global_config - self.temp_profile_config = temp_global_config[self.profile]['onedrive'] + self.temp_profile_config = temp_global_config[self.profile]["onedrive"] self.label_profile_name.setText(self.profile) self.tabWidget.setCurrentIndex(0) @@ -291,168 +690,181 @@ class ProfileSettingsPage(QWidget, Ui_profile_settings): # # Monitored files tab # - self.lineEdit_sync_dir.setText(self.temp_profile_config['sync_dir'].strip('"')) + self.lineEdit_sync_dir.setText(self.temp_profile_config["sync_dir"].strip('"')) self.lineEdit_sync_dir.textChanged.connect(self.set_sync_dir) - self.checkBox_sync_root_files.setChecked(self.get_check_box_state('sync_root_files')) - self.checkBox_sync_root_files.stateChanged.connect(self.set_check_box_state) + self.checkBox_sync_root_files.setChecked(self.get_check_box_state("sync_root_files")) + self.checkBox_sync_root_files.stateChanged.connect(self.set_check_box_state) # # Excluded files tab # # Skip_file section - self.skip_files = self.temp_profile_config['skip_file'].strip('"').split('|') + self.skip_files = self.temp_profile_config["skip_file"].strip('"').split("|") self.listWidget_skip_file.addItems(self.skip_files) self.listWidget_skip_file.setSelectionMode(QAbstractItemView.ExtendedSelection) self.pushButton_add_skip_file.clicked.connect(self.add_skip_file) - self.pushButton_add_skip_file.clicked.connect(self.lineEdit_skip_file.clear) + self.pushButton_add_skip_file.clicked.connect(self.lineEdit_skip_file.clear) self.pushButton_rm_skip_file.clicked.connect(self.remove_skip_file) # Skip_dir section - self.skip_dirs = self.temp_profile_config['skip_dir'].strip('"').split('|') + self.skip_dirs = self.temp_profile_config["skip_dir"].strip('"').split("|") self.listWidget_skip_dir.addItems(self.skip_dirs) self.listWidget_skip_dir.setSelectionMode(QAbstractItemView.ExtendedSelection) self.pushButton_add_skip_dir.clicked.connect(self.add_skip_dir) self.pushButton_add_skip_dir.clicked.connect(self.lineEdit_skip_dir.clear) self.pushButton_rm_skip_dir.clicked.connect(self.remove_skip_dir) - self.checkBox_skip_dir_strict_match.setChecked(self.get_check_box_state('skip_dir_strict_match')) - self.checkBox_skip_dir_strict_match.stateChanged.connect(self.set_check_box_state) + self.checkBox_skip_dir_strict_match.setChecked(self.get_check_box_state("skip_dir_strict_match")) + self.checkBox_skip_dir_strict_match.stateChanged.connect(self.set_check_box_state) - self.checkBox_check_nosync.setChecked(self.get_check_box_state('check_nosync')) - self.checkBox_check_nosync.stateChanged.connect(self.set_check_box_state) + self.checkBox_check_nosync.setChecked(self.get_check_box_state("check_nosync")) + self.checkBox_check_nosync.stateChanged.connect(self.set_check_box_state) - self.checkBox_skip_symlinks.setChecked(self.get_check_box_state('skip_symlinks')) - self.checkBox_skip_symlinks.stateChanged.connect(self.set_check_box_state) + self.checkBox_skip_symlinks.setChecked(self.get_check_box_state("skip_symlinks")) + self.checkBox_skip_symlinks.stateChanged.connect(self.set_check_box_state) - self.checkBox_skip_dotfiles.setChecked(self.get_check_box_state('skip_dotfiles')) - self.checkBox_skip_dotfiles.stateChanged.connect(self.set_check_box_state) + self.checkBox_skip_dotfiles.setChecked(self.get_check_box_state("skip_dotfiles")) + self.checkBox_skip_dotfiles.stateChanged.connect(self.set_check_box_state) # # Sync Options tab # - self.spinBox_monitor_interval.setValue(int(self.temp_profile_config['monitor_interval'].strip('"'))) - self.spinBox_monitor_interval.valueChanged.connect(self.set_spin_box_value) + self.spinBox_monitor_interval.setValue(int(self.temp_profile_config["monitor_interval"].strip('"'))) + self.spinBox_monitor_interval.valueChanged.connect(self.set_spin_box_value) - self.spinBox_monitor_fullscan_frequency.setValue(int(self.temp_profile_config['monitor_fullscan_frequency'].strip('"'))) - self.spinBox_monitor_fullscan_frequency.valueChanged.connect(self.set_spin_box_value) + self.spinBox_monitor_fullscan_frequency.setValue( + int(self.temp_profile_config["monitor_fullscan_frequency"].strip('"')) + ) + self.spinBox_monitor_fullscan_frequency.valueChanged.connect(self.set_spin_box_value) - self.spinBox_classify_as_big_delete.setValue(int(self.temp_profile_config['classify_as_big_delete'].strip('"'))) - self.spinBox_classify_as_big_delete.valueChanged.connect(self.set_spin_box_value) + self.spinBox_classify_as_big_delete.setValue( + int(self.temp_profile_config["classify_as_big_delete"].strip('"')) + ) + self.spinBox_classify_as_big_delete.valueChanged.connect(self.set_spin_box_value) - self.spinBox_sync_dir_permissions.setValue(int(self.temp_profile_config['sync_dir_permissions'].strip('"'))) - self.spinBox_sync_dir_permissions.valueChanged.connect(self.set_spin_box_value) + self.spinBox_sync_dir_permissions.setValue(int(self.temp_profile_config["sync_dir_permissions"].strip('"'))) + self.spinBox_sync_dir_permissions.valueChanged.connect(self.set_spin_box_value) - self.spinBox_sync_file_permissions.setValue(int(self.temp_profile_config['sync_file_permissions'].strip('"'))) - self.spinBox_sync_file_permissions.valueChanged.connect(self.set_spin_box_value) + self.spinBox_sync_file_permissions.setValue(int(self.temp_profile_config["sync_file_permissions"].strip('"'))) + self.spinBox_sync_file_permissions.valueChanged.connect(self.set_spin_box_value) - self.spinBox_operation_timeout.setValue(int(self.temp_profile_config['operation_timeout'].strip('"'))) - self.spinBox_operation_timeout.valueChanged.connect(self.set_spin_box_value) + self.spinBox_operation_timeout.setValue(int(self.temp_profile_config["operation_timeout"].strip('"'))) + self.spinBox_operation_timeout.valueChanged.connect(self.set_spin_box_value) - - self.checkBox_download_only.setChecked(self.get_check_box_state('download_only')) - self.checkBox_download_only.stateChanged.connect(self.set_check_box_state) + self.checkBox_download_only.setChecked(self.get_check_box_state("download_only")) + self.checkBox_download_only.stateChanged.connect(self.set_check_box_state) - self.checkBox_upload_only.setChecked(self.get_check_box_state('upload_only')) - self.checkBox_upload_only.stateChanged.connect(self.set_check_box_state) + self.checkBox_upload_only.setChecked(self.get_check_box_state("upload_only")) + self.checkBox_upload_only.stateChanged.connect(self.set_check_box_state) - self.checkBox_force_http_2.setChecked(self.get_check_box_state('force_http_2')) - self.checkBox_force_http_2.stateChanged.connect(self.set_check_box_state) + self.checkBox_force_http_2.setChecked(self.get_check_box_state("force_http_2")) + self.checkBox_force_http_2.stateChanged.connect(self.set_check_box_state) - self.checkBox_disable_upload_validation.setChecked(self.get_check_box_state('disable_upload_validation')) - self.checkBox_disable_upload_validation.stateChanged.connect(self.set_check_box_state) + self.checkBox_disable_upload_validation.setChecked(self.get_check_box_state("disable_upload_validation")) + self.checkBox_disable_upload_validation.stateChanged.connect(self.set_check_box_state) - self.checkBox_check_nomount.setChecked(self.get_check_box_state('check_nomount')) - self.checkBox_check_nomount.stateChanged.connect(self.set_check_box_state) + self.checkBox_check_nomount.setChecked(self.get_check_box_state("check_nomount")) + self.checkBox_check_nomount.stateChanged.connect(self.set_check_box_state) - self.checkBox_local_first.setChecked(self.get_check_box_state('local_first')) - self.checkBox_local_first.stateChanged.connect(self.set_check_box_state) + self.checkBox_local_first.setChecked(self.get_check_box_state("local_first")) + self.checkBox_local_first.stateChanged.connect(self.set_check_box_state) - self.checkBox_no_remote_delete.setChecked(self.get_check_box_state('no_remote_delete')) - self.checkBox_no_remote_delete.stateChanged.connect(self.set_check_box_state) + self.checkBox_no_remote_delete.setChecked(self.get_check_box_state("no_remote_delete")) + self.checkBox_no_remote_delete.stateChanged.connect(self.set_check_box_state) - self.checkBox_sync_business_shared_folders.setChecked(self.get_check_box_state('sync_business_shared_folders')) - self.checkBox_sync_business_shared_folders.stateChanged.connect(self.set_check_box_state) + self.checkBox_sync_business_shared_folders.setChecked(self.get_check_box_state("sync_business_shared_folders")) + self.checkBox_sync_business_shared_folders.stateChanged.connect(self.set_check_box_state) - self.checkBox_dry_run.setChecked(self.get_check_box_state('dry_run')) - self.checkBox_dry_run.stateChanged.connect(self.set_check_box_state) + self.checkBox_dry_run.setChecked(self.get_check_box_state("dry_run")) + self.checkBox_dry_run.stateChanged.connect(self.set_check_box_state) - self.checkBox_remove_source_files.setChecked(self.get_check_box_state('remove_source_files')) - self.checkBox_remove_source_files.stateChanged.connect(self.set_check_box_state) - - self.checkBox_resync.setChecked(self.get_check_box_state('resync')) - self.checkBox_resync.stateChanged.connect(self.set_check_box_state) - - self.checkBox_bypass_data_preservation.setChecked(self.get_check_box_state('bypass_data_preservation')) - self.checkBox_bypass_data_preservation.stateChanged.connect(self.set_check_box_state) + self.checkBox_remove_source_files.setChecked(self.get_check_box_state("remove_source_files")) + self.checkBox_remove_source_files.stateChanged.connect(self.set_check_box_state) - self.lineEdit_user_agent.setText(self.temp_profile_config['user_agent'].strip('"')) + self.checkBox_resync.setChecked(self.get_check_box_state("resync")) + self.checkBox_resync.stateChanged.connect(self.set_check_box_state) + + self.checkBox_bypass_data_preservation.setChecked(self.get_check_box_state("bypass_data_preservation")) + self.checkBox_bypass_data_preservation.stateChanged.connect(self.set_check_box_state) + + self.lineEdit_user_agent.setText(self.temp_profile_config["user_agent"].strip('"')) self.lineEdit_user_agent.textChanged.connect(self.set_line_edit_value) - self.lineEdit_azure_ad_endpoint.setText(self.temp_profile_config['azure_ad_endpoint'].strip('"')) + self.lineEdit_azure_ad_endpoint.setText(self.temp_profile_config["azure_ad_endpoint"].strip('"')) self.lineEdit_azure_ad_endpoint.textChanged.connect(self.set_line_edit_value) - self.lineEdit_azure_tenant_id.setText(self.temp_profile_config['azure_tenant_id'].strip('"')) + self.lineEdit_azure_tenant_id.setText(self.temp_profile_config["azure_tenant_id"].strip('"')) self.lineEdit_azure_tenant_id.textChanged.connect(self.set_line_edit_value) - # Rate limit tab - self.spinBox_rate_limit.setValue(int(self.temp_profile_config['rate_limit'].strip('"'))) - self.horizontalSlider_rate_limit.setValue(int(self.temp_profile_config['rate_limit'].strip('"'))) - self.label_rate_limit_mbps.setText(str(round(self.spinBox_rate_limit.value() * 8 / 1000 / 1000, 2)) + " Mbit/s") + self.spinBox_rate_limit.setValue(int(self.temp_profile_config["rate_limit"].strip('"'))) + self.horizontalSlider_rate_limit.setValue(int(self.temp_profile_config["rate_limit"].strip('"'))) + self.label_rate_limit_mbps.setText( + str(round(self.spinBox_rate_limit.value() * 8 / 1000 / 1000, 2)) + " Mbit/s" + ) self.spinBox_rate_limit.valueChanged.connect(self.set_spin_box_value) self.spinBox_rate_limit.valueChanged.connect(self.horizontalSlider_rate_limit.setValue) - self.spinBox_rate_limit.valueChanged.connect(lambda:self.label_rate_limit_mbps.setText( - str(round(self.spinBox_rate_limit.value() * 8 / 1000 / 1000, 2)) + " Mbit/s")) + self.spinBox_rate_limit.valueChanged.connect( + lambda: self.label_rate_limit_mbps.setText( + str(round(self.spinBox_rate_limit.value() * 8 / 1000 / 1000, 2)) + " Mbit/s" + ) + ) self.horizontalSlider_rate_limit.valueChanged.connect(self.spinBox_rate_limit.setValue) # # Webhooks tab # - self.checkBox_webhook_enabled.setChecked(self.get_check_box_state('webhook_enabled')) - self.checkBox_webhook_enabled.stateChanged.connect(self.set_check_box_state) + self.checkBox_webhook_enabled.setChecked(self.get_check_box_state("webhook_enabled")) + self.checkBox_webhook_enabled.stateChanged.connect(self.set_check_box_state) - self.spinBox_webhook_expiration_interval.setValue(int(self.temp_profile_config['webhook_expiration_interval'].strip('"'))) - self.spinBox_webhook_expiration_interval.valueChanged.connect(self.set_spin_box_value) + self.spinBox_webhook_expiration_interval.setValue( + int(self.temp_profile_config["webhook_expiration_interval"].strip('"')) + ) + self.spinBox_webhook_expiration_interval.valueChanged.connect(self.set_spin_box_value) - self.spinBox_webhook_renewal_interval.setValue(int(self.temp_profile_config['webhook_renewal_interval'].strip('"'))) - self.spinBox_webhook_renewal_interval.valueChanged.connect(self.set_spin_box_value) + self.spinBox_webhook_renewal_interval.setValue( + int(self.temp_profile_config["webhook_renewal_interval"].strip('"')) + ) + self.spinBox_webhook_renewal_interval.valueChanged.connect(self.set_spin_box_value) - self.spinBox_webhook_listening_port.setValue(int(self.temp_profile_config['webhook_listening_port'].strip('"'))) - self.spinBox_webhook_listening_port.valueChanged.connect(self.set_spin_box_value) + self.spinBox_webhook_listening_port.setValue( + int(self.temp_profile_config["webhook_listening_port"].strip('"')) + ) + self.spinBox_webhook_listening_port.valueChanged.connect(self.set_spin_box_value) - self.lineEdit_webhook_public_url.setText(self.temp_profile_config['webhook_public_url'].strip('"')) + self.lineEdit_webhook_public_url.setText(self.temp_profile_config["webhook_public_url"].strip('"')) self.lineEdit_webhook_public_url.textChanged.connect(self.set_line_edit_value) - self.lineEdit_webhook_listening_host.setText(self.temp_profile_config['webhook_listening_host'].strip('"')) - self.lineEdit_webhook_listening_host.textChanged.connect(self.set_line_edit_value) + self.lineEdit_webhook_listening_host.setText(self.temp_profile_config["webhook_listening_host"].strip('"')) + self.lineEdit_webhook_listening_host.textChanged.connect(self.set_line_edit_value) # # Logging tab # - self.lineEdit_log_dir.setText(self.temp_profile_config['log_dir'].strip('"')) + self.lineEdit_log_dir.setText(self.temp_profile_config["log_dir"].strip('"')) self.lineEdit_log_dir.textChanged.connect(self.set_log_dir) - self.checkBox_enable_logging.setChecked(self.get_check_box_state('enable_logging')) - self.checkBox_enable_logging.stateChanged.connect(self.set_check_box_state) + self.checkBox_enable_logging.setChecked(self.get_check_box_state("enable_logging")) + self.checkBox_enable_logging.stateChanged.connect(self.set_check_box_state) - self.checkBox_debug_https.setChecked(self.get_check_box_state('debug_https')) - self.checkBox_debug_https.stateChanged.connect(self.set_check_box_state) + self.checkBox_debug_https.setChecked(self.get_check_box_state("debug_https")) + self.checkBox_debug_https.stateChanged.connect(self.set_check_box_state) - self.checkBox_disable_notifications.setChecked(self.get_check_box_state('disable_notifications')) - self.checkBox_disable_notifications.stateChanged.connect(self.set_check_box_state) + self.checkBox_disable_notifications.setChecked(self.get_check_box_state("disable_notifications")) + self.checkBox_disable_notifications.stateChanged.connect(self.set_check_box_state) - self.spinBox_monitor_log_frequency.setValue(int(self.temp_profile_config['monitor_log_frequency'].strip('"'))) - self.spinBox_monitor_log_frequency.valueChanged.connect(self.set_spin_box_value) + self.spinBox_monitor_log_frequency.setValue(int(self.temp_profile_config["monitor_log_frequency"].strip('"'))) + self.spinBox_monitor_log_frequency.valueChanged.connect(self.set_spin_box_value) - self.spinBox_min_notify_changes.setValue(int(self.temp_profile_config['min_notify_changes'].strip('"'))) - self.spinBox_min_notify_changes.valueChanged.connect(self.set_spin_box_value) + self.spinBox_min_notify_changes.setValue(int(self.temp_profile_config["min_notify_changes"].strip('"'))) + self.spinBox_min_notify_changes.valueChanged.connect(self.set_spin_box_value) # # Account tab # - self.config_file = global_config[self.profile]['config_file'].strip('"') + self.config_file = global_config[self.profile]["config_file"].strip('"') self.config_dir = re.search(r"(.+)/.+$", self.config_file).group(1) self.pushButton_login.clicked.connect(lambda: main_window.show_login(self.profile)) @@ -467,19 +879,18 @@ class ProfileSettingsPage(QWidget, Ui_profile_settings): # self.pushButton_discart.clicked.connect(self.discart_changes) self.pushButton_save.clicked.connect(self.save_profile_settings) - def str2bool(self, value): return value.lower() in "true" def set_line_edit_value(self, value): _property = self.sender().objectName() property = re.search(r"lineEdit_(.+)", _property).group(1) - self.temp_profile_config[f'{property}'] = f'"{value}"' + self.temp_profile_config[f"{property}"] = f'"{value}"' def set_spin_box_value(self, value): _property = self.sender().objectName() property = re.search(r"spinBox_(.+)", _property).group(1) - self.temp_profile_config[f'{property}'] = f'"{value}"' + self.temp_profile_config[f"{property}"] = f'"{value}"' def set_check_box_state(self, state): _property = self.sender().objectName() @@ -487,39 +898,41 @@ class ProfileSettingsPage(QWidget, Ui_profile_settings): print(property) if state == Qt.Checked: print("is checked") - self.temp_profile_config[f'{property}'] = '"true"' + self.temp_profile_config[f"{property}"] = '"true"' else: print("is unchecked") - self.temp_profile_config[f'{property}'] = '"false"' + self.temp_profile_config[f"{property}"] = '"false"' def get_check_box_state(self, property): - return self.temp_profile_config[f'{property}'].strip('"') in 'true' + return self.temp_profile_config[f"{property}"].strip('"') in "true" def add_skip_file(self): self.add_item_to_qlist(self.lineEdit_skip_file, self.listWidget_skip_file, self.skip_files) - self.temp_profile_config['skip_file'] = '"' + '|'.join(self.skip_files) + '"' + self.temp_profile_config["skip_file"] = '"' + "|".join(self.skip_files) + '"' def remove_skip_file(self): self.remove_item_from_qlist(self.listWidget_skip_file, self.skip_files) - self.temp_profile_config['skip_file'] = '"' + '|'.join(self.skip_files) + '"' + self.temp_profile_config["skip_file"] = '"' + "|".join(self.skip_files) + '"' def add_skip_dir(self): self.add_item_to_qlist(self.lineEdit_skip_dir, self.listWidget_skip_dir, self.skip_dirs) - self.temp_profile_config['skip_dir'] = '"' + '|'.join(self.skip_dirs) + '"' + self.temp_profile_config["skip_dir"] = '"' + "|".join(self.skip_dirs) + '"' def remove_skip_dir(self): self.remove_item_from_qlist(self.listWidget_skip_dir, self.skip_dirs) - self.temp_profile_config['skip_dir'] = '"' + '|'.join(self.skip_dirs) + '"' + self.temp_profile_config["skip_dir"] = '"' + "|".join(self.skip_dirs) + '"' def set_rate_limit(self): - self.temp_profile_config['rate_limit'] = f'"{self.lineEdit_rate_limit.text()}"' - self.label_rate_limit_mbps.setText(str(round(int(self.lineEdit_rate_limit.text()) * 8 / 1000 / 1000, 2)) + " Mbit/s") + self.temp_profile_config["rate_limit"] = f'"{self.lineEdit_rate_limit.text()}"' + self.label_rate_limit_mbps.setText( + str(round(int(self.lineEdit_rate_limit.text()) * 8 / 1000 / 1000, 2)) + " Mbit/s" + ) def set_sync_dir(self): - self.temp_profile_config['sync_dir'] = f'"{self.lineEdit_sync_dir.text()}"' + self.temp_profile_config["sync_dir"] = f'"{self.lineEdit_sync_dir.text()}"' def set_log_dir(self): - self.temp_profile_config['log_dir'] = f'"{self.lineEdit_log_dir.text()}"' + self.temp_profile_config["log_dir"] = f'"{self.lineEdit_log_dir.text()}"' def add_item_to_qlist(self, source_widget, destination_widget, list): if source_widget.text() == "": @@ -554,10 +967,10 @@ class TaskList(QWidget, Ui_list_item_widget): # Set up the user interface from Designer. self.setupUi(self) - def set_icon (self, file_path): + def set_icon(self, file_path): self.fileInfo = QFileInfo(file_path) self.iconProvider = QFileIconProvider() - self.icon = self.iconProvider.icon(self.fileInfo) + self.icon = self.iconProvider.icon(self.fileInfo) # icon = QIcon(icon_file) self.toolButton.setIcon(self.icon) @@ -565,6 +978,9 @@ class TaskList(QWidget, Ui_list_item_widget): def set_file_name(self, file_path): self.ls_label_file_name.setText(file_path) + def get_file_name(self): + return self.ls_label_file_name.text() + def set_progress(self, percentage): self.ls_progressBar.setValue(percentage) @@ -573,7 +989,7 @@ class TaskList(QWidget, Ui_list_item_widget): self.ls_label_1.setText(text) def set_label_2(self, text): - self.ls_label_2.setText(text) + self.ls_label_2.setText(text) def hide_progress_bar(self, transfer_status: bool): # pass @@ -586,193 +1002,241 @@ class TaskList(QWidget, Ui_list_item_widget): self.ls_progressBar.show() # self.ls_label_task.show() # self.ls_label_status.show() - # self.ls_label_dir.hide() + # self.ls_label_dir.hide() class WorkerThread(QThread): + """ + Constructs a thread, which can start, monitor and stop OneDrive process. + """ + update_credentials = Signal(str) - update_progress = Signal(dict) + # update_progress = Signal(dict) update_progress_new = Signal(dict, str) + update_profile_status = Signal(dict, str) trigger_resync = Signal() def __init__(self, profile): super(WorkerThread, self).__init__() - print(f"starting worker for profile {profile}") - # print(global_config) - # print(global_config[profile]) - self.config_file = global_config[profile]['config_file'] + print(f"Starting worker for profile {profile}") + + self.config_file = global_config[profile]["config_file"] self.config_folder = re.search(r"(.+)/.+$", self.config_file) # print(self.config_file) self._command = f"onedrive --confdir='{self.config_folder.group(1)}' --monitor -v" # print(f"command is: {self._command}") - self._profile_name = profile + self.profile_name = profile def stop_worker(self): - print(f"[{self._profile_name}] Waiting for worker to finish...") + print(f"[{self.profile_name}] Waiting for worker to finish...") while self.onedrive_process.poll() is None: self.onedrive_process.kill() - time.sleep(1) + # time.sleep(1) - print(f"[{self._profile_name}] Quiting thread") + print(f"[{self.profile_name}] Quiting thread") self.quit() self.wait() - print(f"[{self._profile_name}] Removing thread info") - main_window.workers.pop(self._profile_name, None) + print(f"[{self.profile_name}] Removing thread info") + + main_window.workers.pop(self.profile_name, None) print(f"Remaining running workers: {main_window.workers}") - - - - def run(self, resync=False): - matches = ['Downloading file', 'Downloading new file', 'Uploading file', 'Uploading new file', - 'Uploading modified file', 'Downloading modified file'] + """ + Starts OneDrive and sends signals to GUI based on parsed information. + """ + file_name = None - + tasks = [ + "Downloading file", + "Downloading new file", + "Uploading file", + "Uploading new file", + "Uploading modified file", + "Downloading modified file", + "Deleting item", + ] - self.onedrive_process = subprocess.Popen(self._command + '--resync' if resync else self._command, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - shell=True, - universal_newlines=True) + self.profile_status = {"status_message": "", "free_space": "", "account_type": ""} - # TODO: De-monster once all possible situations are handled correctly. + self.onedrive_process = subprocess.Popen( + self._command + "--resync" if resync else self._command, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + shell=True, + universal_newlines=True, + ) + + # TODO: De-monster once all possible situations are handled correctly. while self.onedrive_process.poll() is None: if self.onedrive_process.stdout: stdout = self.onedrive_process.stdout.readline() - # print(f"worker: {stdout.strip()}") - print(f'[{self._profile_name}] ' + stdout.strip()) + if stdout == "": + continue - if 'Authorize this app visiting' in stdout: + # print(bytes(stdout, 'utf-8')) + print(f"[{self.profile_name}] " + stdout.strip()) + + if "Authorize this app visiting" in stdout: self.onedrive_process.kill() - self.update_credentials.emit(self._profile_name) + self.profile_status["status_message"] = "OneDrive login is required" + self.update_profile_status.emit(self.profile_status, self.profile_name) + self.update_credentials.emit(self.profile_name) - elif any(x in stdout for x in matches): # capture file uploads and downloads - # self.tray.setIcon(QIcon("resources/images/icons8-cloud-sync-40_2.png")) - print('# ' + stdout) - file_operation = re.search(r'\b([Uploading|Downloading]+)*', stdout) - file_name = re.search(r".*/(.+)\s+\.+", stdout) - file_path = re.search(r"\b[file]+\s(.+)\s+\.\.\.", stdout) - transfer_complete = 'done' in stdout - progress = '0' # if transfer_complete else '0' + elif "Sync with OneDrive is complete" in stdout: + self.profile_status["status_message"] = "OneDrive sync is complete" + self.update_profile_status.emit(self.profile_status, self.profile_name) - transfer_progress = { - "file_operation": file_operation.group(1), - "file_name": 'unknown file name' if file_name is None else file_name.group(1), - "progress": progress, - "transfer_complete": transfer_complete} + elif "Remaining Free Space" in stdout: + self.free_space_bytes = re.search(r"([0-9]+)", stdout).group(1) + self.free_space_human = str(humanize_file_size(int(self.free_space_bytes))) + + print(f"[{self.profile_name}] Free Space: {self.free_space_human}") + self.profile_status["free_space"] = f"Free Space: {self.free_space_human}" + # self.profile_status["account_type"] = f"{self.account_type.capitalize()} [{self.free_space_human}]" + self.update_profile_status.emit(self.profile_status, self.profile_name) + + elif "Account Type" in stdout: + self.account_type = re.search(r"\s(\w+)$", stdout).group(1) + self.profile_status["account_type"] = self.account_type.capitalize() + print(f"[{self.profile_name}] Account type: {self.account_type}") + self.update_profile_status.emit(self.profile_status, self.profile_name) + + elif "Initializing the OneDrive API" in stdout: + self.profile_status["status_message"] = "Initializing the OneDrive API" + self.update_profile_status.emit(self.profile_status, self.profile_name) + + elif "Processing" in stdout: + items_left = re.match(r"^Processing\s([0-9]+)", stdout) + if items_left != None: + self.profile_status[ + "status_message" + ] = f"OneDrive is processing {items_left.group(1)} items..." + else: + self.profile_status["status_message"] = "OneDrive is processing items..." + self.update_profile_status.emit(self.profile_status, self.profile_name) + + elif any(_ in stdout for _ in tasks): + # Capture information abouth file that is being uploaded/downloaded/deleted by OneDrive. + file_operation = re.search(r"\b([Uploading|Downloading|Deleting]+)*", stdout).group(1) + + if file_operation == "Deleting": + file_name = re.search(r".*/(.+)$", stdout) + file_path = re.search(r"\b[item|OneDrive:]+\s(.+)$", stdout) + + else: + file_name = re.search(r".*/(.+)\s+\.+", stdout) + file_path = re.search(r"\b[file]+\s(.+)\s+\.\.\.", stdout) + + transfer_complete = any(["done" in stdout, "Deleting" in stdout]) + progress = "0" transfer_progress_new = { - "file_operation": file_operation.group(1), - "file_path": 'unknown file name' if file_path is None else file_path.group(1), + "file_operation": file_operation, + "file_path": "unknown file name" if file_path is None else file_path.group(1), "progress": progress, - "transfer_complete": transfer_complete} - + "transfer_complete": transfer_complete, + } + + # Update file transfer list + print(transfer_progress_new) + self.update_progress_new.emit(transfer_progress_new, self.profile_name) + + # Update profile status message. if transfer_complete: - self.update_progress.emit(transfer_progress) - self.update_progress_new.emit(transfer_progress_new, self._profile_name) + self.profile_status["status_message"] = "OneDrive sync is complete" - elif '% |' in stdout and file_name is not None: # capture upload/download progress - file_operation = re.search(r'\b([Uploading|Downloading]+)*', stdout) - progress = re.search(r'\s([0-9]+)%', stdout) - transfer_complete = progress.group(1) == '100' + elif "% |" in stdout and file_name is not None: + # Capture upload/download progress status - transfer_progress = { - "file_operation": file_operation.group(1), - "file_name": 'Resuming last file...' if file_name is None else file_name.group(1), - "progress": progress.group(1), - "transfer_complete": transfer_complete} + file_operation = re.search(r"\b([Uploading|Downloading]+)*", stdout).group(1) + progress = re.search(r"\s([0-9]+)%", stdout).group(1) + transfer_complete = progress == "100" transfer_progress_new = { - "file_operation": file_operation.group(1), - "file_path": 'unknown file name' if file_path is None else file_path.group(1), - "progress": progress.group(1), - "transfer_complete": transfer_complete} + "file_operation": file_operation, + "file_path": "unknown file name" if file_path is None else file_path.group(1), + "progress": progress, + "transfer_complete": transfer_complete, + } - self.update_progress.emit(transfer_progress) - self.update_progress_new.emit(transfer_progress_new, self._profile_name) + print(transfer_progress_new) + self.update_progress_new.emit(transfer_progress_new, self.profile_name) - elif 'Sync with OneDrive is complete' in stdout: - pass - # self.tray.setIcon(QIcon("resources/images/icons8-cloud-done-40_2.png")) - - elif 'Remaining free space on OneDrive' in stdout: - pass - - elif 'Processing' in stdout: - pass - # self.tray.setIcon(QIcon("resources/images/icons8-cloud-sync-40_2.png")) + if transfer_complete: + self.profile_status["status_message"] = "OneDrive sync is complete" + else: + self.profile_status["status_message"] = "OneDrive sync in progress..." + self.update_profile_status.emit(self.profile_status, self.profile_name) else: pass - # print('@@ no match') if self.onedrive_process.stderr: - stderr = self.onedrive_process.stderr.readline() - if stderr != '': - if 'command not found' in stderr: - print("""Onedrive does not seem to be installed. Please install it as per instruction at - https://github.com/abraunegg/onedrive/blob/master/docs/INSTALL.md """) + # Capture stderr from OneDrive process. - elif '--resync is required' in stderr: + stderr = self.onedrive_process.stderr.readline() + if stderr != "": + if "command not found" in stderr: + print( + """Onedrive does not seem to be installed. Please install it as per instruction at + https://github.com/abraunegg/onedrive/blob/master/docs/INSTALL.md """ + ) + + elif "--resync is required" in stderr: print(str(stderr) + " Starting resync.") self.trigger_resync.emit() self.run(resync=True) else: - print('@@ERROR' + stderr) - - + print("@ERROR " + stderr) class MainWindow(QMainWindow, Ui_MainWindow): - def __init__(self): - self.workers= {} + self.workers = {} super(MainWindow, self).__init__() self.setupUi(self) self.setWindowIcon(QIcon("resources/images/icons8-clouds-48.png")) - if len(global_config) == 0: + if len(global_config) == 0: # self.pushButton_new_profile.clicked.connect(self.show_settings_window) # self.pushButton_new_profile.show() - self.show_settings_window() - + # self.show_settings_window() + self.show_setup_wizard() + # else: self.pushButton_new_profile.hide() # # Menu - # - self.menubar.hide() # Update OneDrive Status self.actionRefresh_Service_Status.triggered.connect(lambda: self.onedrive_process_status()) # Start OneDrive service - self.actionStart_Service.triggered.connect(lambda: os.system('systemctl --user start onedrive')) + self.actionStart_Service.triggered.connect(lambda: os.system("systemctl --user start onedrive")) # Stop OneDrive service - self.actionStop_Service.triggered.connect(lambda: os.system('systemctl --user stop onedrive')) + self.actionStop_Service.triggered.connect(lambda: os.system("systemctl --user stop onedrive")) # Restart OneDrive service - self.actionRestart_Service.triggered.connect(lambda: os.system('systemctl --user restart onedrive')) + self.actionRestart_Service.triggered.connect(lambda: os.system("systemctl --user restart onedrive")) # Start OneDrive monitoring - self.actionStart_Monitor.triggered.connect(lambda: self.start_onedrive_monitor('boris@pozdena.eu')) + self.actionStart_Monitor.triggered.connect(lambda: self.start_onedrive_monitor("boris@pozdena.eu")) # Stop OneDrive monitoring - self.actionStop_Monitor.triggered.connect(lambda: os.system('pkill onedrive')) + self.actionStop_Monitor.triggered.connect(lambda: os.system("pkill onedrive")) # Refresh Sync Status - self.actionObtain_Sync_Status.triggered.connect(lambda: self.label_4.setText("Retreiving status...")) - self.actionObtain_Sync_Status.triggered.connect(lambda: self.onedrive_sync_status()) + # self.actionObtain_Sync_Status.triggered.connect(lambda: self.label_4.setText("Retreiving status...")) + # self.actionObtain_Sync_Status.triggered.connect(lambda: self.onedrive_sync_status()) # Start second account - self.actionstart.triggered.connect(lambda: self.start_onedrive_monitor('pozdenab')) - + self.actionstart.triggered.connect(lambda: self.start_onedrive_monitor("pozdenab")) self.comboBox.activated.connect(self.switch_account_status_page) self.stackedLayout = QStackedLayout() @@ -782,9 +1246,8 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.comboBox.addItem(profile) self.profile_status_pages[profile] = ProfileStatusPage(profile) self.stackedLayout.addWidget(self.profile_status_pages[profile]) - - self.verticalLayout_2.addLayout(self.stackedLayout) + self.verticalLayout_2.addLayout(self.stackedLayout) # System Tray self.tray = QSystemTrayIcon() @@ -808,38 +1271,63 @@ class MainWindow(QMainWindow, Ui_MainWindow): else: self.tray = None + self.refresh_process_status = QTimer() + self.refresh_process_status.setSingleShot(False) + self.refresh_process_status.timeout.connect(lambda: self.onedrive_process_status()) + self.refresh_process_status.start(500) + + def show_setup_wizard(self): + self.setup_wizard = SetupWizard() + self.setup_wizard.show() + def show_settings_window(self): - self.settings_window = SettingsWindow() - self.settings_window.show() + # self.settings_window = SettingsWindow() + settings_window.show() def switch_account_status_page(self): self.stackedLayout.setCurrentIndex(self.comboBox.currentIndex()) def onedrive_process_status(self): # Check OneDrive status - for onedrive_process in psutil.process_iter(): - if onedrive_process.name().lower() == 'onedrive' and onedrive_process.status() != 'zombie': - self.label_3.setText("running") - return True + # print(self.workers) + pixmap_running = QPixmap("resources/images/icons8-green-circle-48.png").scaled(20, 20, Qt.KeepAspectRatio) + pixmap_stopped = QPixmap("resources/images/icons8-red-circle-48.png").scaled(20, 20, Qt.KeepAspectRatio) - self.label_3.setText("not running") - self.tray.setIcon(QIcon("resources/images/icons8-cloud-cross-40_2.png")) - self.progressBar.hide() - self.label_5.hide() - return False + for profile_name in global_config: + # print(profile_name) + if profile_name not in self.workers: + self.profile_status_pages[profile_name].label_status.setText("stopped") + self.profile_status_pages[profile_name].label_status.setPixmap(pixmap_stopped) + # print(f"not running {profile_name}") - def onedrive_sync_status(self): - # Check OneDrive sync status - status = subprocess.check_output(['onedrive', '--display-sync-status']) - if 'in sync' in str(status): - self.label_4.setText("In Sync") - self.tray.setIcon(QIcon("resources/images/icons8-cloud-done-40_2.png")) - return True - else: - self.label_4.setText("Out of Sync") - self.tray.setIcon(QIcon("resources/images/icons8-cloud-sync-40_2.png")) - return False + else: + if self.workers[profile_name].isRunning(): + self.profile_status_pages[profile_name].label_status.setText("running") + self.profile_status_pages[profile_name].label_status.setPixmap(pixmap_running) + # print(f"running worker {profile_name}") + # for onedrive_process in psutil.process_iter(): + # if onedrive_process.name().lower() == 'onedrive' and onedrive_process.status() != 'zombie': + # self.label_3.setText("running") + # return True + + # self.label_3.setText("not running") + # self.tray.setIcon(QIcon("resources/images/icons8-cloud-cross-40_2.png")) + # self.progressBar.hide() + # self.label_5.hide() + # return False + + # def onedrive_sync_status(self): + # # Check OneDrive sync status + # status = subprocess.check_output(['onedrive', '--display-sync-status']) + # if 'in sync' in str(status): + # self.label_4.setText("In Sync") + # self.tray.setIcon(QIcon("resources/images/icons8-cloud-done-40_2.png")) + # return True + # else: + # self.label_4.setText("Out of Sync") + # self.tray.setIcon(QIcon("resources/images/icons8-cloud-sync-40_2.png")) + # return False def start_onedrive_monitor(self, profile_name): # for profile in global_config: @@ -857,31 +1345,14 @@ class MainWindow(QMainWindow, Ui_MainWindow): # self.worker.update_progress.connect(self.event_update_progress) # self.worker.trigger_resync.connect(self.show_login) self.workers[profile_name].update_progress_new.connect(self.event_update_progress_new) + self.workers[profile_name].update_profile_status.connect(self.event_update_profile_status) + self.workers[profile_name].started.connect(lambda: print(f"started worker {profile_name}")) + self.workers[profile_name].finished.connect(lambda: print(f"finished worker {profile_name}")) - def event_update_progress(self, data): - """ - data: - transfer_progress = { - "file_operation": file_operation.group(1), - "file_name": file_name.group(1), - "progress": progress.group(1), - "transfer_complete": transfer_complete - } - """ - - print(data) - if self.label_5.isHidden(): - self.label_5.show() - self.progressBar.show() - self.label_5.setText(data['file_operation'] + ' ' + data['file_name']) - self.progressBar.setValue(int(data['progress'])) - - if data["transfer_complete"]: - self.listWidget.insertItem(0, data['file_operation'] + ' of ' + data['file_name'] + ' completed.') - if not self.label_5.isHidden(): - self.label_5.hide() - self.progressBar.hide() - + def event_update_profile_status(self, data, profile): + self.profile_status_pages[profile].label_onedrive_status.setText(data["status_message"]) + self.profile_status_pages[profile].label_free_space.setText(data["free_space"]) + self.profile_status_pages[profile].label_account_type.setText(data["account_type"]) def event_update_progress_new(self, data, profile): """ @@ -892,27 +1363,27 @@ class MainWindow(QMainWindow, Ui_MainWindow): "progress": progress.group(1), "transfer_complete": transfer_complete } - - TODO: De-monster once all possible situations are handled correctly. """ - _sync_dir = os.path.expanduser(global_config[profile]['onedrive']['sync_dir'].strip('"')) + _sync_dir = os.path.expanduser(global_config[profile]["onedrive"]["sync_dir"].strip('"')) # profile_status_page = self.profile_status_pages[profile] - print(data) - file_path = f'{_sync_dir}' + "/" + data['file_path'] - absolute_path = QFileInfo(file_path).absolutePath().replace(' ','%20') - parent_dir = re.search(r".+/([^/]+)/.+$", file_path) + print(data) + file_path = f"{_sync_dir}" + "/" + data["file_path"] + absolute_path = QFileInfo(file_path).absolutePath().replace(" ", "%20") + parent_dir = re.search(r".+/([^/]+)/.+$", file_path).group(1) file_size = QFileInfo(file_path).size() file_size_human = humanize_file_size(file_size) file_name = QFileInfo(file_path).fileName() file_path2 = QFileInfo(file_path).filePath() - progress = data['progress'] + progress = data["progress"] progress_data = file_size / 100 * int(progress) progress_data_human = humanize_file_size(progress_data) + file_operation = data["file_operation"] + transfer_complete = data["transfer_complete"] print("absolute path " + absolute_path) - print("parent dir " + parent_dir.group(1)) + print("parent dir " + parent_dir) print("progress: " + progress) print("progress data: " + humanize_file_size(progress_data)) print("file path: " + file_path) @@ -920,78 +1391,47 @@ class MainWindow(QMainWindow, Ui_MainWindow): print("file name: " + file_name) print("file path2: " + file_path2) - if int(data['progress']) == 0 and data['transfer_complete'] == True: - myQCustomQWidget = TaskList() - myQCustomQWidget.set_file_name(file_name) - myQCustomQWidget.set_progress(100) - myQCustomQWidget.set_icon(file_path) - myQCustomQWidget.hide_progress_bar(data['transfer_complete']) - myQCustomQWidget.set_label_1(f"Available in {parent_dir.group(1)}") - myQCustomQWidget.set_label_2(f'{file_size_human}') - # Create QListWidgetItem - myQListWidgetItem = QListWidgetItem() - # Set size hint - myQListWidgetItem.setSizeHint(myQCustomQWidget.sizeHint()) - # Add QListWidgetItem into QListWidget - self.profile_status_pages[profile].listWidget.insertItem(0, myQListWidgetItem) - self.profile_status_pages[profile].listWidget.setItemWidget(myQListWidgetItem, myQCustomQWidget) - + # if data['transfer_complete'] == True: + # if int(data['progress']) == 100: + # self.profile_status_pages[profile].listWidget.takeItem(0) - elif int(data['progress']) == 0 and data['transfer_complete'] == False: - myQCustomQWidget = TaskList() - myQCustomQWidget.set_file_name(file_name) - myQCustomQWidget.set_progress(0) - myQCustomQWidget.set_icon(file_path) - myQCustomQWidget.hide_progress_bar(data['transfer_complete']) - myQCustomQWidget.set_label_1(data['file_operation']) - myQCustomQWidget.set_label_2(f'{progress_data_human} of {file_size_human}') + # Delete last item list if it has the same file name. + if self.profile_status_pages[profile].listWidget.item(0) != None: + last_item = self.profile_status_pages[profile].listWidget.item(0) + last_item_widget = self.profile_status_pages[profile].listWidget.itemWidget(last_item) + last_file_name = last_item_widget.get_file_name() + print(f"The last list item's file name is : {last_file_name}") - # Create QListWidgetItem - myQListWidgetItem = QListWidgetItem() - # Set size hint - myQListWidgetItem.setSizeHint(myQCustomQWidget.sizeHint()) - # Add QListWidgetItem into QListWidget - self.profile_status_pages[profile].listWidget.insertItem(0, myQListWidgetItem) - self.profile_status_pages[profile].listWidget.setItemWidget(myQListWidgetItem, myQCustomQWidget) + if file_name == last_file_name: + print("Deleting last list item") + self.profile_status_pages[profile].listWidget.takeItem(0) - elif int(data['progress']) == 100 and data['transfer_complete'] == True: - self.profile_status_pages[profile].listWidget.takeItem(0) + myQCustomQWidget = TaskList() + myQCustomQWidget.set_file_name(file_name) + myQCustomQWidget.set_progress(int(progress)) + myQCustomQWidget.set_icon(file_path) + myQCustomQWidget.hide_progress_bar(transfer_complete) - myQCustomQWidget = TaskList() - myQCustomQWidget.set_file_name(file_name) - myQCustomQWidget.set_progress(int(data['progress'])) - myQCustomQWidget.set_icon(file_path) - myQCustomQWidget.hide_progress_bar(data['transfer_complete']) - myQCustomQWidget.set_label_1(f"Available in {parent_dir.group(1)}") - myQCustomQWidget.set_label_2(f'{file_size_human}') - - # Create QListWidgetItem - myQListWidgetItem = QListWidgetItem() - # Set size hint - myQListWidgetItem.setSizeHint(myQCustomQWidget.sizeHint()) - # Add QListWidgetItem into QListWidget - self.profile_status_pages[profile].listWidget.insertItem(0, myQListWidgetItem) - self.profile_status_pages[profile].listWidget.setItemWidget(myQListWidgetItem, myQCustomQWidget) + if file_operation == "Deleting": + myQCustomQWidget.set_label_1(f"Deleted from {parent_dir}") + myQCustomQWidget.set_label_2(f"") + elif transfer_complete: + myQCustomQWidget.set_label_1(f"Available in {parent_dir}") + myQCustomQWidget.set_label_2(f"{file_size_human}") else: - self.profile_status_pages[profile].listWidget.takeItem(0) + myQCustomQWidget.set_label_1(file_operation) + myQCustomQWidget.set_label_2(f"{progress_data_human} of {file_size_human}") - myQCustomQWidget = TaskList() - myQCustomQWidget.set_file_name(file_name) - myQCustomQWidget.set_progress(int(data['progress'])) - myQCustomQWidget.set_icon(file_path) - myQCustomQWidget.hide_progress_bar(data['transfer_complete']) - myQCustomQWidget.set_label_1(data['file_operation']) - myQCustomQWidget.set_label_2(f'{progress_data_human} of {file_size_human}') + # Create QListWidgetItem + myQListWidgetItem = QListWidgetItem() - # Create QListWidgetItem - myQListWidgetItem = QListWidgetItem() - # Set size hint - myQListWidgetItem.setSizeHint(myQCustomQWidget.sizeHint()) - # Add QListWidgetItem into QListWidget - self.profile_status_pages[profile].listWidget.insertItem(0, myQListWidgetItem) - self.profile_status_pages[profile].listWidget.setItemWidget(myQListWidgetItem, myQCustomQWidget) + # Set size hint + myQListWidgetItem.setSizeHint(myQCustomQWidget.sizeHint()) + # Add QListWidgetItem into QListWidget + self.profile_status_pages[profile].listWidget.insertItem(0, myQListWidgetItem) + self.profile_status_pages[profile].listWidget.setItemWidget(myQListWidgetItem, myQCustomQWidget) def show_login(self, profile): # Show login window @@ -1001,22 +1441,26 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.lw.setupUi(self.window1) self.window1.show() - self.config_file = global_config[profile]['config_file'].strip('"') + self.config_file = global_config[profile]["config_file"].strip('"') self.config_dir = re.search(r"(.+)/.+$", self.config_file).group(1) # use static URL for now. TODO: use auth files in the future - url = 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=d50ca740-c83f-4d1b-b616' \ - '-12c519384f0c&scope=Files.ReadWrite%20Files.ReadWrite.all%20Sites.Read.All%20Sites.ReadWrite.All' \ - '%20offline_access&response_type=code&prompt=login&redirect_uri=https://login.microsoftonline.com' \ - '/common/oauth2/nativeclient ' + url = ( + "https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=d50ca740-c83f-4d1b-b616" + "-12c519384f0c&scope=Files.ReadWrite%20Files.ReadWrite.all%20Sites.Read.All%20Sites.ReadWrite.All" + "%20offline_access&response_type=code&prompt=login&redirect_uri=https://login.microsoftonline.com" + "/common/oauth2/nativeclient" + ) self.lw.loginFrame.setUrl(QUrl(url)) # Wait for user to login and obtain response URL - self.lw.loginFrame.urlChanged.connect(lambda: self.get_response_url(self.lw.loginFrame.url().toString(), self.config_dir, profile)) + self.lw.loginFrame.urlChanged.connect( + lambda: self.get_response_url(self.lw.loginFrame.url().toString(), self.config_dir, profile) + ) def get_response_url(self, response_url, config_dir, profile): # Get response URL from OneDrive OAuth2 - if 'nativeclient?code=' in response_url: + if "nativeclient?code=" in response_url: print(f'onedrive --confdir="{config_dir}" --auth-response "{response_url}"') os.system(f'onedrive --confdir="{config_dir}" --auth-response "{response_url}"') print("Login performed") @@ -1026,11 +1470,9 @@ class MainWindow(QMainWindow, Ui_MainWindow): pass - def read_config(config_file): - with open(config_file, 'r') as f: - config_string = '[onedrive]\n' + f.read() - + with open(config_file, "r") as f: + config_string = "[onedrive]\n" + f.read() config = ConfigParser() config.read_string(config_string) @@ -1040,7 +1482,7 @@ def read_config(config_file): def create_global_config(): """ - Creates dict which is used as running global config. + Creates dict which is used as running global config. EXAMPLE: { @@ -1060,20 +1502,20 @@ def create_global_config(): "onedrive": { "sync_dir": '"~/OneDrive2"', "skip_file": '"~*|.~*|*.tmp|*.txt|*.exe"', - "monitor_interval": '"15"', ...} + "monitor_interval": '"15"', ...} """ - # Load all default values. Needed for cases wher customer's config does not contain all properties. + # Load all default values. Needed for cases wher customer's config does not contain all properties. _default_od_config = read_config("resources/default_config") - default_od_config = _default_od_config._sections + default_od_config = _default_od_config._sections # Load existing user profiles. _profiles = ConfigParser() _profiles.read(PROFILES_FILE) - profiles = _profiles._sections + profiles = _profiles._sections for profile in profiles: - profile_config_file = profiles[profile]['config_file'] + profile_config_file = profiles[profile]["config_file"] _od_config = read_config(profile_config_file) od_config = _od_config._sections @@ -1087,8 +1529,8 @@ def create_global_config(): def save_global_config(): # Save all OneDrive config files after configuration change. for profile in global_config: - - profile_config_file = os.path.expanduser(global_config[profile]['config_file'].strip('"')) + + profile_config_file = os.path.expanduser(global_config[profile]["config_file"].strip('"')) # print(profile_config_file) # print(global_config) @@ -1096,26 +1538,26 @@ def save_global_config(): # print(global_config[profile]['onedrive']) _od_config = {} - _od_config['onedrive'] = global_config[profile]['onedrive'] + _od_config["onedrive"] = global_config[profile]["onedrive"] od_config = ConfigParser() od_config.read_dict(_od_config) - + # Backup last config - os.system(f'cp {profile_config_file} {profile_config_file}_backup') + os.system(f"cp {profile_config_file} {profile_config_file}_backup") # Save OD config changes. directory = re.search(r"(.+)/.+$", profile_config_file).group(1) if not os.path.exists(directory): os.makedirs(directory) - with open(profile_config_file, 'w') as f: + with open(profile_config_file, "w") as f: od_config.write(f) # Remove first line (section) from config file so that OneDrive can read it. - with open(profile_config_file, 'r') as input: + with open(profile_config_file, "r") as input: data = input.read().splitlines(True) - with open(profile_config_file, 'w') as output: + with open(profile_config_file, "w") as output: output.writelines(data[1:]) print(f"{profile} config saved") @@ -1137,5 +1579,10 @@ if __name__ == "__main__": app = QApplication(sys.argv) main_window = MainWindow() + settings_window = SettingsWindow() + settings_window.hide() + + # setup_wizard = SetupWizard() + main_window.show() app.exec() diff --git a/OneDriveGUI/setup_wizard.py b/OneDriveGUI/setup_wizard.py new file mode 100644 index 0000000..e33f707 --- /dev/null +++ b/OneDriveGUI/setup_wizard.py @@ -0,0 +1,232 @@ +import subprocess +import re +import os +from configparser import ConfigParser + +from PySide6.QtGui import QPixmap, QIcon +from PySide6.QtCore import Property, Qt +from PySide6.QtWidgets import ( + QWizard, + QGridLayout, + QLineEdit, + QWizardPage, + QLabel, + QVBoxLayout, + QComboBox, + QApplication, + QCheckBox, + QPushButton, +) + +from OneDriveGUI import read_config + + +class SetupWizard(QWizard): + def __init__(self, parent=None): + super(SetupWizard, self).__init__(parent) + self.setWindowIcon(QIcon("resources/images/icons8-clouds-48.png")) + self.setPage(1, WizardPage_welcome(self)) + self.setPage(2, wizardPage_version_check(self)) + self.setPage(3, wizardPage_create_import(self)) + self.setPage(4, wizardPage_import(self)) + + self.setWindowTitle("OneDriveGUI Setup Wizard") + self.resize(640, 480) + + self.currentIdChanged.connect(self.on_page_change) + + def on_page_change(self): + if self.currentId() == 2: + print("Checking installed OneDrive version") + self.page(2).check_onedrive_version() + + +class WizardPage_welcome(QWizardPage): + def __init__(self, parent=None): + super(WizardPage_welcome, self).__init__(parent) + + self.setTitle("Welcome to OneDriveGUI") + # self.setSubTitle("SubTitle") + + # self.label1 = QLabel() + # self.label1.setText("Welcome to OneDriveGUI") + + self.label_2 = QLabel() + self.label_2.setText("This wizard will help you with initial OneDrive profile creation/import.") + + layout = QVBoxLayout() + # layout.addWidget(self.label1) + layout.addWidget(self.label_2) + self.setLayout(layout) + + + +class wizardPage_version_check(QWizardPage): + def __init__(self, parent=None): + super(wizardPage_version_check, self).__init__(parent) + self.setTitle("OneDrive version check") + + # self.label_3 = QLabel() + # self.label_3.setText("Installed OneDrive version:") + + self.label_4 = QLabel() + self.label_4.setText("Installed/Not Installed/ version") + + self.label_5 = QLabel() + self.label_5.setWordWrap(True) + self.label_5.setText( + "OneDrive Client for Linux does not seem to be installed. Please install it by following " \ + "instructions for your distro. " + ) + + layout = QVBoxLayout() + # layout.addWidget(self.label_3) + layout.addWidget(self.label_4) + layout.addWidget(self.label_5) + self.setLayout(layout) + + def check_onedrive_version(self): + # Check if OneDrive is installed + od_version_check = subprocess.check_output(["onedrive", "--version"]) + if "onedrive v" in str(od_version_check): + self.od_version = re.search(r".\s(v[0-9.]+)", str(od_version_check)).group(1) + print(f"OneDrive {self.od_version} detected.") + self.label_4.setText(f"OneDrive {self.od_version} detected.") + self.label_5.hide() + return True + else: + self.label_4.setText("OneDrive not detected.") + return False + + + +class wizardPage_create_import(QWizardPage): + def __init__(self, parent=None): + super(wizardPage_create_import, self).__init__(parent) + self.setTitle("Create/Import OneDrive profile") + + self.checkBox_create = QCheckBox() + self.checkBox_create.setText("Create new OneDrive profile") + self.checkBox_create.stateChanged.connect(self.on_checkbox_change) + + self.checkBox_import = QCheckBox() + self.checkBox_import.setText("Import existing OneDrive profile/config") + self.checkBox_import.stateChanged.connect(self.on_checkbox_change) + + layout = QVBoxLayout() + layout.addWidget(self.checkBox_create) + layout.addWidget(self.checkBox_import) + self.setLayout(layout) + + + def on_checkbox_change(self): + if self.checkBox_create.isChecked(): + print(f"Create new profile is checked") + self.checkBox_import.setDisabled(True) + # self.wizardPage_create_import.completeChanged() + + elif self.checkBox_import.isChecked(): + print(f"Import profile is checked") + self.checkBox_create.setDisabled(True) + # self.wizardPage_create_import.completeChanged() + + else: + print(f"No option is unchecked") + self.checkBox_import.setDisabled(False) + self.checkBox_create.setDisabled(False) + + +class wizardPage_import(QWizardPage): + def __init__(self, parent=None): + super(wizardPage_import, self).__init__(parent) + self.setTitle("Create/Import OneDrive profile") + + self.label_profile_name = QLabel() + self.label_profile_name.setText("Profile name") + + self.label_config_path = QLabel() + self.label_config_path.setText("Config fil path") + + + self.lineEdit_profile_name = QLineEdit() + self.lineEdit_profile_name.setPlaceholderText("E.g. john@live.com") + + self.lineEdit_config_path = QLineEdit() + self.lineEdit_config_path.setPlaceholderText("E.g. ~/.config/onedrive/config") + + + self.pushButton_import = QPushButton() + + + layout = QVBoxLayout() + layout.addWidget(self.label_profile_name) + layout.addWidget(self.label_config_path) + layout.addWidget(self.lineEdit_profile_name) + layout.addWidget(self.lineEdit_config_path) + layout.addWidget(self.pushButton_import) + self.setLayout(layout) + + def import_profile(self): + """ + Imports pre-existing OneDrive profile. + Loads default values firt, then overwrite them with user settings. + This is to handle cases where imported config contains only some properties. + """ + + profile_name = self.lineEdit_profile_name.text() + config_path = os.path.expanduser(self.lineEdit_config_path.text()) + + # Load all default values. + _default_od_config = read_config("resources/default_config") + default_od_config = _default_od_config._sections + + # Load user's settings. + _new_od_config = read_config(config_path) + new_od_config = _new_od_config._sections + + # Construct dict with user profile settings. + new_profile = {profile_name: {"config_file": config_path, "enable_debug": False, "mode": "monitor"}} + + # Load existing user profiles and add the new profile. + _profiles = ConfigParser() + _profiles.read(PROFILES_FILE) + _profiles[profile_name] = new_profile[profile_name] + + # Create profile config file if it does not exist. + profiles_dir = re.search(r"(.+)/profiles$", PROFILES_FILE).group(1) + if not os.path.exists(profiles_dir): + os.makedirs(profiles_dir) + + # Save the new profile. + with open(PROFILES_FILE, "w") as configfile: + _profiles.write(configfile) + + # Append OD config + new_profile[profile_name].update(default_od_config) + new_profile[profile_name].update(new_od_config) + + # Append new profile into running global profile + global_config.update(new_profile) + # print(new_profile) + # print(global_config) + + self.settings_window.listWidget_profiles.addItem(profile_name) + self.setting_page = ProfileSettingsPage(profile_name) + self.settings_window.stackedLayout.addWidget(self.setting_page) + + # Add status page widget for new profile + main_window.comboBox.addItem(profile_name) + main_window.profile_status_pages[profile_name] = ProfileStatusPage(profile_name) + main_window.stackedLayout.addWidget(main_window.profile_status_pages[profile_name]) + + # Hide "Create profile" push button from main windows. + main_window.pushButton_new_profile.hide() + + print(f"Account {profile_name} has been imported") + self.pushButton_import.setText("Done") + self.pushButton_import.setDisabled(True) + + + + + diff --git a/OneDriveGUI/ui/process_status_page.ui b/OneDriveGUI/ui/process_status_page.ui index 50de7d5..e64aa71 100644 --- a/OneDriveGUI/ui/process_status_page.ui +++ b/OneDriveGUI/ui/process_status_page.ui @@ -62,25 +62,18 @@ 2 - + + + color: rgb(255, 255, 255); + Start - - - - color: rgb(255, 255, 255); - - - ... - - - - - + + 11 @@ -92,33 +85,59 @@ color: rgb(255, 255, 255); - Onedrive is ... + Onedrive is sync not running Qt::AlignCenter - - + + color: rgb(255, 255, 255); - ... - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + color: rgb(255, 255, 255); + Stop + + + + color: rgb(255, 255, 255); + + + + + + Qt::AlignCenter + + + + + + + color: rgb(255, 255, 255); + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + diff --git a/OneDriveGUI/ui/setup_wizard.ui b/OneDriveGUI/ui/setup_wizard.ui new file mode 100644 index 0000000..940bca4 --- /dev/null +++ b/OneDriveGUI/ui/setup_wizard.ui @@ -0,0 +1,352 @@ + + + SetupWizard + + + + 0 + 0 + 640 + 480 + + + + + 640 + 480 + + + + + 640 + 480 + + + + Wizard + + + QWizard::ClassicStyle + + + + 1 + + + + + 230 + 80 + 271 + 18 + + + + Welcome to OneDriveGUI + + + + + + 110 + 200 + 441 + 20 + + + + This wizard will help you with initial OneDrive profile creation/import. + + + + + + 2 + + + + + 20 + 80 + 171 + 18 + + + + Installed OneDrive version: + + + + + + 200 + 80 + 211 + 18 + + + + Installed/Not Installed/ version + + + + + + 10 + 160 + 531 + 111 + + + + <html><head/><body><p><span style=" font-family:'Droid Sans Mono','monospace','monospace','Droid Sans Fallback'; font-size:14px; color:#960000;">OneDrive Client for Linux does not seem to be installed. </span></p><pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; line-height:19px; background-color:#272822;"><span style=" font-family:'Droid Sans Mono','monospace','monospace','Droid Sans Fallback'; font-size:14px; color:#960000;">Please install it by following </span><a href="https://github.com/abraunegg/onedrive/blob/master/docs/INSTALL.md"><span style=" font-family:'Hack'; text-decoration: underline; color:#960000;">instructions</span></a><span style=" font-family:'Droid Sans Mono','monospace','monospace','Droid Sans Fallback'; font-size:14px; color:#960000;"> for your distro. </span></pre></body></html> + + + + + + 3 + + + + + 30 + 70 + 481 + 18 + + + + Would you like to create a new OneDrive profile or import existing one? + + + + + + 30 + 140 + 171 + 22 + + + + Create new profile + + + + + + 30 + 180 + 251 + 22 + + + + Import existing profile/config. + + + + + + 4 + + + + + 30 + 60 + 291 + 18 + + + + Import existing profile/config + + + + + + 7 + 166 + 107 + 32 + + + + + + + Profile Name + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 7 + 210 + 107 + 32 + + + + + + + Path to config file + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 120 + 166 + 308 + 32 + + + + E.g. john@live.com + + + + + + 120 + 210 + 308 + 32 + + + + E.g. ~/.config/onedrive/config + + + + + + 120 + 310 + 391 + 34 + + + + Import profile + + + + + + 5 + + + + + 40 + 70 + 231 + 18 + + + + Create new profile + + + + + + 145 + 219 + 249 + 32 + + + + E.g. ~/OneDrive_john@live.com/ + + + + + + 145 + 180 + 249 + 32 + + + + E.g. john@live.com + + + + + + 30 + 180 + 109 + 32 + + + + New profile name + + + + + + 30 + 219 + 109 + 32 + + + + Sync directory + + + + + + 170 + 340 + 351 + 34 + + + + Create new profile + + + + + + 6 + + + + + 20 + 80 + 591 + 171 + + + + <html><head/><body><p>Your OneDrive profile has been created. </p><p><br/></p><p>You can adjust advanced profile options if needed. Once you are happy with the profile settings, start sync with OneDrive. You will be automatically presented with a OneDrive login page if you have not logged on previously.</p></body></html> + + + true + + + + + + + diff --git a/OneDriveGUI/ui/ui_process_status_page.py b/OneDriveGUI/ui/ui_process_status_page.py index 761d32b..a14cc1d 100644 --- a/OneDriveGUI/ui/ui_process_status_page.py +++ b/OneDriveGUI/ui/ui_process_status_page.py @@ -41,37 +41,46 @@ class Ui_status_page(object): self.gridLayout.setContentsMargins(2, 2, 2, 2) self.toolButton_start = QToolButton(self.frame) self.toolButton_start.setObjectName(u"toolButton_start") + self.toolButton_start.setStyleSheet(u"color: rgb(255, 255, 255);") - self.gridLayout.addWidget(self.toolButton_start, 2, 1, 1, 1) + self.gridLayout.addWidget(self.toolButton_start, 5, 0, 1, 1) - self.label_4 = QLabel(self.frame) - self.label_4.setObjectName(u"label_4") - self.label_4.setStyleSheet(u"color: rgb(255, 255, 255);") - - self.gridLayout.addWidget(self.label_4, 2, 0, 1, 1) - - self.label_6 = QLabel(self.frame) - self.label_6.setObjectName(u"label_6") + self.label_onedrive_status = QLabel(self.frame) + self.label_onedrive_status.setObjectName(u"label_onedrive_status") font = QFont() font.setPointSize(11) font.setBold(True) - self.label_6.setFont(font) - self.label_6.setStyleSheet(u"color: rgb(255, 255, 255);") - self.label_6.setAlignment(Qt.AlignCenter) + self.label_onedrive_status.setFont(font) + self.label_onedrive_status.setStyleSheet(u"color: rgb(255, 255, 255);") + self.label_onedrive_status.setAlignment(Qt.AlignCenter) - self.gridLayout.addWidget(self.label_6, 1, 0, 1, 4) + self.gridLayout.addWidget(self.label_onedrive_status, 1, 0, 1, 5) - self.label_3 = QLabel(self.frame) - self.label_3.setObjectName(u"label_3") - self.label_3.setStyleSheet(u"color: rgb(255, 255, 255);") - self.label_3.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.label_status = QLabel(self.frame) + self.label_status.setObjectName(u"label_status") + self.label_status.setStyleSheet(u"color: rgb(255, 255, 255);") - self.gridLayout.addWidget(self.label_3, 2, 3, 1, 1) + self.gridLayout.addWidget(self.label_status, 5, 2, 1, 1) self.toolButton_stop = QToolButton(self.frame) self.toolButton_stop.setObjectName(u"toolButton_stop") + self.toolButton_stop.setStyleSheet(u"color: rgb(255, 255, 255);") - self.gridLayout.addWidget(self.toolButton_stop, 2, 2, 1, 1) + self.gridLayout.addWidget(self.toolButton_stop, 5, 1, 1, 1) + + self.label_account_type = QLabel(self.frame) + self.label_account_type.setObjectName(u"label_account_type") + self.label_account_type.setStyleSheet(u"color: rgb(255, 255, 255);") + self.label_account_type.setAlignment(Qt.AlignCenter) + + self.gridLayout.addWidget(self.label_account_type, 3, 0, 1, 5) + + self.label_free_space = QLabel(self.frame) + self.label_free_space.setObjectName(u"label_free_space") + self.label_free_space.setStyleSheet(u"color: rgb(255, 255, 255);") + self.label_free_space.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + + self.gridLayout.addWidget(self.label_free_space, 5, 4, 1, 1) self.verticalLayout.addWidget(self.frame) @@ -121,10 +130,11 @@ class Ui_status_page(object): def retranslateUi(self, status_page): status_page.setWindowTitle(QCoreApplication.translate("status_page", u"OneDriveGUI - Process Status", None)) self.toolButton_start.setText(QCoreApplication.translate("status_page", u"Start", None)) - self.label_4.setText(QCoreApplication.translate("status_page", u"...", None)) - self.label_6.setText(QCoreApplication.translate("status_page", u"Onedrive is ...", None)) - self.label_3.setText(QCoreApplication.translate("status_page", u"...", None)) + self.label_onedrive_status.setText(QCoreApplication.translate("status_page", u"Onedrive is sync not running", None)) + self.label_status.setText("") self.toolButton_stop.setText(QCoreApplication.translate("status_page", u"Stop", None)) + self.label_account_type.setText("") + self.label_free_space.setText("") self.pushButton.setText(QCoreApplication.translate("status_page", u"Open Folder", None)) self.pushButton_2.setText(QCoreApplication.translate("status_page", u"Sync", None)) self.pushButton_settings.setText(QCoreApplication.translate("status_page", u"Settings", None)) diff --git a/OneDriveGUI/ui/ui_setup_wizard.py b/OneDriveGUI/ui/ui_setup_wizard.py new file mode 100644 index 0000000..92ac5ec --- /dev/null +++ b/OneDriveGUI/ui/ui_setup_wizard.py @@ -0,0 +1,150 @@ +# -*- coding: utf-8 -*- + +################################################################################ +## Form generated from reading UI file 'setup_wizard.ui' +## +## Created by: Qt User Interface Compiler version 6.2.2 +## +## WARNING! All changes made in this file will be lost when recompiling UI file! +################################################################################ + +from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, + QMetaObject, QObject, QPoint, QRect, + QSize, QTime, QUrl, Qt) +from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, + QFont, QFontDatabase, QGradient, QIcon, + QImage, QKeySequence, QLinearGradient, QPainter, + QPalette, QPixmap, QRadialGradient, QTransform) +from PySide6.QtWidgets import (QApplication, QCheckBox, QLabel, QLineEdit, + QPushButton, QSizePolicy, QWidget, QWizard, + QWizardPage) + +class Ui_SetupWizard(object): + def setupUi(self, SetupWizard): + if not SetupWizard.objectName(): + SetupWizard.setObjectName(u"SetupWizard") + SetupWizard.resize(640, 480) + SetupWizard.setMinimumSize(QSize(640, 480)) + SetupWizard.setMaximumSize(QSize(640, 480)) + SetupWizard.setWizardStyle(QWizard.ClassicStyle) + self.wizardPage_welcome = QWizardPage() + self.wizardPage_welcome.setObjectName(u"wizardPage_welcome") + self.label = QLabel(self.wizardPage_welcome) + self.label.setObjectName(u"label") + self.label.setGeometry(QRect(230, 80, 271, 18)) + self.label_2 = QLabel(self.wizardPage_welcome) + self.label_2.setObjectName(u"label_2") + self.label_2.setGeometry(QRect(110, 200, 441, 20)) + SetupWizard.setPage(1, self.wizardPage_welcome) + self.wizardPage_version_check = QWizardPage() + self.wizardPage_version_check.setObjectName(u"wizardPage_version_check") + self.label_3 = QLabel(self.wizardPage_version_check) + self.label_3.setObjectName(u"label_3") + self.label_3.setGeometry(QRect(20, 80, 171, 18)) + self.label_4 = QLabel(self.wizardPage_version_check) + self.label_4.setObjectName(u"label_4") + self.label_4.setGeometry(QRect(200, 80, 211, 18)) + self.label_5 = QLabel(self.wizardPage_version_check) + self.label_5.setObjectName(u"label_5") + self.label_5.setGeometry(QRect(10, 160, 531, 111)) + SetupWizard.setPage(2, self.wizardPage_version_check) + self.wizardPage_create_import = QWizardPage() + self.wizardPage_create_import.setObjectName(u"wizardPage_create_import") + self.label_6 = QLabel(self.wizardPage_create_import) + self.label_6.setObjectName(u"label_6") + self.label_6.setGeometry(QRect(30, 70, 481, 18)) + self.checkBox_create = QCheckBox(self.wizardPage_create_import) + self.checkBox_create.setObjectName(u"checkBox_create") + self.checkBox_create.setGeometry(QRect(30, 140, 171, 22)) + self.checkBox_import = QCheckBox(self.wizardPage_create_import) + self.checkBox_import.setObjectName(u"checkBox_import") + self.checkBox_import.setGeometry(QRect(30, 180, 251, 22)) + SetupWizard.setPage(3, self.wizardPage_create_import) + self.wizardPage_import = QWizardPage() + self.wizardPage_import.setObjectName(u"wizardPage_import") + self.label_7 = QLabel(self.wizardPage_import) + self.label_7.setObjectName(u"label_7") + self.label_7.setGeometry(QRect(30, 60, 291, 18)) + self.label_profile_name = QLabel(self.wizardPage_import) + self.label_profile_name.setObjectName(u"label_profile_name") + self.label_profile_name.setGeometry(QRect(7, 166, 107, 32)) +#if QT_CONFIG(tooltip) + self.label_profile_name.setToolTip(u"") +#endif // QT_CONFIG(tooltip) + self.label_profile_name.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.label_config_path = QLabel(self.wizardPage_import) + self.label_config_path.setObjectName(u"label_config_path") + self.label_config_path.setGeometry(QRect(7, 210, 107, 32)) +#if QT_CONFIG(tooltip) + self.label_config_path.setToolTip(u"") +#endif // QT_CONFIG(tooltip) + self.label_config_path.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.lineEdit_profile_name = QLineEdit(self.wizardPage_import) + self.lineEdit_profile_name.setObjectName(u"lineEdit_profile_name") + self.lineEdit_profile_name.setGeometry(QRect(120, 166, 308, 32)) + self.lineEdit_config_path = QLineEdit(self.wizardPage_import) + self.lineEdit_config_path.setObjectName(u"lineEdit_config_path") + self.lineEdit_config_path.setGeometry(QRect(120, 210, 308, 32)) + self.pushButton_import = QPushButton(self.wizardPage_import) + self.pushButton_import.setObjectName(u"pushButton_import") + self.pushButton_import.setGeometry(QRect(120, 310, 391, 34)) + SetupWizard.setPage(4, self.wizardPage_import) + self.wizardPage_create = QWizardPage() + self.wizardPage_create.setObjectName(u"wizardPage_create") + self.label_10 = QLabel(self.wizardPage_create) + self.label_10.setObjectName(u"label_10") + self.label_10.setGeometry(QRect(40, 70, 231, 18)) + self.lineEdit_sync_dir = QLineEdit(self.wizardPage_create) + self.lineEdit_sync_dir.setObjectName(u"lineEdit_sync_dir") + self.lineEdit_sync_dir.setGeometry(QRect(145, 219, 249, 32)) + self.lineEdit_new_profile_name = QLineEdit(self.wizardPage_create) + self.lineEdit_new_profile_name.setObjectName(u"lineEdit_new_profile_name") + self.lineEdit_new_profile_name.setGeometry(QRect(145, 180, 249, 32)) + self.label_new_profile_name = QLabel(self.wizardPage_create) + self.label_new_profile_name.setObjectName(u"label_new_profile_name") + self.label_new_profile_name.setGeometry(QRect(30, 180, 109, 32)) + self.label_sync_dir = QLabel(self.wizardPage_create) + self.label_sync_dir.setObjectName(u"label_sync_dir") + self.label_sync_dir.setGeometry(QRect(30, 219, 109, 32)) + self.pushButton_create = QPushButton(self.wizardPage_create) + self.pushButton_create.setObjectName(u"pushButton_create") + self.pushButton_create.setGeometry(QRect(170, 340, 351, 34)) + SetupWizard.setPage(5, self.wizardPage_create) + self.wizardPage_finish = QWizardPage() + self.wizardPage_finish.setObjectName(u"wizardPage_finish") + self.label_13 = QLabel(self.wizardPage_finish) + self.label_13.setObjectName(u"label_13") + self.label_13.setGeometry(QRect(20, 80, 591, 171)) + self.label_13.setWordWrap(True) + SetupWizard.setPage(6, self.wizardPage_finish) + + self.retranslateUi(SetupWizard) + + QMetaObject.connectSlotsByName(SetupWizard) + # setupUi + + def retranslateUi(self, SetupWizard): + SetupWizard.setWindowTitle(QCoreApplication.translate("SetupWizard", u"Wizard", None)) + self.label.setText(QCoreApplication.translate("SetupWizard", u"Welcome to OneDriveGUI", None)) + self.label_2.setText(QCoreApplication.translate("SetupWizard", u"This wizard will help you with initial OneDrive profile creation/import.", None)) + self.label_3.setText(QCoreApplication.translate("SetupWizard", u"Installed OneDrive version:", None)) + self.label_4.setText(QCoreApplication.translate("SetupWizard", u"Installed/Not Installed/ version", None)) + self.label_5.setText(QCoreApplication.translate("SetupWizard", u"

OneDrive Client for Linux does not seem to be installed. 

Please install it by following instructions for your distro.
", None)) + self.label_6.setText(QCoreApplication.translate("SetupWizard", u"Would you like to create a new OneDrive profile or import existing one?", None)) + self.checkBox_create.setText(QCoreApplication.translate("SetupWizard", u"Create new profile", None)) + self.checkBox_import.setText(QCoreApplication.translate("SetupWizard", u"Import existing profile/config. ", None)) + self.label_7.setText(QCoreApplication.translate("SetupWizard", u"Import existing profile/config", None)) + self.label_profile_name.setText(QCoreApplication.translate("SetupWizard", u"Profile Name", None)) + self.label_config_path.setText(QCoreApplication.translate("SetupWizard", u"Path to config file", None)) + self.lineEdit_profile_name.setPlaceholderText(QCoreApplication.translate("SetupWizard", u"E.g. john@live.com", None)) + self.lineEdit_config_path.setPlaceholderText(QCoreApplication.translate("SetupWizard", u"E.g. ~/.config/onedrive/config", None)) + self.pushButton_import.setText(QCoreApplication.translate("SetupWizard", u"Import profile", None)) + self.label_10.setText(QCoreApplication.translate("SetupWizard", u"Create new profile", None)) + self.lineEdit_sync_dir.setPlaceholderText(QCoreApplication.translate("SetupWizard", u"E.g. ~/OneDrive_john@live.com/", None)) + self.lineEdit_new_profile_name.setPlaceholderText(QCoreApplication.translate("SetupWizard", u"E.g. john@live.com", None)) + self.label_new_profile_name.setText(QCoreApplication.translate("SetupWizard", u"New profile name", None)) + self.label_sync_dir.setText(QCoreApplication.translate("SetupWizard", u"Sync directory", None)) + self.pushButton_create.setText(QCoreApplication.translate("SetupWizard", u"Create new profile", None)) + self.label_13.setText(QCoreApplication.translate("SetupWizard", u"

Your OneDrive profile has been created.


You can adjust advanced profile options if needed. Once you are happy with the profile settings, start sync with OneDrive. You will be automatically presented with a OneDrive login page if you have not logged on previously.

", None)) + # retranslateUi + diff --git a/OneDriveGUI/ui/ui_wizardPage_welcome.py b/OneDriveGUI/ui/ui_wizardPage_welcome.py new file mode 100644 index 0000000..a4d9dab --- /dev/null +++ b/OneDriveGUI/ui/ui_wizardPage_welcome.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- + +################################################################################ +## Form generated from reading UI file 'wizardPage_welcome.ui' +## +## Created by: Qt User Interface Compiler version 6.2.2 +## +## WARNING! All changes made in this file will be lost when recompiling UI file! +################################################################################ + +from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, + QMetaObject, QObject, QPoint, QRect, + QSize, QTime, QUrl, Qt) +from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, + QFont, QFontDatabase, QGradient, QIcon, + QImage, QKeySequence, QLinearGradient, QPainter, + QPalette, QPixmap, QRadialGradient, QTransform) +from PySide6.QtWidgets import (QApplication, QLabel, QSizePolicy, QWidget, + QWizardPage) + +class Ui_WizardPage(object): + def setupUi(self, WizardPage): + if not WizardPage.objectName(): + WizardPage.setObjectName(u"WizardPage") + WizardPage.resize(628, 420) + self.label = QLabel(WizardPage) + self.label.setObjectName(u"label") + self.label.setGeometry(QRect(230, 160, 271, 18)) + self.label_2 = QLabel(WizardPage) + self.label_2.setObjectName(u"label_2") + self.label_2.setGeometry(QRect(110, 280, 441, 20)) + + self.retranslateUi(WizardPage) + + QMetaObject.connectSlotsByName(WizardPage) + # setupUi + + def retranslateUi(self, WizardPage): + WizardPage.setWindowTitle(QCoreApplication.translate("WizardPage", u"WizardPage", None)) + self.label.setText(QCoreApplication.translate("WizardPage", u"Welcome to OneDriveGUI", None)) + self.label_2.setText(QCoreApplication.translate("WizardPage", u"This wizard will help you with initial OneDrive profile creation/import.", None)) + # retranslateUi + diff --git a/OneDriveGUI/ui/wizardPage_welcome.ui b/OneDriveGUI/ui/wizardPage_welcome.ui new file mode 100644 index 0000000..eed8899 --- /dev/null +++ b/OneDriveGUI/ui/wizardPage_welcome.ui @@ -0,0 +1,45 @@ + + + WizardPage + + + + 0 + 0 + 628 + 420 + + + + WizardPage + + + + + 230 + 160 + 271 + 18 + + + + Welcome to OneDriveGUI + + + + + + 110 + 280 + 441 + 20 + + + + This wizard will help you with initial OneDrive profile creation/import. + + + + + + diff --git a/scripts/pyinstaller.txt b/scripts/pyinstaller.txt index 15fe3e5..d643614 100644 --- a/scripts/pyinstaller.txt +++ b/scripts/pyinstaller.txt @@ -1,2 +1,4 @@ -# First test -pyinstaller --onefile --icon=OneDriveGUI.ico OneDriveGUI.py +# Testing +pyinstaller --onefile --icon=resources/images/OneDriveGUI.ico --add-data="resources:resources" OneDriveGUI.py + +pyinstaller --icon=resources/images/OneDriveGUI.ico --add-data="resources:resources" OneDriveGUI.py \ No newline at end of file