Import/Export GUI

This commit is contained in:
Pavel Škoda
2020-06-23 15:35:54 +02:00
committed by Michal Horejsek
parent 1c10cc5065
commit 7e5e3d3dd4
50 changed files with 1793 additions and 692 deletions

View File

@ -38,7 +38,7 @@ Item {
property var allMonths : getMonthList(1,12)
property var allDays : getDayList(1,31)
property var enums : JSON.parse('{"pathOK":1,"pathEmptyPath":2,"pathWrongPath":4,"pathNotADir":8,"pathWrongPermissions":16,"pathDirEmpty":32,"errUnknownError":0,"errEventAPILogout":1,"errUpdateAPI":2,"errUpdateJSON":3,"errUserAuth":4,"errQApplication":18,"errEmailExportFailed":6,"errEmailExportMissing":7,"errNothingToImport":8,"errEmailImportFailed":12,"errDraftImportFailed":13,"errDraftLabelFailed":14,"errEncryptMessageAttachment":15,"errEncryptMessage":16,"errNoInternetWhileImport":17,"errUnlockUser":5,"errSourceMessageNotSelected":19,"errCannotParseMail":5000,"errWrongLoginOrPassword":5001,"errWrongServerPathOrPort":5002,"errWrongAuthMethod":5003,"errIMAPFetchFailed":5004,"errLocalSourceLoadFailed":1000,"errPMLoadFailed":1001,"errRemoteSourceLoadFailed":1002,"errLoadAccountList":1005,"errExit":1006,"errRetry":1007,"errAsk":1008,"errImportFailed":1009,"errCreateLabelFailed":1010,"errCreateFolderFailed":1011,"errUpdateLabelFailed":1012,"errUpdateFolderFailed":1013,"errFillFolderName":1014,"errSelectFolderColor":1015,"errNoInternet":1016,"folderTypeSystem":"","folderTypeLabel":"label","folderTypeFolder":"folder","folderTypeExternal":"external","progressInit":"init","progressLooping":"looping","statusNoInternet":"noInternet","statusCheckingInternet":"internetCheck","statusNewVersionAvailable":"oldVersion","statusUpToDate":"upToDate","statusForceUpdate":"forceupdate"}')
property var enums : JSON.parse('{"pathOK":1,"pathEmptyPath":2,"pathWrongPath":4,"pathNotADir":8,"pathWrongPermissions":16,"pathDirEmpty":32,"errUnknownError":0,"errEventAPILogout":1,"errUpdateAPI":2,"errUpdateJSON":3,"errUserAuth":4,"errQApplication":18,"errEmailExportFailed":6,"errEmailExportMissing":7,"errNothingToImport":8,"errEmailImportFailed":12,"errDraftImportFailed":13,"errDraftLabelFailed":14,"errEncryptMessageAttachment":15,"errEncryptMessage":16,"errNoInternetWhileImport":17,"errUnlockUser":5,"errSourceMessageNotSelected":19,"errCannotParseMail":5000,"errWrongLoginOrPassword":5001,"errWrongServerPathOrPort":5002,"errWrongAuthMethod":5003,"errIMAPFetchFailed":5004,"errLocalSourceLoadFailed":1000,"errPMLoadFailed":1001,"errRemoteSourceLoadFailed":1002,"errLoadAccountList":1005,"errExit":1006,"errRetry":1007,"errAsk":1008,"errImportFailed":1009,"errCreateLabelFailed":1010,"errCreateFolderFailed":1011,"errUpdateLabelFailed":1012,"errUpdateFolderFailed":1013,"errFillFolderName":1014,"errSelectFolderColor":1015,"errNoInternet":1016,"folderTypeSystem":"system","folderTypeLabel":"label","folderTypeFolder":"folder","folderTypeExternal":"external","progressInit":"init","progressLooping":"looping","statusNoInternet":"noInternet","statusCheckingInternet":"internetCheck","statusNewVersionAvailable":"oldVersion","statusUpToDate":"upToDate","statusForceUpdate":"forceupdate"}')
IEStyle{}
@ -396,7 +396,7 @@ Item {
onTriggered : go.runCheckVersion(false)
}
property string areYouSureYouWantToQuit : qsTr("Tool does not finished all the jobs. Do you really want to quit?")
property string areYouSureYouWantToQuit : qsTr("There are incomplete processes - some items are not yet transferred. Do you really want to stop and quit?")
// On start
Component.onCompleted : {
// set spell messages

View File

@ -25,14 +25,15 @@ import ImportExportUI 1.0
Column {
id: dateRange
property var structure : structureExternal
property string sourceID : structureExternal.getID ( -1 )
property var structure : transferRules
property string sourceID : "-1"
property alias allDates : allDatesBox.checked
property alias inputDateFrom : inputDateFrom
property alias inputDateTo : inputDateTo
function setRange() {common.setRange()}
function getRange() {common.getRange()}
function setRangeFromTo(from, to) {common.setRangeFromTo(from, to)}
function applyRange() {common.applyRange()}
property var dropDownStyle : Style.dropDownLight

View File

@ -34,7 +34,7 @@ Item {
property alias inputDateFrom : inputDateFrom
property alias inputDateTo : inputDateTo
function setRange() {common.setRange()}
function getRange() {common.getRange()}
function applyRange() {common.applyRange()}
*/
@ -43,11 +43,7 @@ Item {
inputDateTo.setDate((new Date()).getTime())
}
function setRange(){ // unix time in seconds
var folderFrom = dateRange.structure.getFrom(dateRange.sourceID)
if (folderFrom===undefined) folderFrom = 0
var folderTo = dateRange.structure.getTo(dateRange.sourceID)
if (folderTo===undefined) folderTo = 0
function setRangeFromTo(folderFrom, folderTo){ // unix time in seconds
if ( folderFrom == 0 && folderTo ==0 ) {
dateRange.allDates = true
} else {
@ -57,6 +53,15 @@ Item {
}
}
function getRange(){ // unix time in seconds
//console.log(" ==== GET RANGE === ")
//console.trace()
var folderFrom = dateRange.structure.globalFromDate
var folderTo = dateRange.structure.globalToDate
root.setRangeFromTo(folderFrom, folderTo)
}
function applyRange(){ // unix time is seconds
if (dateRange.allDates) structure.setFromToDate(dateRange.sourceID, 0, 0)
else {
@ -67,15 +72,10 @@ Item {
}
}
Connections {
target: dateRange
onStructureChanged: setRange()
}
Component.onCompleted: {
inputDateFrom.updateRange(gui.netBday)
inputDateTo.updateRange(new Date())
setRange()
//getRange()
}
}

View File

@ -31,8 +31,10 @@ Rectangle {
property real padding : Style.dialog.spacing
property bool down : popup.visible
property var structure : structureExternal
property string sourceID : structureExternal.getID(-1)
property var structure : transferRules
property string sourceID : ""
property int sourceFromDate : 0
property int sourceToDate : 0
color: Style.transparent
@ -145,7 +147,17 @@ Rectangle {
}
}
onAboutToShow : dateRangeInput.setRange()
onAboutToShow : updateRange()
onAboutToHide : dateRangeInput.applyRange()
}
function updateRange() {
dateRangeInput.setRangeFromTo(root.sourceFromDate, root.sourceToDate)
}
Connections {
target:root
onSourceFromDateChanged: root.updateRange()
onSourceToDateChanged: root.updateRange()
}
}

View File

@ -91,8 +91,6 @@ Dialog {
DateRange{
id: dateRangeInput
structure: structurePM
sourceID: structurePM.getID(-1)
}
OutputFormat {
@ -142,7 +140,7 @@ Dialog {
id: buttonNext
fa_icon: Style.fa.check
text: qsTr("Export","todo")
enabled: structurePM != 0
enabled: transferRules != 0
color_main: Style.dialog.background
color_minor: enabled ? Style.dialog.textBlue : Style.main.textDisabled
isOpaque: true
@ -168,13 +166,17 @@ Dialog {
spacing: Style.main.rightMargin
AccessibleText {
id: statusLabel
text : qsTr("Exporting to:")
text : qsTr("Status:")
font.pointSize: Style.main.iconSize * Style.pt
color : Style.main.text
}
AccessibleText {
anchors.baseline: statusLabel.baseline
text : go.progressDescription == gui.enums.progressInit ? outputPathInput.path : go.progressDescription
text : {
if (progressbarExport.isFinished) return qsTr("finished")
if (go.progressDescription == "") return qsTr("exporting")
return go.progressDescription
}
elide: Text.ElideMiddle
width: progressbarExport.width - parent.spacing - statusLabel.width
font.pointSize: Style.dialog.textSize * Style.pt
@ -310,15 +312,17 @@ Dialog {
function check_inputs() {
if (currentIndex == 1) {
// at least one email to export
if (structurePM.rowCount() == 0){
if (transferRules.rowCount() == 0){
errorPopup.show(qsTr("No emails found to export. Please try another address.", "todo"))
return false
}
// at least one source selected
if (!structurePM.atLeastOneSelected) {
errorPopup.show(qsTr("Please select at least one item to export.", "todo"))
return false
}
/*
if (!transferRules.atLeastOneSelected) {
errorPopup.show(qsTr("Please select at least one item to export.", "todo"))
return false
}
*/
// check path
var folderCheck = go.checkPathStatus(outputPathInput.path)
switch (folderCheck) {
@ -364,7 +368,6 @@ Dialog {
errorPopup.buttonYes.visible = true
errorPopup.buttonNo.visible = true
errorPopup.buttonOkay.visible = false
errorPopup.checkbox.text = root.msgClearUnfished
errorPopup.show ("Are you sure you want to cancel this export?")
}
@ -374,10 +377,7 @@ Dialog {
case 0 :
case 1 : root.hide(); break;
case 2 : // progress bar
go.cancelProcess (
errorPopup.checkbox.text == root.msgClearUnfished &&
errorPopup.checkbox.checked
);
go.cancelProcess();
// no break
default:
root.clear_status()
@ -395,7 +395,7 @@ Dialog {
root.hide()
break
case 0: // loading structure
dateRangeInput.setRange()
dateRangeInput.getRange()
//no break
default:
incrementCurrentIndex()
@ -426,7 +426,7 @@ Dialog {
switch (currentIndex) {
case 0:
go.loadStructureForExport(root.address)
sourceFoldersInput.hasItems = (structurePM.rowCount() > 0)
sourceFoldersInput.hasItems = (transferRules.rowCount() > 0)
break
case 2:
dateRangeInput.applyRange()

View File

@ -327,6 +327,7 @@ Dialog {
iconText: Style.fa.refresh
textColor: Style.main.textBlue
onClicked: {
go.resetSource()
root.decrementCurrentIndex()
timer.start()
}
@ -408,20 +409,13 @@ Dialog {
spacing: Style.main.rightMargin
AccessibleText {
id: statusLabel
text : qsTr("Importing from:")
text : qsTr("Status:")
font.pointSize: Style.main.iconSize * Style.pt
color : Style.main.text
}
AccessibleText {
anchors.baseline: statusLabel.baseline
text : {
var sourceFolder = root.isFromFile ? root.inputPath : inputEmail.text
if (go.progressDescription != gui.enums.progressInit && go.progress!=0) {
sourceFolder += "/"
sourceFolder += go.progressDescription
}
return sourceFolder
}
text : go.progressDescription == "" ? qsTr("importing") : go.progressDescription
elide: Text.ElideMiddle
width: progressbarImport.width - parent.spacing - statusLabel.width
font.pointSize: Style.dialog.textSize * Style.pt
@ -582,9 +576,9 @@ Dialog {
spacing : Style.dialog.heightSeparator
Text {
text: Style.fa.check_circle + " " + qsTr("Import completed successfully")
text: go.progressDescription!="" ? qsTr("Import failed: %1").arg(go.progressDescription) : Style.fa.check_circle + " " + qsTr("Import completed successfully")
anchors.horizontalCenter: parent.horizontalCenter
color: Style.main.textGreen
color: go.progressDescription!="" ? Style.main.textRed : Style.main.textGreen
font.bold : true
font.family: Style.fontawesome.name
}
@ -605,11 +599,7 @@ Dialog {
text : qsTr("View errors")
color_main : Style.dialog.textBlue
onClicked : {
if (go.importLogFileName=="") {
console.log("onViewErrors: missing import log file name")
return
}
go.loadImportReports(go.importLogFileName)
go.loadImportReports()
reportList.show()
}
}
@ -619,10 +609,6 @@ Dialog {
text : qsTr("Report files")
color_main : Style.dialog.textBlue
onClicked : {
if (go.importLogFileName=="") {
console.log("onReportError: missing import log file name")
return
}
root.ask_send_report()
}
}
@ -755,7 +741,6 @@ Dialog {
}
function clear() {
go.resetSource()
root.inputPath = ""
clear_status()
inputEmail.clear()
@ -781,7 +766,7 @@ Dialog {
onClickedYes : {
if (errorPopup.msgID == "ask_send_report") {
errorPopup.hide()
root.report_sent(go.sendImportReport(root.address,go.importLogFileName))
root.report_sent(go.sendImportReport(root.address))
return
}
root.cancel()
@ -857,10 +842,13 @@ Dialog {
}
break
case 3: // import insturctions
if (!structureExternal.hasTarget()) {
errorPopup.show(qsTr("Nothing selected for import."))
return false
}
/*
console.log(" ====== TODO ======== ")
if (!structureExternal.hasTarget()) {
errorPopup.show(qsTr("Nothing selected for import."))
return false
}
*/
break
case 4: // import status
}
@ -880,7 +868,7 @@ Dialog {
root.hide()
break
case DialogImport.Page.Progress:
go.cancelProcess(false)
go.cancelProcess()
root.currentIndex=3
root.clear_status()
globalLabels.reset()
@ -905,7 +893,7 @@ Dialog {
globalLabels.labelName,
globalLabels.labelColor,
true,
structureExternal.getID(-1)
"-1"
)
if (!isOK) return
}
@ -919,7 +907,8 @@ Dialog {
case DialogImport.Page.LoadingStructure:
globalLabels.reset()
importInstructions.hasItems = (structureExternal.rowCount() > 0)
// TODO_: importInstructions.hasItems = (structureExternal.rowCount() > 0)
importInstructions.hasItems = true
case DialogImport.Page.ImapSource:
default:
incrementCurrentIndex()
@ -1008,7 +997,7 @@ Dialog {
case DialogImport.Page.SelectSourceType:
case DialogImport.Page.ImapSource:
case DialogImport.Page.SourceToTarget:
globalDateRange.setRange()
globalDateRange.getRange()
break
case DialogImport.Page.LoadingStructure:
go.setupAndLoadForImport(

View File

@ -92,7 +92,7 @@ Rectangle {
clip : true
orientation : ListView.Vertical
boundsBehavior : Flickable.StopAtBounds
model : structurePM
model : transferRules
cacheBuffer : 10000
anchors {
@ -125,27 +125,25 @@ Rectangle {
}
delegate: FolderRowButton {
property variant modelData: model
width : root.width - 5*root.border.width
type : folderType
color : folderColor
title : folderName
isSelected : isFolderSelected
type : modelData.type
folderIconColor : modelData.iconColor
title : modelData.name
isSelected : modelData.isActive
onClicked : {
//console.log("Clicked", folderId, isSelected)
structurePM.setFolderSelection(folderId,!isSelected)
transferRules.setIsRuleActive(modelData.mboxID,!model.isActive)
}
}
section.property: "folderType"
section.property: "type"
section.delegate: FolderRowButton {
isSection : true
width : root.width - 5*root.border.width
title : gui.folderTypeTitle(section)
isSelected : {
//console.log("section selected changed: ", section)
return section == gui.enums.folderTypeLabel ? structurePM.selectedLabels : structurePM.selectedFolders
}
onClicked : structurePM.selectType(section,!isSelected)
isSelected : section == gui.enums.folderTypeLabel ? transferRules.isLabelGroupSelected : transferRules.isFolderGroupSelected
onClicked : transferRules.setIsGroupActive(section,!isSelected)
}
}
}

View File

@ -26,9 +26,9 @@ AccessibleButton {
property bool isSection : false
property bool isSelected : false
property string title : "N/A"
property string type : ""
property color color : "black"
property string title : "N/A"
property string type : ""
property string folderIconColor : Style.main.textBlue
height : Style.exporting.rowHeight
padding : 0.0
@ -72,7 +72,7 @@ AccessibleButton {
left : checkbox.left
leftMargin : Style.dialog.fontSize + Style.exporting.leftMargin
}
color : root.type==gui.enums.folderTypeSystem ? Style.main.textBlue : root.color
color : root.type=="" ? Style.main.textBlue : root.folderIconColor
font {
family : Style.fontawesome.name
pointSize : Style.dialog.fontSize * Style.pt

View File

@ -39,7 +39,7 @@ Rectangle {
}
property real iconWidth : nameWidth*0.3
property bool isSourceSelected: targetFolderID!=""
property bool isSourceSelected: isActive
property string lastTargetFolder: "6" // Archive
property string lastTargetLabels: "" // no flag by default
@ -71,7 +71,7 @@ Rectangle {
Text {
id: folderIcon
text : gui.folderIcon(folderName, gui.enums.folderTypeFolder)
text : gui.folderIcon(name, gui.enums.folderTypeFolder)
anchors.verticalCenter : parent.verticalCenter
color: root.isSourceSelected ? Style.main.text : Style.main.textDisabled
font {
@ -81,7 +81,7 @@ Rectangle {
}
Text {
text : folderName
text : name
width: nameWidth
elide: Text.ElideRight
anchors.verticalCenter : parent.verticalCenter
@ -102,24 +102,27 @@ Rectangle {
SelectFolderMenu {
id: selectFolder
sourceID: folderId
selectedIDs: targetFolderID
sourceID: mboxID
targets: transferRules.targetFolders(mboxID)
width: nameWidth
anchors.verticalCenter : parent.verticalCenter
enabled: root.isSourceSelected
onDoNotImport: root.toggleImport()
onImportToFolder: root.importToFolder(newTargetID)
}
SelectLabelsMenu {
sourceID: folderId
selectedIDs: targetLabelIDs
sourceID: mboxID
targets: transferRules.targetLabels(mboxID)
width: nameWidth
anchors.verticalCenter : parent.verticalCenter
enabled: root.isSourceSelected
onAddTargetLabel: { transferRules.addTargetID(sourceID, newTargetID) }
onRemoveTargetLabel: { transferRules.removeTargetID(sourceID, newTargetID) }
}
LabelIconList {
selectedIDs: targetLabelIDs
colorList: labelColors=="" ? [] : labelColors.split(";")
width: iconWidth
anchors.verticalCenter : parent.verticalCenter
enabled: root.isSourceSelected
@ -127,38 +130,23 @@ Rectangle {
DateRangeMenu {
id: dateRangeMenu
sourceID: folderId
sourceID: mboxID
sourceFromDate: fromDate
sourceToDate: toDate
enabled: root.isSourceSelected
anchors.verticalCenter : parent.verticalCenter
Component.onCompleted : dateRangeMenu.updateRange()
}
}
function importToFolder(newTargetID) {
if (root.isSourceSelected) {
structureExternal.setTargetFolderID(folderId,newTargetID)
} else {
lastTargetFolder = newTargetID
toggleImport()
}
transferRules.addTargetID(mboxID,newTargetID)
}
function toggleImport() {
if (root.isSourceSelected) {
lastTargetFolder = targetFolderID
lastTargetLabels = targetLabelIDs
structureExternal.setTargetFolderID(folderId,"")
return Qt.Unchecked
} else {
structureExternal.setTargetFolderID(folderId,lastTargetFolder)
var labelsSplit = lastTargetLabels.split(";")
for (var labelIndex in labelsSplit) {
var labelID = labelsSplit[labelIndex]
structureExternal.addTargetLabelID(folderId,labelID)
}
return Qt.Checked
}
transferRules.setIsRuleActive(mboxID, !root.isSourceSelected)
}
}

View File

@ -50,7 +50,6 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
text: qsTr("No emails found for this source.","todo")
}
}
anchors {
@ -70,7 +69,7 @@ Rectangle {
clip : true
orientation : ListView.Vertical
boundsBehavior : Flickable.StopAtBounds
model : structureExternal
model : transferRules
cacheBuffer : 10000
delegate : ImportDelegate {
width: root.width

View File

@ -25,8 +25,8 @@ import ImportExportUI 1.0
Row {
id: dateRange
property var structure : structureExternal
property string sourceID : structureExternal.getID ( -1 )
property var structure : transferRules
property string sourceID : "-1"
property alias allDates : allDatesBox.checked
property alias inputDateFrom : inputDateFrom
@ -34,7 +34,7 @@ Row {
property alias labelWidth: label.width
function setRange() {common.setRange()}
function getRange() {common.getRange()}
function applyRange() {common.applyRange()}
DateRangeFunctions {id:common}

View File

@ -26,42 +26,16 @@ Rectangle {
id: root
width: Style.main.fontSize * 2
height: metrics.height
property string selectedIDs : ""
property var colorList
color: "transparent"
DelegateModel {
id: selectedLabels
filterOnGroup: "selected"
groups: DelegateModelGroup {
id: selected
name: "selected"
includeByDefault: true
}
model : structurePM
model : colorList
delegate : Text {
text : metrics.text
font : metrics.font
color : folderColor===undefined ? "#000": folderColor
}
}
function updateFilter() {
var selected = root.selectedIDs.split(";")
var rowCount = selectedLabels.items.count
//console.log(" log ::", root.selectedIDs, rowCount, selectedLabels.model)
// filter
for (var iItem = 0; iItem < rowCount; iItem++) {
var entry = selectedLabels.items.get(iItem);
//console.log(" log filter ", iItem, rowCount, entry.model.folderId, entry.model.folderType, selected[iSel], entry.inSelected )
for (var iSel in selected) {
entry.inSelected = (
entry.model.folderType == gui.enums.folderTypeLabel &&
entry.model.folderId == selected[iSel]
)
if (entry.inSelected) break // found match, skip rest
}
color : modelData
}
}
@ -77,7 +51,7 @@ Rectangle {
Row {
anchors.left : root.left
spacing : {
var n = Math.max(2,selectedLabels.count)
var n = Math.max(2,root.colorList.length)
var tagWidth = Math.max(1.0,metrics.width)
var space = Math.min(1*Style.px, (root.width - n*tagWidth)/(n-1)) // not more than 1px
space = Math.max(space,-tagWidth) // not less than tag width
@ -88,9 +62,4 @@ Rectangle {
model: selectedLabels
}
}
Component.onCompleted: root.updateFilter()
onSelectedIDsChanged: root.updateFilter()
Connections { target: structurePM; onDataChanged:root.updateFilter() }
}

View File

@ -26,19 +26,19 @@ ComboBox {
//fixme rounded
height: Style.main.fontSize*2 //fixme
property string folderType: gui.enums.folderTypeFolder
property string selectedIDs
property string sourceID
property var targets
property bool isFolderType: root.folderType == gui.enums.folderTypeFolder
property bool hasTarget: root.selectedIDs != ""
property bool below: true
signal doNotImport()
signal importToFolder(string newTargetID)
signal addTargetLabel(string newTargetID)
signal removeTargetLabel(string newTargetID)
leftPadding: Style.dialog.spacing
onDownChanged : {
if (root.down) view.model.updateFilter()
root.below = popup.y>0
}
@ -58,30 +58,22 @@ ComboBox {
}
displayText: {
//console.trace()
//console.log("updatebox", view.currentIndex, root.hasTarget, root.selectedIDs, root.sourceID, root.folderType)
if (!root.hasTarget) {
if (root.isFolderType) return qsTr("Do not import")
return qsTr("No labels selected")
}
if (!root.isFolderType) return Style.fa.tags + " " + qsTr("Add/Remove labels")
console.log("Target Menu current", view.currentItem, view.currentIndex)
if (view.currentIndex >= 0) {
if (!root.isFolderType) return Style.fa.tags + " " + qsTr("Add/Remove labels")
// We know here that it has a target and this is folder dropdown so we must find the first folder
var selSplit = root.selectedIDs.split(";")
for (var selIndex in selSplit) {
var selectedID = selSplit[selIndex]
var selectedType = structurePM.getType(selectedID)
if (selectedType == gui.enums.folderTypeLabel) continue; // skip type::labele
var selectedName = structurePM.getName(selectedID)
if (selectedName == "") continue; // empty name seems like wrong ID
var icon = gui.folderIcon(selectedName, selectedType)
if (selectedType == gui.enums.folderTypeSystem) {
return icon + " " + selectedName
var tgtName = view.currentItem.folderName
var tgtIcon = view.currentItem.folderIcon
var tgtColor = view.currentItem.folderColor
if (tgtIcon != Style.fa.folder_open) {
return tgtIcon + " " + tgtName
}
var iconColor = structurePM.getColor(selectedID)
return '<font color="'+iconColor+'">'+ icon + "</font> " + selectedName
return '<font color="'+tgtColor+'">'+ tgtIcon + "</font> " + tgtName
}
return ""
if (root.isFolderType) return qsTr("No folder selected")
return qsTr("No labels selected")
}
@ -116,7 +108,7 @@ ComboBox {
color: root.enabled && !root.down ? Style.main.textBlue : root.contentItem.color
}
// Popup objects
// Popup row
delegate: Rectangle {
id: thisDelegate
@ -127,22 +119,15 @@ ComboBox {
color: isHovered ? root.popup.hoverColor : root.popup.backColor
property bool isSelected : {
var selected = root.selectedIDs.split(";")
for (var iSel in selected) {
var sel = selected[iSel]
if (folderId == sel){
return true
}
}
return false
}
property bool isSelected : isActive
property string folderName: name
property string folderIcon: gui.folderIcon(name,type)
property string folderColor: (type == gui.enums.folderTypeLabel || type == gui.enums.folderTypeFolder) ? iconColor : root.popup.textColor
Text {
id: targetIcon
text: gui.folderIcon(folderName,folderType)
color : folderType != gui.enums.folderTypeSystem ? folderColor : root.popup.textColor
text: thisDelegate.folderIcon
color : thisDelegate.folderColor
anchors {
verticalCenter: parent.verticalCenter
left: parent.left
@ -157,6 +142,7 @@ ComboBox {
Text {
id: targetName
anchors {
verticalCenter: parent.verticalCenter
left: targetIcon.right
@ -165,7 +151,7 @@ ComboBox {
rightMargin: Style.dialog.spacing
}
text: folderName
text: thisDelegate.folderName
color : root.popup.textColor
elide: Text.ElideRight
@ -209,16 +195,15 @@ ComboBox {
onClicked: {
//console.log(" click delegate")
if (root.isFolderType) { // don't update if selected
if (!thisDelegate.isSelected) {
root.importToFolder(folderId)
}
root.popup.close()
}
if (root.folderType==gui.enums.folderTypeLabel) {
if (thisDelegate.isSelected) {
structureExternal.removeTargetLabelID(sourceID,folderId)
if (!isActive) {
root.importToFolder(mboxID)
}
} else {
if (isActive) {
root.removeTargetLabel(mboxID)
} else {
structureExternal.addTargetLabelID(sourceID,folderId)
root.addTargetLabel(mboxID)
}
}
}
@ -295,14 +280,10 @@ ComboBox {
clip : true
anchors.fill : parent
model : root.targets
delegate : root.delegate
section.property : "sectionName"
section.delegate : Text{text: sectionName}
model : FilterStructure {
filterOnGroup : root.folderType
delegate : root.delegate
}
currentIndex: view.model.selectedIndex
}
}
@ -338,10 +319,7 @@ ComboBox {
onClicked : {
//console.log("click", addButton.text)
var newName = ""
if ( typeof folderName !== 'undefined' && !structurePM.hasFolderWithName (folderName) ) {
newName = folderName
}
var newName = name
winMain.popupFolderEdit.show(newName, "", "", root.folderType, sourceID)
root.popup.close()
}

View File

@ -210,7 +210,7 @@ Window {
Component.onCompleted : {
testgui.winMain.x = 150
testgui.winMain.x = 350
testgui.winMain.y = 100
}
@ -230,7 +230,7 @@ Window {
}
ListModel{
id: structureExternal
id: structureExternalOFF
property var globalOptions: JSON.parse('{ "folderId" : "global--uniq" , "folderName" : "" , "folderColor" : "" , "folderType" : "" , "folderEntries" : 0, "fromDate": 0, "toDate": 0, "isFolderSelected" : false , "targetFolderID": "14" , "targetLabelIDs": ";20;29" }')
@ -265,7 +265,7 @@ Window {
}
ListModel{
id: structurePM
id: structurePMOFF
// group selectors
property bool selectedLabels : false
@ -328,6 +328,7 @@ Window {
}
}
function setTypeSelected (model, folderType , toSelect ) {
console.log(" select type ", folderType, toSelect)
for (var i= -1; i<model.count; i++) {
@ -457,6 +458,355 @@ Window {
ListElement{ mailSubject : "Pop art is cool again" ; mailDate : "March 2 , 2019 12 : 00 : 22" ; inputFolder : "Archive" ; mailFrom : "me@me.me" ; errorMessage : "Something went wrong and import retry was not successful" ; }
ListElement{ mailSubject : "Check this cute kittens play volleyball on Copacabanana beach" ; mailDate : "March 2 , 2019 12 : 00 : 22" ; inputFolder : "Archive" ; mailFrom : "me@me.me" ; errorMessage : "Something went wrong and import retry was not successful" ; }
}
// Transfer rules
ListModel {
id: transferRules
property var targets : new Object();
// test data for import
property var importRules : JSON.parse('[
{"isActive" : true , "mboxID" : "src1" , "fromDate" : 0 , "toDate" : 0 , "targetIDs" : [ "0" , "label1" ] } ,
{"isActive" : true , "mboxID" : "src2" , "fromDate" : 0 , "toDate" : 0 , "targetIDs" : [ "6" , "label2" ] } ,
{"isActive" : true , "mboxID" : "src3" , "fromDate" : 350000 , "toDate" : 5000000 , "targetIDs" : [ "folder1" ] } ,
{"isActive" : true , "mboxID" : "src4" , "fromDate" : 0 , "toDate" : 0 , "targetIDs" : [ "folder2" , "label1" , "label2" ] }
]')
property var selectedForExport : [ "0", "7", "folder1", "folde2", "label1", "label2", "label3"]
property var extMailboxes: JSON.parse('{
"src1": {"name" : "Source Inbox" , "type" : "external" , "color" : "#000"} ,
"src2": {"name" : "Source Sent" , "type" : "external" , "color" : "#000"} ,
"src3": {"name" : "Source Folder" , "type" : "external" , "color" : "#000"} ,
"src4": {"name" : "Source Trash" , "type" : "external" , "color" : "#000"}
}')
property var pmMailboxes : JSON.parse('{
"0": {"name" : "Inbox" , "type" : "system" , "color" : "#000"} ,
"3": {"name" : "Draft" , "type" : "system" , "color" : "#000"} ,
"6": {"name" : "Archive" , "type" : "system" , "color" : "#000"} ,
"5": {"name" : "All Mail" , "type" : "system" , "color" : "#000"} ,
"3": {"name" : "Trash" , "type" : "system" , "color" : "#000"} ,
"7": {"name" : "Sent" , "type" : "system" , "color" : "#000"} ,
"4": {"name" : "Spam" , "type" : "system" , "color" : "#000"} ,
"folder1": {"name": "Folder 1", "type":"folder", "color":"#57c"},
"folder2": {"name": "Folder 2", "type":"folder", "color":"#5c7"},
"folder3": {"name": "Folder 3", "type":"folder", "color":"#c57"},
"label1": {"name": "Label 1", "type":"label", "color":"#a5a"},
"label2": {"name": "Label 2", "type":"label", "color":"#5aa"},
"label3": {"name": "Label 3", "type":"label", "color":"#aa5"}
}')
ListElement{isActive : true ; mboxID : "source1" ; name : "Source folder 1" ; iconColor : "#cccccc" ; type : "external" ; fromDate : 0 ; toDate : 0 ; labelColors : "red ; green ; blue"}
ListElement{isActive : false ; mboxID : "source2" ; name : "Source folder 2" ; iconColor : "#cccccc" ; type : "external" ; fromDate : 300000 ; toDate : 15000000 ; labelColors : "red ; green ; blue"}
ListElement{isActive : true ; mboxID : "source3" ; name : "Source folder 4" ; iconColor : "#cccccc" ; type : "external" ; fromDate : 0 ; toDate : 0 ; labelColors : "red ; green ; blue"}
// TransferRules INTERFACE
// TransferRules properties
property int globalFromDate : 0 // 45000
property int globalToDate : 0 // 120000
property bool isLabelGroupSelected : false
property bool isFolderGroupSelected : false
// TransferRules default getters
// func (*TransferRules) count() int
// func (*TransferRules) roleNames() map[int] QByteArray
// func (*TransferRules) data(index, role) *QVariant
//
// Expected roles for TransferRules
//
// isActive bool
// mboxID string // constant
// name string // constant
// type string // constant, expected values: "label", "folder", ""
// iconColor string // constant
// fromDate int64
// toDate int64
// labelColors string // list of hex RGB strings delimited by `;`
// TransferRules custom getters
function targetFolders(sourceID) {
//ListElement{isActive: true; mboxID: "target1"; name: "Target system folder"; type: "system"; iconColor:"red"}
return getTargets(sourceID, "folder")
}
function targetLabels(sourceID) {
//ListElement{isActive: false; mboxID: "target3"; name: "Target custom label 1"; type: "label"; iconColor:"green"}
return getTargets(sourceID, "label")
}
// For target drop down menu (labels and folders) we need
// additional model TargetList (QAbstractListModel).
//
// func (*TransferRules) targetFolders(sourceID string) * QAbstractListModel
//
// There is no setter functions for this list all actions are
// handled by TransferRules.
//
// The target models have therefore only data functions and one property as interface:
//
// TargetList properties:
// property int selectedIndex : -1
//
// TargetList default getters
// func (*TargetList) count() int
// func (*TargetList) roleNames() map[int] QByteArray
// func (*TargetList) data(index, role) *QVariant
//
// Expected roles for TargetList
//
// isActive bool
// mboxID string // constant
// name string // constant
// type string // constant, expected values: "label", "folder", ""
// iconColor string // constant
//
// The tricky part here is the QAbstractListModel implemetation: it
// needs to return all targets of certain type and their index.
// Setters
function setIsRuleActive(srcID, isActive){
console.log("setIsRuleActive", srcID, isActive)
var groupLabelsSelected = true
var groupFoldersSelected = true
for (var i = 0; i < transferRules.count; i++) {
var rule = transferRules.get(i)
if (rule.mboxID ==srcID) rule.isActive = isActive;
if (!rule.isActive && rule.type == "label") groupLabelsSelected = false
if (!rule.isActive && rule.type == "folder") groupFoldersSelected = false
}
transferRules.isLabelGroupSelected = groupLabelsSelected
transferRules.isFolderGroupSelected = groupFoldersSelected
}
function setIsGroupActive(groupName,isActive){
console.log("setIsGroupActive", groupName, isActive)
var groupLabelsSelected = true
var groupFoldersSelected = true
for (var i = 0; i < transferRules.count; i++) {
var rule = transferRules.get(i)
if (rule.type == groupName) rule.isActive = isActive;
if (!rule.isActive && rule.type == "label") groupLabelsSelected = false
if (!rule.isActive && rule.type == "folder") groupFoldersSelected = false
}
transferRules.isLabelGroupSelected = groupLabelsSelected
transferRules.isFolderGroupSelected = groupFoldersSelected
}
function setFromToDate(srcID, fromDate, toDate){
console.log("setFromToDate", srcID, fromDate, toDate)
for (var i = 0; i < transferRules.count; i++) {
var rule = transferRules.get(i)
if (rule.mboxID ==srcID) {
rule.fromDate = fromDate
rule.toDate = toDate
}
}
}
function addTargetID(srcID, targetID){
console.log("addTargetID", srcID, targetID)
changeTargetID(srcID, targetID, true)
}
function removeTargetID(srcID, targetID){
console.log("removeTargetID", srcID, targetID)
changeTargetID(srcID, targetID, false)
}
// MOCK METHODS: NOT PART OF INTERFACE
Component.onCompleted: prepareImport()
// Fill model with import rules
function prepareImport() {
console.log(" ==== Prepare IMPORT ==== ")
console.trace()
transferRules.clear()
for (var ruleI in transferRules.importRules) {
var rule = transferRules.importRules[ruleI]
var src = transferRules.extMailboxes[rule.mboxID];
var labelColors = [];
for (var tid in rule.targetIDs) {
var targetID = rule.targetIDs[tid]
if (pmMailboxes[targetID].type == "label") {
labelColors.push(pmMailboxes[targetID]["color"])
}
}
transferRules.append({
"isActive" : rule.isActive,
"mboxID" : rule.mboxID,
"name" : src.name,
"type" : src.type,
"iconColor" : src["color"],
"fromDate" : rule.fromDate,
"toDate" : rule.toDate,
"labelColors" : labelColors.join(";"),
});
}
}
// Fill model with export rules
function prepareExport() {
console.log(" ==== Prepare EXPORT ==== ")
console.trace()
transferRules.clear()
var groupLabelsSelected = true
var groupFoldersSelected = true
for (var srcID in transferRules.pmMailboxes) {
var src = transferRules.pmMailboxes[srcID]
var isActive = transferRules.selectedForExport.find(function(mboxID){return mboxID == srcID}) !== undefined
transferRules.append({
"isActive" : isActive,
"mboxID" : srcID,
"name" : src.name,
"type" : (src.type == "system" ? "" : src["type"]),
"iconColor" : src["color"],
"fromDate" : 0,
"toDate" : 0,
"labelColors" : src["color"]
});
if (!isActive) {
if (src.type == "label") {
groupLabelsSelected = false
}
if (src.type == "folder") {
groupFoldersSelected = false
}
}
}
transferRules.isLabelGroupSelected = groupLabelsSelected
transferRules.isFolderGroupSelected = groupFoldersSelected
}
function getTargets(sourceID, type) {
console.log("get targets:", type, sourceID)
if (! (type+sourceID in transferRules.targets)){
var source;
for (var srcI in transferRules.importRules) {
source = transferRules.importRules[srcI]
if (source.mboxID == sourceID ) {
break
}
}
var model = Qt.createQmlObject ('import QtQuick 2.3; ListModel { property int selectedIndex: -1; }', transferRules);
var i = -1
for (var tgtID in transferRules.pmMailboxes) {
var tgt = transferRules.pmMailboxes[tgtID]
if (type == "label" && tgt.type != "label") continue
if (type != "label" && tgt.type == "label") continue
i++;
var isActive = false
for (var tid in source.targetIDs ) {
var selectedID = source.targetIDs[tid]
if (selectedID == tgtID) {
isActive = true
model.selectedIndex=i
break
}
}
var row = {
"isActive" : isActive,
"mboxID" : tgtID,
"name" : tgt.name,
"type" : tgt.type,
"iconColor" : tgt["color"]
};
model.append (row) ;
}
transferRules.targets[type+sourceID] = model;
}
return transferRules.targets[type+sourceID];
}
function changeTargetID(srcID, targetID, add){
console.log("change target ID ", srcID, targetID, add)
for (var targetsName in transferRules.targets) {
var targets = transferRules.targets[targetsName]
var areFolders = targetsName == "folder"+srcID
var areLabels = targetsName == "label"+srcID
if (areFolders || areLabels) {
console.log("matched targets ", targetsName, targets)
var deactivateOthers = false
var colorList = []
for (var i =0; i<targets.count; i++) {
var tgt = targets.get(i)
console.log(" tgt", i, tgt.mboxID, tgt.isActive)
if (tgt.mboxID == targetID) {
console.log(" matched tgt", i, tgt.mboxID)
if (areFolders && !add) {
console.exception("WRONG LOGIC: removing folder")
}
if (add) {
targets.selectedIndex=i
}
tgt.isActive = add
deactivateOthers = add && areFolders
console.log(" active ", tgt.isActive)
}
if (areLabels && tgt.isActive) {
colorList.push(tgt.iconColor)
console.log(" colors", i, colorList)
}
}
if (areLabels) {
if (colorList.length == 0){
targets.selectedIndex = -1
}
for (var i = 0; i<transferRules.count; i++) {
var rule = transferRules.get(i)
console.log (" are labels: color list", i, rule.mboxID )
if (rule.mboxID == srcID) {
rule.labelColors = colorList.join(";")
console.log("updated label color list", rule.labelColors)
break
}
}
}
if (deactivateOthers) {
for (var i =0; i<targets.count; i++) {
var tgt = targets.get(i)
if (tgt.mboxID != targetID) {
tgt.isActive = false
console.log(" deactivate ", tgt.mboxID, tgt.isActive)
}
}
}
}
}
}
}
}
@ -497,6 +847,14 @@ Window {
signal toggleMainWin(int systX, int systY, int systW, int systH)
signal notifyHasNoKeychain()
signal notifyKeychainRebuild()
signal notifyAddressChangedLogout()
signal notifyAddressChanged()
signal notifyUpdate()
signal showWindow()
signal showHelp()
signal showQuit()
@ -692,8 +1050,8 @@ Window {
go.animateProgressBar.resume()
}
function cancelProcess(clearUnfinished) {
console.log("stopped at ", go.progress, " clearing unfinished", clearUnfinished)
function cancelProcess() {
console.log("stopped at ", go.progress)
go.animateProgressBar.stop()
}
@ -718,6 +1076,7 @@ Window {
break;
case "loadStructureForExport" :
transferRules.prepareExport()
go.exportStructureLoadFinished(true)
break;

View File

@ -43,10 +43,10 @@ const (
// Constants for data map
const (
// Account info
Account = int(core.Qt__UserRole) + 1<<iota
Status
Password
Aliases
Account = int(core.Qt__UserRole) + 1 + iota // 256 + 1 = 257
Status // 258
Password // 259
Aliases // ...
IsExpanded
// Folder info
FolderId
@ -65,4 +65,56 @@ const (
MailFrom
InputFolder
ErrorMessage
// Transfer rules mbox
MboxSelectedIndex
MboxIsActive
MboxID
MboxName
MboxType
MboxColor
// Transfer Rules
RuleTargetLabelColors
RuleFromDate
RuleToDate
)
const (
// This should match enums in GuiIE.qml
errUnknownError = 0
errEventAPILogout = 1
errUpdateAPI = 2
errUpdateJSON = 3
errUserAuth = 4
errQApplication = 18
errEmailExportFailed = 6
errEmailExportMissing = 7
errNothingToImport = 8
errEmailImportFailed = 12
errDraftImportFailed = 13
errDraftLabelFailed = 14
errEncryptMessageAttachment = 15
errEncryptMessage = 16
errNoInternetWhileImport = 17
errUnlockUser = 5
errSourceMessageNotSelected = 19
errCannotParseMail = 5000
errWrongLoginOrPassword = 5001
errWrongServerPathOrPort = 5002
errWrongAuthMethod = 5003
errIMAPFetchFailed = 5004
errLocalSourceLoadFailed = 1000
errPMLoadFailed = 1001
errRemoteSourceLoadFailed = 1002
errLoadAccountList = 1005
errExit = 1006
errRetry = 1007
errAsk = 1008
errImportFailed = 1009
errCreateLabelFailed = 1010
errCreateFolderFailed = 1011
errUpdateLabelFailed = 1012
errUpdateFolderFailed = 1013
errFillFolderName = 1014
errSelectFolderColor = 1015
errNoInternet = 1016
)

View File

@ -21,14 +21,10 @@ package qtie
import (
qtcommon "github.com/ProtonMail/proton-bridge/internal/frontend/qt-common"
"github.com/ProtonMail/proton-bridge/internal/transfer"
"github.com/therecipe/qt/core"
)
// ErrorDetail stores information about email and error
type ErrorDetail struct {
MailSubject, MailDate, MailFrom, InputFolder, ErrorMessage string
}
func init() {
ErrorListModel_QRegisterMetaType()
}
@ -42,11 +38,12 @@ type ErrorListModel struct {
_ map[int]*core.QByteArray `property:"roles"`
_ int `property:"count"`
Details []*ErrorDetail
Progress *transfer.Progress
records []*transfer.MessageStatus
}
func (s *ErrorListModel) init() {
s.SetRoles(map[int]*core.QByteArray{
func (e *ErrorListModel) init() {
e.SetRoles(map[int]*core.QByteArray{
MailSubject: qtcommon.NewQByteArrayFromString("mailSubject"),
MailDate: qtcommon.NewQByteArrayFromString("mailDate"),
MailFrom: qtcommon.NewQByteArrayFromString("mailFrom"),
@ -54,76 +51,50 @@ func (s *ErrorListModel) init() {
ErrorMessage: qtcommon.NewQByteArrayFromString("errorMessage"),
})
// basic QAbstractListModel mehods
s.ConnectData(s.data)
s.ConnectRowCount(s.rowCount)
s.ConnectColumnCount(s.columnCount)
s.ConnectRoleNames(s.roleNames)
e.ConnectData(e.data)
e.ConnectRowCount(e.rowCount)
e.ConnectColumnCount(e.columnCount)
e.ConnectRoleNames(e.roleNames)
}
func (s *ErrorListModel) data(index *core.QModelIndex, role int) *core.QVariant {
func (e *ErrorListModel) data(index *core.QModelIndex, role int) *core.QVariant {
if !index.IsValid() {
return core.NewQVariant()
}
if index.Row() >= len(s.Details) {
if index.Row() >= len(e.records) {
return core.NewQVariant()
}
var p = s.Details[index.Row()]
var r = e.records[index.Row()]
switch role {
case MailSubject:
return qtcommon.NewQVariantString(p.MailSubject)
return qtcommon.NewQVariantString(r.Subject)
case MailDate:
return qtcommon.NewQVariantString(p.MailDate)
return qtcommon.NewQVariantString(r.Time.String())
case MailFrom:
return qtcommon.NewQVariantString(p.MailFrom)
return qtcommon.NewQVariantString(r.From)
case InputFolder:
return qtcommon.NewQVariantString(p.InputFolder)
return qtcommon.NewQVariantString(r.SourceID)
case ErrorMessage:
return qtcommon.NewQVariantString(p.ErrorMessage)
return qtcommon.NewQVariantString(r.GetErrorMessage())
default:
return core.NewQVariant()
}
}
func (s *ErrorListModel) rowCount(parent *core.QModelIndex) int { return len(s.Details) }
func (s *ErrorListModel) columnCount(parent *core.QModelIndex) int { return 1 }
func (s *ErrorListModel) roleNames() map[int]*core.QByteArray { return s.Roles() }
func (e *ErrorListModel) rowCount(parent *core.QModelIndex) int { return len(e.records) }
func (e *ErrorListModel) columnCount(parent *core.QModelIndex) int { return 1 }
func (e *ErrorListModel) roleNames() map[int]*core.QByteArray { return e.Roles() }
// Add more errors to list
func (s *ErrorListModel) Add(more []*ErrorDetail) {
s.BeginInsertRows(core.NewQModelIndex(), len(s.Details), len(s.Details))
s.Details = append(s.Details, more...)
s.SetCount(len(s.Details))
s.EndInsertRows()
}
func (e *ErrorListModel) load() {
if e.Progress == nil {
log.Error("Progress not connected")
return
}
// Clear removes all items in model
func (s *ErrorListModel) Clear() {
s.BeginRemoveRows(core.NewQModelIndex(), 0, len(s.Details))
s.Details = s.Details[0:0]
s.SetCount(len(s.Details))
s.EndRemoveRows()
}
func (s *ErrorListModel) load(importLogFileName string) {
/*
err := backend.LoopDetailsInFile(importLogFileName, func(d *backend.MessageDetails) {
if d.MessageID != "" { // imported ok
return
}
ed := &ErrorDetail{
MailSubject: d.Subject,
MailDate: d.Time,
MailFrom: d.From,
InputFolder: d.Folder,
ErrorMessage: d.Error,
}
s.Add([]*ErrorDetail{ed})
})
if err != nil {
log.Errorf("load import report from %q: %v", importLogFileName, err)
}
*/
e.BeginResetModel()
e.records = e.Progress.GetFailedMessages()
e.EndResetModel()
}

View File

@ -21,6 +21,7 @@ package qtie
import (
"github.com/ProtonMail/proton-bridge/internal/transfer"
"github.com/pkg/errors"
)
const (
@ -29,10 +30,11 @@ const (
)
func (f *FrontendQt) LoadStructureForExport(addressOrID string) {
errCode := errUnknownError
var err error
defer func() {
if err != nil {
f.showError(err)
f.showError(errCode, errors.Wrap(err, "failed to load structure for "+addressOrID))
f.Qml.ExportStructureLoadFinished(false)
} else {
f.Qml.ExportStructureLoadFinished(true)
@ -40,20 +42,12 @@ func (f *FrontendQt) LoadStructureForExport(addressOrID string) {
}()
if f.transfer, err = f.ie.GetEMLExporter(addressOrID, ""); err != nil {
// The only error can be problem to load PM user and address.
errCode = errPMLoadFailed
return
}
f.PMStructure.Clear()
sourceMailboxes, err := f.transfer.SourceMailboxes()
if err != nil {
return
}
for _, mbox := range sourceMailboxes {
rule := f.transfer.GetRule(mbox)
f.PMStructure.addEntry(newFolderInfo(mbox, rule))
}
f.PMStructure.transfer = f.transfer
f.TransferRules.setTransfer(f.transfer)
}
func (f *FrontendQt) StartExport(rootPath, login, fileType string, attachEncryptedBody bool) {

View File

@ -65,11 +65,11 @@ type FrontendQt struct {
programVersion string // Program version
buildVersion string // Program build version
PMStructure *FolderStructure // Providing data for account labels and folders for ProtonMail account
ExternalStructure *FolderStructure // Providing data for account labels and folders for MBOX, EML or external IMAP account
ErrorList *ErrorListModel // Providing data for error reporting
TransferRules *TransferRules
ErrorList *ErrorListModel // Providing data for error reporting
transfer *transfer.Transfer
progress *transfer.Progress
notifyHasNoKeychain bool
}
@ -103,102 +103,99 @@ func New(
}
// IsAppRestarting for Import-Export is always false i.e never restarts
func (s *FrontendQt) IsAppRestarting() bool {
func (f *FrontendQt) IsAppRestarting() bool {
return false
}
// Loop function for Import-Export interface. It runs QtExecute in main thread
// with no additional function.
func (s *FrontendQt) Loop(setupError error) (err error) {
func (f *FrontendQt) Loop(setupError error) (err error) {
if setupError != nil {
s.notifyHasNoKeychain = true
f.notifyHasNoKeychain = true
}
go func() {
defer s.panicHandler.HandlePanic()
s.watchEvents()
defer f.panicHandler.HandlePanic()
f.watchEvents()
}()
err = s.QtExecute(func(s *FrontendQt) error { return nil })
err = f.QtExecute(func(f *FrontendQt) error { return nil })
return err
}
func (s *FrontendQt) watchEvents() {
internetOffCh := qtcommon.MakeAndRegisterEvent(s.eventListener, events.InternetOffEvent)
internetOnCh := qtcommon.MakeAndRegisterEvent(s.eventListener, events.InternetOnEvent)
restartBridgeCh := qtcommon.MakeAndRegisterEvent(s.eventListener, events.RestartBridgeEvent)
addressChangedCh := qtcommon.MakeAndRegisterEvent(s.eventListener, events.AddressChangedEvent)
addressChangedLogoutCh := qtcommon.MakeAndRegisterEvent(s.eventListener, events.AddressChangedLogoutEvent)
logoutCh := qtcommon.MakeAndRegisterEvent(s.eventListener, events.LogoutEvent)
updateApplicationCh := qtcommon.MakeAndRegisterEvent(s.eventListener, events.UpgradeApplicationEvent)
newUserCh := qtcommon.MakeAndRegisterEvent(s.eventListener, events.UserRefreshEvent)
func (f *FrontendQt) watchEvents() {
internetOffCh := qtcommon.MakeAndRegisterEvent(f.eventListener, events.InternetOffEvent)
internetOnCh := qtcommon.MakeAndRegisterEvent(f.eventListener, events.InternetOnEvent)
restartBridgeCh := qtcommon.MakeAndRegisterEvent(f.eventListener, events.RestartBridgeEvent)
addressChangedCh := qtcommon.MakeAndRegisterEvent(f.eventListener, events.AddressChangedEvent)
addressChangedLogoutCh := qtcommon.MakeAndRegisterEvent(f.eventListener, events.AddressChangedLogoutEvent)
logoutCh := qtcommon.MakeAndRegisterEvent(f.eventListener, events.LogoutEvent)
updateApplicationCh := qtcommon.MakeAndRegisterEvent(f.eventListener, events.UpgradeApplicationEvent)
newUserCh := qtcommon.MakeAndRegisterEvent(f.eventListener, events.UserRefreshEvent)
for {
select {
case <-internetOffCh:
s.Qml.SetConnectionStatus(false)
f.Qml.SetConnectionStatus(false)
case <-internetOnCh:
s.Qml.SetConnectionStatus(true)
f.Qml.SetConnectionStatus(true)
case <-restartBridgeCh:
s.Qml.SetIsRestarting(true)
s.App.Quit()
f.Qml.SetIsRestarting(true)
f.App.Quit()
case address := <-addressChangedCh:
s.Qml.NotifyAddressChanged(address)
f.Qml.NotifyAddressChanged(address)
case address := <-addressChangedLogoutCh:
s.Qml.NotifyAddressChangedLogout(address)
f.Qml.NotifyAddressChangedLogout(address)
case userID := <-logoutCh:
user, err := s.ie.GetUser(userID)
user, err := f.ie.GetUser(userID)
if err != nil {
return
}
s.Qml.NotifyLogout(user.Username())
f.Qml.NotifyLogout(user.Username())
case <-updateApplicationCh:
s.Qml.ProcessFinished()
s.Qml.NotifyUpdate()
f.Qml.ProcessFinished()
f.Qml.NotifyUpdate()
case <-newUserCh:
s.Qml.LoadAccounts()
f.Qml.LoadAccounts()
}
}
}
func (s *FrontendQt) qtSetupQmlAndStructures() {
s.App = widgets.NewQApplication(len(os.Args), os.Args)
func (f *FrontendQt) qtSetupQmlAndStructures() {
f.App = widgets.NewQApplication(len(os.Args), os.Args)
// view
s.View = qml.NewQQmlApplicationEngine(s.App)
f.View = qml.NewQQmlApplicationEngine(f.App)
// Add Go-QML Import-Export
s.Qml = NewGoQMLInterface(nil)
s.Qml.SetFrontend(s) // provides access
s.View.RootContext().SetContextProperty("go", s.Qml)
f.Qml = NewGoQMLInterface(nil)
f.Qml.SetFrontend(f) // provides access
f.View.RootContext().SetContextProperty("go", f.Qml)
// Add AccountsModel
s.Accounts.SetupAccounts(s.Qml, s.ie)
s.View.RootContext().SetContextProperty("accountsModel", s.Accounts.Model)
f.Accounts.SetupAccounts(f.Qml, f.ie)
f.View.RootContext().SetContextProperty("accountsModel", f.Accounts.Model)
// Add ProtonMail FolderStructure
s.PMStructure = NewFolderStructure(nil)
s.View.RootContext().SetContextProperty("structurePM", s.PMStructure)
// Add external FolderStructure
s.ExternalStructure = NewFolderStructure(nil)
s.View.RootContext().SetContextProperty("structureExternal", s.ExternalStructure)
// Add TransferRules structure
f.TransferRules = NewTransferRules(nil)
f.View.RootContext().SetContextProperty("transferRules", f.TransferRules)
// Add error list modal
s.ErrorList = NewErrorListModel(nil)
s.View.RootContext().SetContextProperty("errorList", s.ErrorList)
s.Qml.ConnectLoadImportReports(s.ErrorList.load)
f.ErrorList = NewErrorListModel(nil)
f.View.RootContext().SetContextProperty("errorList", f.ErrorList)
f.Qml.ConnectLoadImportReports(f.ErrorList.load)
// Import path and load QML files
s.View.AddImportPath("qrc:///")
s.View.Load(core.NewQUrl3("qrc:/uiie.qml", 0))
f.View.AddImportPath("qrc:///")
f.View.Load(core.NewQUrl3("qrc:/uiie.qml", 0))
// TODO set the first start flag
log.Error("Get FirstStart: Not implemented")
//if prefs.Get(prefs.FirstStart) == "true" {
if false {
s.Qml.SetIsFirstStart(true)
f.Qml.SetIsFirstStart(true)
} else {
s.Qml.SetIsFirstStart(false)
f.Qml.SetIsFirstStart(false)
}
// Notify user about error during initialization.
if s.notifyHasNoKeychain {
s.Qml.NotifyHasNoKeychain()
if f.notifyHasNoKeychain {
f.Qml.NotifyHasNoKeychain()
}
}
@ -207,18 +204,18 @@ func (s *FrontendQt) qtSetupQmlAndStructures() {
// It is needed to have just one Qt application per program (at least per same
// thread). This functions reads the main user interface defined in QML files.
// The files are appended to library by Qt-QRC.
func (s *FrontendQt) QtExecute(Procedure func(*FrontendQt) error) error {
qtcommon.QtSetupCoreAndControls(s.programName, s.programVersion)
s.qtSetupQmlAndStructures()
func (f *FrontendQt) QtExecute(Procedure func(*FrontendQt) error) error {
qtcommon.QtSetupCoreAndControls(f.programName, f.programVersion)
f.qtSetupQmlAndStructures()
// Check QML is loaded properly
if len(s.View.RootObjects()) == 0 {
if len(f.View.RootObjects()) == 0 {
//return errors.New(errors.ErrQApplication, "QML not loaded properly")
return errors.New("QML not loaded properly")
}
// Obtain main window (need for invoke method)
s.MainWin = s.View.RootObjects()[0]
f.MainWin = f.View.RootObjects()[0]
// Injected procedure for out-of-main-thread applications
if err := Procedure(s); err != nil {
if err := Procedure(f); err != nil {
return err
}
// Loop
@ -234,63 +231,55 @@ func (s *FrontendQt) QtExecute(Procedure func(*FrontendQt) error) error {
return nil
}
func (s *FrontendQt) openLogs() {
go open.Run(s.config.GetLogDir())
func (f *FrontendQt) openLogs() {
go open.Run(f.config.GetLogDir())
}
func (s *FrontendQt) openReport() {
go open.Run(s.Qml.ImportLogFileName())
func (f *FrontendQt) openReport() {
go open.Run(f.Qml.ImportLogFileName())
}
func (s *FrontendQt) openDownloadLink() {
go open.Run(s.updates.GetDownloadLink())
func (f *FrontendQt) openDownloadLink() {
go open.Run(f.updates.GetDownloadLink())
}
func (s *FrontendQt) sendImportReport(address, reportFile string) (isOK bool) {
/*
accname := "[No account logged in]"
if s.Accounts.Count() > 0 {
accname = s.Accounts.get(0).Account()
}
basename := filepath.Base(reportFile)
req := pmapi.ReportReq{
OS: core.QSysInfo_ProductType(),
OSVersion: core.QSysInfo_PrettyProductName(),
Title: "[Import Export] Import report: " + basename,
Description: "Sending import report file in attachment.",
Username: accname,
Email: address,
}
report, err := os.Open(reportFile)
if err != nil {
log.Errorln("report file open:", err)
isOK = false
}
req.AddAttachment("log", basename, report)
c := pmapi.NewClient(backend.APIConfig, "import_reporter")
err = c.Report(req)
if err != nil {
log.Errorln("while sendReport:", err)
isOK = false
return
}
log.Infof("Report %q send successfully", basename)
isOK = true
*/
return false
}
// sendBug is almost idetical to bridge
func (s *FrontendQt) sendBug(description, emailClient, address string) (isOK bool) {
isOK = true
// sendImportReport sends an anonymized import or export report file to our customer support
func (f *FrontendQt) sendImportReport(address string) bool { // Todo_: Rename to sendReport?
var accname = "No account logged in"
if s.Accounts.Model.Count() > 0 {
accname = s.Accounts.Model.Get(0).Account()
if f.Accounts.Model.Count() > 0 {
accname = f.Accounts.Model.Get(0).Account()
}
if err := s.ie.ReportBug(
if f.progress == nil {
log.Errorln("Failed to send process report: Missing progress")
return false
}
report := f.progress.GenerateBugReport()
if err := f.ie.ReportFile(
core.QSysInfo_ProductType(),
core.QSysInfo_PrettyProductName(),
accname,
address,
report,
); err != nil {
log.Errorln("Failed to send process report:", err)
return false
}
log.Info("Report send successfully")
return true
}
// sendBug sends a bug report described by user to our customer support
func (f *FrontendQt) sendBug(description, emailClient, address string) bool {
var accname = "No account logged in"
if f.Accounts.Model.Count() > 0 {
accname = f.Accounts.Model.Get(0).Account()
}
if err := f.ie.ReportBug(
core.QSysInfo_ProductType(),
core.QSysInfo_PrettyProductName(),
description,
@ -299,41 +288,43 @@ func (s *FrontendQt) sendBug(description, emailClient, address string) (isOK boo
emailClient,
); err != nil {
log.Errorln("while sendBug:", err)
isOK = false
return false
}
return
return true
}
// checkInternet is almost idetical to bridge
func (s *FrontendQt) checkInternet() {
s.Qml.SetConnectionStatus(s.ie.CheckConnection() == nil)
func (f *FrontendQt) checkInternet() {
f.Qml.SetConnectionStatus(f.ie.CheckConnection() == nil)
}
func (s *FrontendQt) showError(err error) {
code := 0 // TODO err.Code()
s.Qml.SetErrorDescription(err.Error())
func (f *FrontendQt) showError(code int, err error) {
f.Qml.SetErrorDescription(err.Error())
log.WithField("code", code).Errorln(err.Error())
s.Qml.NotifyError(code)
f.Qml.NotifyError(code)
}
func (s *FrontendQt) emitEvent(evType, msg string) {
s.eventListener.Emit(evType, msg)
func (f *FrontendQt) emitEvent(evType, msg string) {
f.eventListener.Emit(evType, msg)
}
func (s *FrontendQt) setProgressManager(progress *transfer.Progress) {
s.Qml.ConnectPauseProcess(func() { progress.Pause("user") })
s.Qml.ConnectResumeProcess(progress.Resume)
s.Qml.ConnectCancelProcess(func(clearUnfinished bool) {
// TODO clear unfinished
func (f *FrontendQt) setProgressManager(progress *transfer.Progress) {
f.progress = progress
f.ErrorList.Progress = progress
f.Qml.ConnectPauseProcess(func() { progress.Pause("paused") })
f.Qml.ConnectResumeProcess(progress.Resume)
f.Qml.ConnectCancelProcess(func() {
progress.Stop()
})
go func() {
defer func() {
s.Qml.DisconnectPauseProcess()
s.Qml.DisconnectResumeProcess()
s.Qml.DisconnectCancelProcess()
s.Qml.SetProgress(1)
f.Qml.DisconnectPauseProcess()
f.Qml.DisconnectResumeProcess()
f.Qml.DisconnectCancelProcess()
f.Qml.SetProgress(1)
}()
//TODO get log file (in old code it was here, but this is ugly place probably somewhere else)
@ -344,119 +335,123 @@ func (s *FrontendQt) setProgressManager(progress *transfer.Progress) {
}
failed, imported, _, _, total := progress.GetCounts()
if total != 0 { // udate total
s.Qml.SetTotal(int(total))
f.Qml.SetTotal(int(total))
}
s.Qml.SetProgressFails(int(failed))
s.Qml.SetProgressDescription(progress.PauseReason()) // TODO add description when changing folders?
f.Qml.SetProgressFails(int(failed))
f.Qml.SetProgressDescription(progress.PauseReason()) // TODO add description when changing folders?
if total > 0 {
newProgress := float32(imported+failed) / float32(total)
if newProgress >= 0 && newProgress != s.Qml.Progress() {
s.Qml.SetProgress(newProgress)
s.Qml.ProgressChanged(newProgress)
if newProgress >= 0 && newProgress != f.Qml.Progress() {
f.Qml.SetProgress(newProgress)
f.Qml.ProgressChanged(newProgress)
}
}
}
// TODO fatal error?
if err := progress.GetFatalError(); err != nil {
f.Qml.SetProgressDescription(err.Error())
} else {
f.Qml.SetProgressDescription("")
}
}()
}
// StartUpdate is identical to bridge
func (s *FrontendQt) StartUpdate() {
func (f *FrontendQt) StartUpdate() {
progress := make(chan updates.Progress)
go func() { // Update progress in QML.
defer s.panicHandler.HandlePanic()
defer f.panicHandler.HandlePanic()
for current := range progress {
s.Qml.SetProgress(current.Processed)
s.Qml.SetProgressDescription(strconv.Itoa(current.Description))
f.Qml.SetProgress(current.Processed)
f.Qml.SetProgressDescription(strconv.Itoa(current.Description))
// Error happend
if current.Err != nil {
log.Error("update progress: ", current.Err)
s.Qml.UpdateFinished(true)
f.Qml.UpdateFinished(true)
return
}
// Finished everything OK.
if current.Description >= updates.InfoQuitApp {
s.Qml.UpdateFinished(false)
f.Qml.UpdateFinished(false)
time.Sleep(3 * time.Second) // Just notify.
s.Qml.SetIsRestarting(current.Description == updates.InfoRestartApp)
s.App.Quit()
f.Qml.SetIsRestarting(current.Description == updates.InfoRestartApp)
f.App.Quit()
return
}
}
}()
go func() {
defer s.panicHandler.HandlePanic()
s.updates.StartUpgrade(progress)
defer f.panicHandler.HandlePanic()
f.updates.StartUpgrade(progress)
}()
}
// isNewVersionAvailable is identical to bridge
// return 0 when local version is fine
// return 1 when new version is available
func (s *FrontendQt) isNewVersionAvailable(showMessage bool) {
func (f *FrontendQt) isNewVersionAvailable(showMessage bool) {
go func() {
defer s.Qml.ProcessFinished()
isUpToDate, latestVersionInfo, err := s.updates.CheckIsUpToDate()
defer f.Qml.ProcessFinished()
isUpToDate, latestVersionInfo, err := f.updates.CheckIsUpToDate()
if err != nil {
log.Warnln("Cannot retrieve version info: ", err)
s.checkInternet()
f.checkInternet()
return
}
s.Qml.SetConnectionStatus(true) // if we are here connection is ok
f.Qml.SetConnectionStatus(true) // if we are here connection is ok
if isUpToDate {
s.Qml.SetUpdateState(StatusUpToDate)
f.Qml.SetUpdateState(StatusUpToDate)
if showMessage {
s.Qml.NotifyVersionIsTheLatest()
f.Qml.NotifyVersionIsTheLatest()
}
return
}
s.Qml.SetNewversion(latestVersionInfo.Version)
s.Qml.SetChangelog(latestVersionInfo.ReleaseNotes)
s.Qml.SetBugfixes(latestVersionInfo.ReleaseFixedBugs)
s.Qml.SetLandingPage(latestVersionInfo.LandingPage)
s.Qml.SetDownloadLink(latestVersionInfo.GetDownloadLink())
s.Qml.SetUpdateState(StatusNewVersionAvailable)
f.Qml.SetNewversion(latestVersionInfo.Version)
f.Qml.SetChangelog(latestVersionInfo.ReleaseNotes)
f.Qml.SetBugfixes(latestVersionInfo.ReleaseFixedBugs)
f.Qml.SetLandingPage(latestVersionInfo.LandingPage)
f.Qml.SetDownloadLink(latestVersionInfo.GetDownloadLink())
f.Qml.SetUpdateState(StatusNewVersionAvailable)
}()
}
func (s *FrontendQt) resetSource() {
if s.transfer != nil {
s.transfer.ResetRules()
if err := s.loadStructuresForImport(); err != nil {
func (f *FrontendQt) resetSource() {
if f.transfer != nil {
f.transfer.ResetRules()
if err := f.loadStructuresForImport(); err != nil {
log.WithError(err).Error("Cannot reload structures after reseting rules.")
}
}
}
// getLocalVersionInfo is identical to bridge.
func (s *FrontendQt) getLocalVersionInfo() {
defer s.Qml.ProcessFinished()
localVersion := s.updates.GetLocalVersion()
s.Qml.SetNewversion(localVersion.Version)
s.Qml.SetChangelog(localVersion.ReleaseNotes)
s.Qml.SetBugfixes(localVersion.ReleaseFixedBugs)
func (f *FrontendQt) getLocalVersionInfo() {
defer f.Qml.ProcessFinished()
localVersion := f.updates.GetLocalVersion()
f.Qml.SetNewversion(localVersion.Version)
f.Qml.SetChangelog(localVersion.ReleaseNotes)
f.Qml.SetBugfixes(localVersion.ReleaseFixedBugs)
}
// LeastUsedColor is intended to return color for creating a new inbox or label.
func (s *FrontendQt) leastUsedColor() string {
if s.transfer == nil {
func (f *FrontendQt) leastUsedColor() string {
if f.transfer == nil {
log.Errorln("Getting least used color before transfer exist.")
return "#7272a7"
}
m, err := s.transfer.TargetMailboxes()
m, err := f.transfer.TargetMailboxes()
if err != nil {
log.Errorln("Getting least used color:", err)
s.showError(err)
f.showError(errUnknownError, err)
}
return transfer.LeastUsedColor(m)
}
// createLabelOrFolder performs an IE target mailbox creation.
func (s *FrontendQt) createLabelOrFolder(email, name, color string, isLabel bool, sourceID string) bool {
func (f *FrontendQt) createLabelOrFolder(email, name, color string, isLabel bool, sourceID string) bool {
// Prepare new mailbox.
m := transfer.Mailbox{
Name: name,
@ -466,32 +461,28 @@ func (s *FrontendQt) createLabelOrFolder(email, name, color string, isLabel bool
// Select least used color if no color given.
if m.Color == "" {
m.Color = s.leastUsedColor()
m.Color = f.leastUsedColor()
}
f.TransferRules.BeginResetModel()
defer f.TransferRules.EndResetModel()
// Create mailbox.
newLabel, err := s.transfer.CreateTargetMailbox(m)
m, err := f.transfer.CreateTargetMailbox(m)
if err != nil {
log.Errorln("Folder/Label creating:", err)
s.showError(err)
return false
}
// TODO: notify UI of newly added folders/labels
/*errc := s.PMStructure.Load(email, false)
if errc != nil {
s.showError(errc)
return false
}*/
if sourceID != "" {
if isLabel {
s.ExternalStructure.addTargetLabelID(sourceID, newLabel.ID)
f.showError(errCreateLabelFailed, err)
} else {
s.ExternalStructure.setTargetFolderID(sourceID, newLabel.ID)
f.showError(errCreateFolderFailed, err)
}
return false
}
if sourceID == "-1" {
f.transfer.SetGlobalMailbox(&m)
} else {
f.TransferRules.addTargetID(sourceID, m.Hash())
}
return true
}

View File

@ -19,14 +19,19 @@
package qtie
import "github.com/ProtonMail/proton-bridge/internal/transfer"
import (
"github.com/pkg/errors"
"github.com/ProtonMail/proton-bridge/internal/transfer"
)
// wrapper for QML
func (f *FrontendQt) setupAndLoadForImport(isFromIMAP bool, sourcePath, sourceEmail, sourcePassword, sourceServer, sourcePort, targetAddress string) {
errCode := errUnknownError
var err error
defer func() {
if err != nil {
f.showError(err)
f.showError(errCode, err)
f.Qml.ImportStructuresLoadFinished(false)
} else {
f.Qml.ImportStructuresLoadFinished(true)
@ -36,11 +41,23 @@ func (f *FrontendQt) setupAndLoadForImport(isFromIMAP bool, sourcePath, sourceEm
if isFromIMAP {
f.transfer, err = f.ie.GetRemoteImporter(targetAddress, sourceEmail, sourcePassword, sourceServer, sourcePort)
if err != nil {
switch {
case errors.Is(err, &transfer.ErrIMAPConnection{}):
errCode = errWrongServerPathOrPort
case errors.Is(err, &transfer.ErrIMAPAuth{}):
errCode = errWrongLoginOrPassword
case errors.Is(err, &transfer.ErrIMAPAuthMethod{}):
errCode = errWrongAuthMethod
default:
errCode = errRemoteSourceLoadFailed
}
return
}
} else {
f.transfer, err = f.ie.GetLocalImporter(targetAddress, sourcePath)
if err != nil {
// The only error can be problem to load PM user and address.
errCode = errPMLoadFailed
return
}
}
@ -51,27 +68,7 @@ func (f *FrontendQt) setupAndLoadForImport(isFromIMAP bool, sourcePath, sourceEm
}
func (f *FrontendQt) loadStructuresForImport() error {
f.PMStructure.Clear()
targetMboxes, err := f.transfer.TargetMailboxes()
if err != nil {
return err
}
for _, mbox := range targetMboxes {
rule := &transfer.Rule{}
f.PMStructure.addEntry(newFolderInfo(mbox, rule))
}
f.ExternalStructure.Clear()
sourceMboxes, err := f.transfer.SourceMailboxes()
if err != nil {
return err
}
for _, mbox := range sourceMboxes {
rule := f.transfer.GetRule(mbox)
f.ExternalStructure.addEntry(newFolderInfo(mbox, rule))
}
f.ExternalStructure.transfer = f.transfer
f.TransferRules.setTransfer(f.transfer)
return nil
}
@ -82,8 +79,9 @@ func (f *FrontendQt) StartImport(email string) { // TODO email not needed
f.Qml.SetProgress(0.0)
f.Qml.SetTotal(1)
f.Qml.SetImportLogFileName("")
f.ErrorList.Clear()
progress := f.transfer.Start()
f.Qml.SetImportLogFileName(progress.FileReport())
f.setProgressManager(progress)
}

View File

@ -0,0 +1,188 @@
// Copyright (c) 2020 Proton Technologies AG
//
// This file is part of ProtonMail Bridge.
//
// ProtonMail Bridge is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ProtonMail Bridge is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with ProtonMail Bridge. If not, see <https://www.gnu.org/licenses/>.
// +build !nogui
package qtie
import (
qtcommon "github.com/ProtonMail/proton-bridge/internal/frontend/qt-common"
"github.com/ProtonMail/proton-bridge/internal/transfer"
"github.com/sirupsen/logrus"
"github.com/therecipe/qt/core"
)
// MboxList is an interface between QML and targets for given rule.
type MboxList struct {
core.QAbstractListModel
containsFolders bool // Provides only folders if true. On the other hand provides only labels if false
transfer *transfer.Transfer
rule *transfer.Rule
log *logrus.Entry
_ int `property:"selectedIndex"`
_ func() `constructor:"init"`
}
func init() {
// This is needed so the type exists in QML files.
MboxList_QRegisterMetaType()
}
func newMboxList(t *TransferRules, rule *transfer.Rule, containsFolders bool) *MboxList {
m := NewMboxList(t)
m.BeginResetModel()
m.transfer = t.transfer
m.rule = rule
m.containsFolders = containsFolders
m.log = log.
WithField("rule", m.rule.SourceMailbox.Hash()).
WithField("folders", m.containsFolders)
m.EndResetModel()
m.itemsChanged(rule)
return m
}
func (m *MboxList) init() {
m.ConnectRowCount(m.rowCount)
m.ConnectRoleNames(m.roleNames)
m.ConnectData(m.data)
}
func (m *MboxList) rowCount(index *core.QModelIndex) int {
return len(m.targetMailboxes())
}
func (m *MboxList) roleNames() map[int]*core.QByteArray {
m.log.
WithField("isActive", MboxIsActive).
WithField("id", MboxID).
WithField("color", MboxColor).
Debug("role names")
return map[int]*core.QByteArray{
MboxIsActive: qtcommon.NewQByteArrayFromString("isActive"),
MboxID: qtcommon.NewQByteArrayFromString("mboxID"),
MboxName: qtcommon.NewQByteArrayFromString("name"),
MboxType: qtcommon.NewQByteArrayFromString("type"),
MboxColor: qtcommon.NewQByteArrayFromString("iconColor"),
}
}
func (m *MboxList) data(index *core.QModelIndex, role int) *core.QVariant {
allTargets := m.targetMailboxes()
i, valid := index.Row(), index.IsValid()
l := m.log.WithField("row", i).WithField("role", role)
l.Trace("called data()")
if !valid || i >= len(allTargets) {
l.WithField("row", i).Warning("Invalid index")
return core.NewQVariant()
}
if m.transfer == nil {
l.Warning("Requested mbox list data before transfer is connected")
return qtcommon.NewQVariantString("")
}
mbox := allTargets[i]
switch role {
case MboxIsActive:
for _, selectedMailbox := range m.rule.TargetMailboxes {
if selectedMailbox.Hash() == mbox.Hash() {
return qtcommon.NewQVariantBool(true)
}
}
return qtcommon.NewQVariantBool(false)
case MboxID:
return qtcommon.NewQVariantString(mbox.Hash())
case MboxName, int(core.Qt__DisplayRole):
return qtcommon.NewQVariantString(mbox.Name)
case MboxType:
t := "label"
if mbox.IsExclusive {
t = "folder"
}
return qtcommon.NewQVariantString(t)
case MboxColor:
return qtcommon.NewQVariantString(mbox.Color)
default:
l.Error("Requested mbox list data with unknown role")
return qtcommon.NewQVariantString("")
}
}
func (m *MboxList) targetMailboxes() []transfer.Mailbox {
if m.transfer == nil {
m.log.Warning("Requested target mailboxes before transfer is connected")
}
mailboxes, err := m.transfer.TargetMailboxes()
if err != nil {
m.log.WithError(err).Error("Unable to get target mailboxes")
}
return m.filter(mailboxes)
}
func (m *MboxList) filter(mailboxes []transfer.Mailbox) (filtered []transfer.Mailbox) {
for _, mailbox := range mailboxes {
if mailbox.IsExclusive == m.containsFolders {
filtered = append(filtered, mailbox)
}
}
return
}
func (m *MboxList) itemsChanged(rule *transfer.Rule) {
m.rule = rule
allTargets := m.targetMailboxes()
l := m.log.WithField("count", len(allTargets))
l.Trace("called itemChanged()")
defer func() {
l.WithField("selected", m.SelectedIndex()).Trace("index updated")
}()
// NOTE: Be careful with indices: If they are invalid the DataChanged
// signal will not be sent to QML e.g. `end == rowCount - 1`
if len(allTargets) > 0 {
begin := m.Index(0, 0, core.NewQModelIndex())
end := m.Index(len(allTargets)-1, 0, core.NewQModelIndex())
changedRoles := []int{MboxIsActive}
m.DataChanged(begin, end, changedRoles)
}
for index, targetMailbox := range allTargets {
for _, selectedTarget := range m.rule.TargetMailboxes {
if targetMailbox.Hash() == selectedTarget.Hash() {
m.SetSelectedIndex(index)
return
}
}
}
m.SetSelectedIndex(-1)
}

View File

@ -0,0 +1,377 @@
// Copyright (c) 2020 Proton Technologies AG
//
// This file is part of ProtonMail Bridge.
//
// ProtonMail Bridge is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ProtonMail Bridge is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with ProtonMail Bridge. If not, see <https://www.gnu.org/licenses/>.
// +build !nogui
package qtie
import (
qtcommon "github.com/ProtonMail/proton-bridge/internal/frontend/qt-common"
"github.com/ProtonMail/proton-bridge/internal/transfer"
"github.com/therecipe/qt/core"
)
// TransferRules is an interface between QML and transfer.
type TransferRules struct {
core.QAbstractListModel
transfer *transfer.Transfer
targetFoldersCache map[string]*MboxList
targetLabelsCache map[string]*MboxList
_ func() `constructor:"init"`
_ func(sourceID string) *MboxList `slot:"targetFolders,auto"`
_ func(sourceID string) *MboxList `slot:"targetLabels,auto"`
_ func(sourceID string, isActive bool) `slot:"setIsRuleActive,auto"`
_ func(groupName string, isActive bool) `slot:"setIsGroupActive,auto"`
_ func(sourceID string, fromDate int64, toDate int64) `slot:"setFromToDate,auto"`
_ func(sourceID string, targetID string) `slot:"addTargetID,auto"`
_ func(sourceID string, targetID string) `slot:"removeTargetID,auto"`
_ int `property:"globalFromDate"`
_ int `property:"globalToDate"`
_ bool `property:"isLabelGroupSelected"`
_ bool `property:"isFolderGroupSelected"`
}
func init() {
// This is needed so the type exists in QML files.
TransferRules_QRegisterMetaType()
}
func (t *TransferRules) init() {
log.Trace("Initializing transfer rules")
t.targetFoldersCache = make(map[string]*MboxList)
t.targetLabelsCache = make(map[string]*MboxList)
t.SetGlobalFromDate(0)
t.SetGlobalToDate(0)
t.ConnectRowCount(t.rowCount)
t.ConnectRoleNames(t.roleNames)
t.ConnectData(t.data)
}
func (t *TransferRules) rowCount(index *core.QModelIndex) int {
if t.transfer == nil {
return 0
}
return len(t.transfer.GetRules())
}
func (t *TransferRules) roleNames() map[int]*core.QByteArray {
return map[int]*core.QByteArray{
MboxIsActive: qtcommon.NewQByteArrayFromString("isActive"),
MboxID: qtcommon.NewQByteArrayFromString("mboxID"),
MboxName: qtcommon.NewQByteArrayFromString("name"),
MboxType: qtcommon.NewQByteArrayFromString("type"),
MboxColor: qtcommon.NewQByteArrayFromString("iconColor"),
RuleTargetLabelColors: qtcommon.NewQByteArrayFromString("labelColors"),
RuleFromDate: qtcommon.NewQByteArrayFromString("fromDate"),
RuleToDate: qtcommon.NewQByteArrayFromString("toDate"),
}
}
func (t *TransferRules) data(index *core.QModelIndex, role int) *core.QVariant {
i, valid := index.Row(), index.IsValid()
if !valid || i >= t.rowCount(index) {
log.WithField("row", i).Warning("Invalid index")
return core.NewQVariant()
}
log := log.WithField("row", i).WithField("role", role)
if t.transfer == nil {
log.Warning("Requested transfer rules data before transfer is connected")
return qtcommon.NewQVariantString("")
}
rule := t.transfer.GetRules()[i]
switch role {
case MboxIsActive:
return qtcommon.NewQVariantBool(rule.Active)
case MboxID:
return qtcommon.NewQVariantString(rule.SourceMailbox.Hash())
case MboxName:
return qtcommon.NewQVariantString(rule.SourceMailbox.Name)
case MboxType:
if rule.SourceMailbox.IsSystemFolder() {
return qtcommon.NewQVariantString(FolderTypeSystem)
}
if rule.SourceMailbox.IsExclusive {
return qtcommon.NewQVariantString(FolderTypeFolder)
}
return qtcommon.NewQVariantString(FolderTypeLabel)
case MboxColor:
return qtcommon.NewQVariantString(rule.SourceMailbox.Color)
case RuleTargetLabelColors:
colors := ""
for _, m := range rule.TargetMailboxes {
if m.IsExclusive {
continue
}
if colors != "" {
colors += ";"
}
colors += m.Color
}
return qtcommon.NewQVariantString(colors)
case RuleFromDate:
return qtcommon.NewQVariantLong(rule.FromTime)
case RuleToDate:
return qtcommon.NewQVariantLong(rule.ToTime)
default:
log.Error("Requested transfer rules data with unknown role")
return qtcommon.NewQVariantString("")
}
}
func (t *TransferRules) setTransfer(transfer *transfer.Transfer) {
log.Debug("Setting transfer")
t.BeginResetModel()
defer t.EndResetModel()
t.transfer = transfer
t.updateGroupSelection()
}
// Getters
func (t *TransferRules) targetFolders(sourceID string) *MboxList {
rule := t.getRule(sourceID)
if rule == nil {
return nil
}
if t.targetFoldersCache[sourceID] == nil {
log.WithField("source", sourceID).Debug("New target folder")
t.targetFoldersCache[sourceID] = newMboxList(t, rule, true)
}
return t.targetFoldersCache[sourceID]
}
func (t *TransferRules) targetLabels(sourceID string) *MboxList {
rule := t.getRule(sourceID)
if rule == nil {
return nil
}
if t.targetLabelsCache[sourceID] == nil {
log.WithField("source", sourceID).Debug("New target label")
t.targetLabelsCache[sourceID] = newMboxList(t, rule, false)
}
return t.targetLabelsCache[sourceID]
}
// Setters
func (t *TransferRules) setIsGroupActive(groupName string, isActive bool) {
wantExclusive := (groupName == FolderTypeLabel)
for _, rule := range t.transfer.GetRules() {
if rule.SourceMailbox.IsExclusive != wantExclusive {
continue
}
if rule.SourceMailbox.IsSystemFolder() {
continue
}
if rule.Active != isActive {
t.setIsRuleActive(rule.SourceMailbox.Hash(), isActive)
}
}
}
func (t *TransferRules) setIsRuleActive(sourceID string, isActive bool) {
log.WithField("source", sourceID).WithField("active", isActive).Trace("Setting rule as active/inactive")
rule := t.getRule(sourceID)
if rule == nil {
return
}
if isActive {
t.setRule(rule.SourceMailbox, rule.TargetMailboxes, rule.FromTime, rule.ToTime, []int{MboxIsActive})
} else {
t.unsetRule(rule.SourceMailbox)
}
}
func (t *TransferRules) setFromToDate(sourceID string, fromTime int64, toTime int64) {
log.WithField("source", sourceID).WithField("fromTime", fromTime).WithField("toTime", toTime).Trace("Setting from and to dates")
if sourceID == "-1" {
t.transfer.SetGlobalTimeLimit(fromTime, toTime)
return
}
rule := t.getRule(sourceID)
if rule == nil {
return
}
t.setRule(rule.SourceMailbox, rule.TargetMailboxes, fromTime, toTime, []int{RuleFromDate, RuleToDate})
}
func (t *TransferRules) addTargetID(sourceID string, targetID string) {
log.WithField("source", sourceID).WithField("target", targetID).Trace("Adding target")
rule := t.getRule(sourceID)
if rule == nil {
return
}
targetMailboxToAdd := t.getMailbox(t.transfer.TargetMailboxes, targetID)
if targetMailboxToAdd == nil {
return
}
newTargetMailboxes := []transfer.Mailbox{}
found := false
for _, targetMailbox := range rule.TargetMailboxes {
if targetMailbox.Hash() == targetMailboxToAdd.Hash() {
found = true
}
if !targetMailboxToAdd.IsExclusive || (targetMailboxToAdd.IsExclusive && !targetMailbox.IsExclusive) {
newTargetMailboxes = append(newTargetMailboxes, targetMailbox)
}
}
if !found {
newTargetMailboxes = append(newTargetMailboxes, *targetMailboxToAdd)
}
t.setRule(rule.SourceMailbox, newTargetMailboxes, rule.FromTime, rule.ToTime, []int{RuleTargetLabelColors})
}
func (t *TransferRules) removeTargetID(sourceID string, targetID string) {
log.WithField("source", sourceID).WithField("target", targetID).Trace("Removing target")
rule := t.getRule(sourceID)
if rule == nil {
return
}
targetMailboxToRemove := t.getMailbox(t.transfer.TargetMailboxes, targetID)
if targetMailboxToRemove == nil {
return
}
newTargetMailboxes := []transfer.Mailbox{}
for _, targetMailbox := range rule.TargetMailboxes {
if targetMailbox.Hash() != targetMailboxToRemove.Hash() {
newTargetMailboxes = append(newTargetMailboxes, targetMailbox)
}
}
t.setRule(rule.SourceMailbox, newTargetMailboxes, rule.FromTime, rule.ToTime, []int{RuleTargetLabelColors})
}
// Helpers
func (t *TransferRules) getRule(sourceID string) *transfer.Rule {
mailbox := t.getMailbox(t.transfer.SourceMailboxes, sourceID)
if mailbox == nil {
return nil
}
return t.transfer.GetRule(*mailbox)
}
func (t *TransferRules) getMailbox(mailboxesGetter func() ([]transfer.Mailbox, error), sourceID string) *transfer.Mailbox {
if t.transfer == nil {
log.Warn("Getting mailbox without avaiable transfer")
return nil
}
mailboxes, err := mailboxesGetter()
if err != nil {
log.WithError(err).Error("Failed to get source mailboxes")
return nil
}
for _, mailbox := range mailboxes {
if mailbox.Hash() == sourceID {
return &mailbox
}
}
log.WithField("source", sourceID).Error("Mailbox not found for source")
return nil
}
func (t *TransferRules) setRule(sourceMailbox transfer.Mailbox, targetMailboxes []transfer.Mailbox, fromTime, toTime int64, changedRoles []int) {
if err := t.transfer.SetRule(sourceMailbox, targetMailboxes, fromTime, toTime); err != nil {
log.WithError(err).WithField("source", sourceMailbox.Hash()).Error("Failed to set rule")
}
t.ruleChanged(sourceMailbox, changedRoles)
}
func (t *TransferRules) unsetRule(sourceMailbox transfer.Mailbox) {
t.transfer.UnsetRule(sourceMailbox)
t.ruleChanged(sourceMailbox, []int{MboxIsActive})
}
func (t *TransferRules) ruleChanged(sourceMailbox transfer.Mailbox, changedRoles []int) {
for row, rule := range t.transfer.GetRules() {
if rule.SourceMailbox.Hash() != sourceMailbox.Hash() {
continue
}
t.targetFolders(sourceMailbox.Hash()).itemsChanged(rule)
t.targetLabels(sourceMailbox.Hash()).itemsChanged(rule)
index := t.Index(row, 0, core.NewQModelIndex())
if !index.IsValid() || row >= t.rowCount(index) {
log.WithField("row", row).Warning("Invalid index")
return
}
t.DataChanged(index, index, changedRoles)
break
}
t.updateGroupSelection()
}
func (t *TransferRules) updateGroupSelection() {
areAllLabelsSelected, areAllFoldersSelected := true, true
for _, rule := range t.transfer.GetRules() {
if rule.Active {
continue
}
if rule.SourceMailbox.IsSystemFolder() {
continue
}
if rule.SourceMailbox.IsExclusive {
areAllFoldersSelected = false
} else {
areAllLabelsSelected = false
}
if !areAllLabelsSelected && !areAllFoldersSelected {
break
}
}
t.SetIsLabelGroupSelected(areAllLabelsSelected)
t.SetIsFolderGroupSelected(areAllFoldersSelected)
}

View File

@ -71,7 +71,7 @@ type GoQMLInterface struct {
_ func() `signal:"openManual"`
_ func(showMessage bool) `signal:"runCheckVersion"`
_ func() `slot:"getLocalVersionInfo"`
_ func(fname string) `slot:"loadImportReports"`
_ func() `slot:"loadImportReports"`
_ func() `slot:"quit"`
_ func() `slot:"loadAccounts"`
@ -87,7 +87,7 @@ type GoQMLInterface struct {
_ func() string `slot:"getBackendVersion"`
_ func(description, client, address string) bool `slot:"sendBug"`
_ func(address, fname string) bool `slot:"sendImportReport"`
_ func(address string) bool `slot:"sendImportReport"`
_ func(address string) `slot:"loadStructureForExport"`
_ func() string `slot:"leastUsedColor"`
_ func(username string, name string, color string, isLabel bool, sourceID string) bool `slot:"createLabelOrFolder"`
@ -104,13 +104,13 @@ type GoQMLInterface struct {
_ func(evType string, msg string) `signal:"emitEvent"`
_ func(tabIndex int, message string) `signal:"notifyBubble"`
_ func() `signal:"bubbleClosed"`
_ func() `signal:"simpleErrorHappen"`
_ func() `signal:"askErrorHappen"`
_ func() `signal:"retryErrorHappen"`
_ func() `signal:"pauseProcess"`
_ func() `signal:"resumeProcess"`
_ func(clearUnfinished bool) `signal:"cancelProcess"`
_ func() `signal:"bubbleClosed"`
_ func() `signal:"simpleErrorHappen"`
_ func() `signal:"askErrorHappen"`
_ func() `signal:"retryErrorHappen"`
_ func() `signal:"pauseProcess"`
_ func() `signal:"resumeProcess"`
_ func() `signal:"cancelProcess"`
_ func(iAccount int, prefRem bool) `slot:"deleteAccount"`
_ func(iAccount int) `slot:"logoutAccount"`

View File

@ -114,6 +114,7 @@ type ImportExporter interface {
GetMBOXExporter(string, string) (*transfer.Transfer, error)
SetCurrentOS(os string)
ReportBug(osType, osVersion, description, accountName, address, emailClient string) error
ReportFile(osType, osVersion, accountName, address string, logdata []byte) error
}
type importExportWrap struct {