Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kodi: database migration splash text #537

Merged
merged 1 commit into from Jul 17, 2016
Merged

kodi: database migration splash text #537

merged 1 commit into from Jul 17, 2016

Conversation

MilhouseVH
Copy link
Contributor

@MilhouseVH MilhouseVH commented Jul 12, 2016

This is based on the work of @MrMC: MrMC/mrmc@dcf671d

Details of each database to be upgraded will be overlayed on the Kodi splash image. If the user has disabled the Kodi splash image, the Kodi splash image will be displayed anyway during database migrations.

Tested with MySQL migration of Videos and Music. Should work when migrating SQLite databases, and also when migrating other databases eg. Addons etc.

This is just a temporary solution until the issue of database migrations is solved upstream in Kodi (this fix will not be accepted upstream due to the Splash dependency being added to Database). However as there is no timeframe on such a solution, this is better than nothing.

s1

@lrusak
Copy link
Member

lrusak commented Jul 12, 2016

LGTM

@MilhouseVH
Copy link
Contributor Author

MilhouseVH commented Jul 15, 2016

Seems to crash when migrating Addons db: http://pastebin.com/raw/KBXWRrvy (can't reproduce on Ubuntu)

@MilhouseVH
Copy link
Contributor Author

Pushed an update.

I've added a boolean flag to avoid showing the splash (and thus the splash message) while updating the Addons database, as this particular database is updated much earlier than all the other databases, before the GUI is ready. See https://github.com/xbmc/xbmc/blob/master/xbmc/Application.cpp#L647

Ping @MrMC as I'm guessing you may hit this too when migrating Addons*.db to a new version.

With this fix I've successfully tested migrating an OE 6.0.2 installation, there just isn't any progress shown while migrating the Addons database however this database is typically small and very quick to migrate, even on low powered systems.

@popcornmix
Copy link
Contributor

popcornmix commented Jul 15, 2016

You could make the bool the third parameter and have it default to true. Then you only have to change the call of the addon database to add the extra parameters (.., NULL, false).
Fewer lines of code touched means less likely to hit conflicts in future.

@MilhouseVH
Copy link
Contributor Author

Updated after @popcornmix's comment (thanks).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants