l-spiecker / sdb2 Goto Github PK

Inside PatchController.applyPatches we currently do not check if all patches could be applied.
If not, add the Song before applying changes to the conflicted songs to let the user compare the latest version with the version before.

Inside MainWindow.setModels - songsModel.addSongsModelListener the current changes inside the editor are thrown away, if the same song changes in Background (file/remote).

Approach 1: (Conflict/Mergetool)

• Show a song changed in Background dialog.
• Add changed song before overwriting it to conflicts
• Overwrite song and fields with remote/file changes
• Show a notification and let the user open the diff.

Approach 2: (Rebase)

• Extract diff, apply remote diff, apply diff again. (May fail)
• Highlight changes from remote, and local changes.
• Show dialog, to hit ok before saving it.

This could be done by implementing a boolean return of updateSongs/removeSong/update/changeSongs in PatchController.

Or without waiting: Simply adding those patches inside rejectPatch to a list of merge conflicts to let the user decide later.

MQTT.connectionLost does not implement a auto reconnect.

// client.reconnect();

To reduce MainController's LOCs and be consintent with saving the songs of the database.

Implement a mergetool for all conflicts with overwritten local and rejected changes.

• Save those changes in a separate xml.
• Add an icon to the GUI and open a list on click.
• Open conflicts directly in the edit song tab?

If a song changes one has to send the song and the position.

If both are received, sdb2 should show the song directly at the wanted position, instead of the position 0.0.

Add an initial position to the present functions. Allow users to open a song in the mainwindow without presenting it. (Eg. by pressing Alt+Click) Then use null as the initial Position.

Implement behaviour inside RemoteController.handleSongChange

Use empty position message as blank presentation instead of sending an empty song message.

This would allow untoggle blank screen. This would fasten the transition from blank to the current song again. And we would still know the current song, to switch to next/previous one.

Currently the active line is not changing, when changed via remote.

Add a moveToLine function next to the present function of MainWindow and use it inside handleSongPositionChange of RemoteController.

• Implement getParts for remotepresenter
• Change position in MainController.presentInNewPresenters to allow using sdb2 as RemoteControll without 'real' a Presenter.