yetangitu/Jamstash
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rewrites checkVersion and checkVersionNewer in utils-service.js, refines upgradeToVersion

Browse source 
- Adds unit tests that cover all cases.
- Adds call to parseVersionString() so we can pass it version string e.g. '1.0.1'
- persistence-service.js now also manages JamstashVersion. It is set in localStorage from app.js's constant, and not from the changelog so we don't have to add a version to the changelog to actually do stuff.
- persistence-service.js's upgradeToVersion() now only applies newer changesets. This ensures we won't erase users' settings with changesets at every new version, e.g. resetting songSearchType to song every time.
- upgradeToVersion() will also notify the user of the upgrade, which was formerly done in settings.js
This commit is contained in:
Hyzual 2015-03-23 22:51:43 +01:00
parent ae703c1542
commit fe6c10bc4a
6 changed files with 274 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/common/persistence-service.js
View file

@ -74,8 +74,7 @@ angular.module('jamstash.persistence', ['angular-locker',
/* Manage user settings */
this.getSettings = function () {
//TODO: store as version object
if(this.getVersion() !== jamstashVersion) {
if(utils.checkVersionNewer(jamstashVersion, this.getVersion())) {
this.upgradeToVersion(jamstashVersion);
}
return locker.get('Settings');
@ -91,25 +90,24 @@ angular.module('jamstash.persistence', ['angular-locker',
/* Manage Jamstash Version */
this.getVersion = function () {
return locker.get('version');
return locker.get('JamstashVersion');
};
this.upgradeToVersion = function (finalVersion) {
var currentVersion = utils.parseVersionString(this.getVersion());
var currentVersion = this.getVersion();
var settings = locker.get('Settings');
// Apply all upgrades older than the final version
// TODO: Hyz: Do not apply upgrades already applied (start from current version)
// Apply all upgrades older than the final version and newer than the current
var allUpgrades = _(jamstashVersionChangesets.versions).filter(function (toApply) {
//TODO: Hyz: have "checkVersion" do the conversion themselves
var versionToCheck = utils.parseVersionString(toApply.version);
var objFinalVersion = utils.parseVersionString(finalVersion);
return utils.checkVersion(objFinalVersion, versionToCheck);
var olderOrEqualToFinal = utils.checkVersion(finalVersion, toApply.version);
var newerThanCurrent = utils.checkVersionNewer(toApply.version, currentVersion);
return olderOrEqualToFinal && newerThanCurrent;
});
_(allUpgrades).each(function (versionUpg) {
versionUpg.changeset(settings);
});
this.saveSettings(settings);
locker.put('version', finalVersion);
locker.put('JamstashVersion', finalVersion);
notifications.updateMessage('Version ' + currentVersion + ' to ' + finalVersion, true);
};
}])