secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Numeric ids for generateGuid: timestamp + random

Browse Source
This commit is contained in:
James Barnsley
2018-03-21 09:04:08 +13:00
parent 1761456e76
commit 03f93900ce
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mopidy_iris/static/app.js
View File

@ -471,18 +471,21 @@ var digestMopidyImages = exports.digestMopidyImages = function digestMopidyImage
};
var generateGuid = exports.generateGuid = function generateGuid() {
var format = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'xxxxxxxxxxxx';
var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'numeric';
// numeric
return new Date().valueOf() + Math.random();
// alpha-numeric
/*
return format.replace(/[xy]/g, function(c){
var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
return v.toString(16);
});
*/
if (type == 'numeric') {
var date = new Date().valueOf().toString();
var random_number = Math.floor(Math.random() * 100).toString();
return parseInt(date + random_number);
} else {
var format = 'xxxxxxxxxx';
return format.replace(/[xy]/g, function (c) {
var r = Math.random() * 16 | 0,
v = c == 'x' ? r : r & 0x3 | 0x8;
return v.toString(16);
});
}
};
var getCurrentPusherConnection = exports.getCurrentPusherConnection = function getCurrentPusherConnection(connections, connectionid) {

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

22
src/js/helpers.js
View File

@ -204,17 +204,19 @@ export let digestMopidyImages = function(mopidy, images){
}
export let generateGuid = function(format = 'xxxxxxxxxxxx'){
export let generateGuid = function(type = 'numeric'){
// numeric
return new Date().valueOf() + Math.random();
// alpha-numeric
/*
return format.replace(/[xy]/g, function(c){
var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
return v.toString(16);
});
*/
if (type == 'numeric'){
var date = new Date().valueOf().toString();
var random_number = Math.floor((Math.random() * 100)).toString();
return parseInt(date+random_number);
} else {
var format = 'xxxxxxxxxx';
return format.replace(/[xy]/g, function(c){
var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
return v.toString(16);
});
}
}
export let getCurrentPusherConnection = function(connections, connectionid){