|
|
On October 3rd, 2016, 2:26 p.m. UTC, Gilles Caulier wrote:
Ship It!
On October 3rd, 2016, 2:33 p.m. UTC, Gilles Caulier wrote:
Excelent. Thanks Antonio.
Code is fine for me to commit, if condition below are also fixed :
1/ Gelocation Editor data file need to be migrated too, as it's reported in another bugzilla entry :
https://bugs.kde.org/show_bug.cgi?id=368968
Also this entry have been re-opened. Your patch must fix it typically :
https://bugs.kde.org/show_bug.cgi?id=357944
Gilles Caulier
Sure, I wasn't aware of those bugs.
1/ I've already added code for that and when I test it I'll push it if that's ok for you. Note I'll test with a simple geobookmarks.xml file since I don't have a real one to test, but since the migration should just copy it, the contents don't really matter.
2/ I think my patch already takes care of that. It url-decodes the albumroot identifiers which start with "volumeid:?path=%2F". In my database I only had two kind of albumroots:
One with identifier="volumeid:?path=%2Fhome%2Fantonio%2FPictures" and specificPath="/" which didn't work in digikam5 (until I url-decoded it)
The rest with identifier=volumeid:?uuid=128ff..." and specificPath="/somepath" which worked fine.
Is there any other kind of entry in the albumroots table that should be url-decoded?
- Antonio
On October 3rd, 2016, 4:02 p.m. UTC, Antonio Larrosa Jimenez wrote:
|
Review request for Digikam.
By Antonio Larrosa Jimenez.
Updated Oct. 3, 2016, 4:02 p.m.
Repository:
digikam
Description
This commit adds a new page to the FirstRun wizard that allows the user
to choose if he/she wants to do a migration of the digikam4 settings
(only if settings from digikam4 are detected). If the user selects to
create new settings, then the usual wizard continues, and if the user
selects to migrate then
~/.kde4/share/config/digikamrc
~/.kde4/share/config/digikam_tagsmanagerrc
~/.kde4/share/config/kipipluginsrc
~/.kde4/share/config/kipirc
~/.kde4/share/config/showfotorc
are copied to ~/.config/ .
Then all files inside ~/.kde4/share/apps/digikam/
are copied to ~/.local/share/apps/digikam .
And finally, the albumroots are updated in the database since
digiKam 5 doesn't interpret correctly values like
volumeid:?path=%2Fhome%2Fantonio%2FPictures and they need to be
url-decoded.
|
Testing
I tested by migrating my own digikam instance (which has 5 albumroots, 98701 images and 1707 tags) with a patched openSUSE Tumbleweed digikam 5.2.0 package.
|
Diffs
- utilities/assistants/firstrun/CMakeLists.txt (7e104fe3ff3c3102b368cd2671bea6e4a3c963b8)
- utilities/assistants/firstrun/firstrundlg.cpp (cf9bbd2c8ab8bceaab4c0237458a88b3f3dc86b2)
- utilities/assistants/firstrun/migratefromdigikam4page.h (PRE-CREATION)
- utilities/assistants/firstrun/migratefromdigikam4page.cpp (PRE-CREATION)
- utilities/assistants/firstrun/welcomepage.cpp (5e630eb46d191f1480922cb732bb48135f60beba)
View Diff
File Attachments
Screenshot of the new migrate page in the FirstRun wizard
|
|
Locked
