Serraniel/AniwatchPlus
Serraniel/AniwatchPlus
1
0
Fork 0
Code Issues 9 Pull requests 8 Packages Projects Releases 10 Wiki Activity

Feature/#147 automatic time conversion #150

Merged
Serraniel merged 15 commits from feature/#147-automatic-time-conversion into develop 2020-12-29 14:40:37 +01:00
Conversation 1 Commits 15 Files changed 7 +11 -8
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7e3db5f8d5 - Show all commits

19
src/javascript/enhancements/timeConversion.js
View file

@ -39,7 +39,7 @@ function getSpaceDateFormat() {
return '{date}. {month-short} {year}'; return '{date}. {month-short} {year}';
} }
function updateDateTime(node) { function tryUpdateDateTime(node) {
const REG_DATETIME = /(\d{2}(\/|\.)){2}\d{4} *\d?\d:\d{2}( (AM|PM))?/g; const REG_DATETIME = /(\d{2}(\/|\.)){2}\d{4} *\d?\d:\d{2}( (AM|PM))?/g;
const REG_TIME = /\d?\d:\d{2}/; const REG_TIME = /\d?\d:\d{2}/;
const REG_AMPM = /\s(am|pm)/i; const REG_AMPM = /\s(am|pm)/i;
@ -85,7 +85,7 @@ function updateDateTime(node) {
return true; return true;
} }
function updateDate(node) { function tryUpdateDate(node) {
const REG_DATE = /(\d{2}(\/|\.)){2}\d{4}/g; const REG_DATE = /(\d{2}(\/|\.)){2}\d{4}/g;
let hits = Array.from(node.textContent.matchAll(REG_DATE), match => match[0]); let hits = Array.from(node.textContent.matchAll(REG_DATE), match => match[0]);
@ -105,7 +105,7 @@ function updateDate(node) {
return true; return true;
} }
function updateTime(node) { function tryUpdateTime(node) {
const REG_TIME = /\d?\d:\d{2}( (AM|PM))?/g; const REG_TIME = /\d?\d:\d{2}( (AM|PM))?/g;
const REG_AMPM = /\s(am|pm)/i; const REG_AMPM = /\s(am|pm)/i;
@ -156,7 +156,7 @@ function updateTime(node) {
return true; return true;
} }
function updateTimeZone(node) { function tryUpdateTimeZone(node) {
const HINT_UTC = 'UTC+1'; const HINT_UTC = 'UTC+1';
if (node.textContent === HINT_UTC) { if (node.textContent === HINT_UTC) {
let tzMeta = spacetime().timezone(); let tzMeta = spacetime().timezone();
@ -175,21 +175,24 @@ function updateTimestamps(node) {
return; return;
} }
if (updateDateTime(node)) { if (tryUpdateDateTime(node)) {
__alteredNodes.push(node); __alteredNodes.push(node);
return; return;
} }
if (updateDate(node)) { if (tryUpdateDate(node)) {
__alteredNodes.push(node); __alteredNodes.push(node);
return; return;
} }
if (updateTime(node)) { if (tryUpdateTime(node)) {
__alteredNodes.push(node); __alteredNodes.push(node);
return; return;
} }
updateTimeZone(node); if (tryUpdateTimeZone(node)) {
__alteredNodes.push(node);
return;
}
}); });
} }