Skip to content

Commit

Permalink
1.0.2
Browse files Browse the repository at this point in the history 
- Fixed some bugs
  • Loading branch information
@Sav22999
Sav22999 committed Jun 3, 2021
1 parent bbec3ef commit a2f9b81
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 69 deletions.
83 changes: 42 additions & 41 deletions js/background.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var timeSpentToday = 0;
var timeSpentAlways = 0;
//var timeSpentAlways = 0;

var currentUrl = "";
var oldUrl = "";
Expand Down Expand Up @@ -84,20 +84,7 @@ function checkStatusEnabled(enabled, force = false) {
if (!force) {
if (enabled) increaseTime(currentUrl);
} else {
let urlToUse = currentUrl;
let value = {};
if (websites_json[urlToUse] != undefined) value = websites_json[urlToUse];
value["enabled"] = enabled;
value["always"] = timeSpentAlways;
value[getToday()] = timeSpentToday;
websites_json[urlToUse] = value;

if (!changedEdits) {
browser.storage.local.set({"websites": websites_json}, function () {
//console.log("Background || Saved || Forced || Status: " + enabledOrNot + " || " + JSON.stringify(websites_json));
//console.log("Background || Saved || Forced || Status: " + enabledOrNot + "");
});
}
saveUrlToData(enabled, 0);
}
if (!enabled) changeIcon(1);
}
Expand Down Expand Up @@ -154,24 +141,42 @@ function getTheProtocol(url) {
function saveUrlToData(enabled, time = 0) {
let urlToUse = currentUrl;

timeSpentToday += time;
timeSpentAlways += time;

let value = {};
if (websites_json[urlToUse] != undefined) value = websites_json[urlToUse];
value["enabled"] = enabled;
value["always"] = timeSpentAlways;
value[getToday()] = timeSpentToday;
websites_json[urlToUse] = value;

if (isUrlSupported(fullUrl)) {
if (!changedEdits) {
browser.storage.local.set({"websites": websites_json}, function () {
//console.log("Background || Saved || Status: " + enabledOrNot + " || " + JSON.stringify(websites_json));
//console.log("Background || Saved || Status: " + enabledOrNot + "");
});
let valueToUse = {};
browser.storage.local.get("websites", function (value) {
if (value["websites"] != undefined) {
websites_json = value["websites"];
}
}
changedTab = false;
timeSpentToday = 0;
//timeSpentAlways = 0;
if (websites_json[urlToUse] != undefined) {
valueToUse = websites_json[urlToUse];
if (websites_json[urlToUse][getToday()] != undefined) {
timeSpentToday = websites_json[urlToUse][getToday()];
}
/*if (websites_json[urlToUse]["always"] != undefined) {
timeSpentAlways = websites_json[urlToUse]["always"];
}*/
}

timeSpentToday += time;
//timeSpentAlways += time;

valueToUse["enabled"] = enabled;
valueToUse[getToday()] = timeSpentToday;
//valueToUse["always"] = timeSpentAlways;
websites_json[urlToUse] = valueToUse;

if (isUrlSupported(fullUrl)) {
if (!changedEdits) {
browser.storage.local.set({"websites": websites_json}, function () {
//console.log("Background || Saved || Status: " + enabledOrNot + " || " + JSON.stringify(websites_json));
//console.log("Background || Saved || Status: " + enabledOrNot + "");
//console.log("Background || Saved || " + JSON.stringify(websites_json[currentUrl]));
});
}
}
})
}

function getSavedData(url) {
Expand All @@ -180,23 +185,23 @@ function getSavedData(url) {
if (isUrlSupported(url)) {
browser.storage.local.get("websites", function (value) {
timeSpentToday = 0;
timeSpentAlways = 0;
//timeSpentAlways = 0;
if (value["websites"] != undefined) {
websites_json = value["websites"];
if (websites_json[urlToUse] != undefined) {
let enabled = false;
if (websites_json[urlToUse]["enabled"] != undefined) enabled = websites_json[urlToUse]["enabled"];
switchToOnOrOff(true, enabled);
timeSpentToday=0;
if (websites_json[urlToUse][getToday()] != undefined) {
timeSpentToday = websites_json[urlToUse][getToday()];
} else {
timeSpentToday = 0;
}
/*
if (websites_json[urlToUse]["always"] != undefined) {
timeSpentAlways = websites_json[urlToUse]["always"];
} else {
timeSpentAlways = 0;
}
}*/
} else {
saveUrlToData(true, 0);
}
Expand Down Expand Up @@ -253,12 +258,8 @@ function checkEverySecond(url) {

function increaseTime(url) {
if (enabledOrNot) {
if (!isInteger(timeSpentToday)) timeSpentToday = 0;
timeSpentToday += 1;
if (!isInteger(timeSpentAlways)) timeSpentAlways = 0;
timeSpentAlways += 1;
if (url == currentUrl) {
saveUrlToData(true, 0);
saveUrlToData(true, 1);
}

if (timeSpentToday >= 0 && timeSpentToday < 60 * 30) {
Expand Down
54 changes: 27 additions & 27 deletions js/script.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var changedEdits = false;
const linkReview = ["https://addons.mozilla.org/firefox/addon/limite/"]; //{firefox add-ons}
const linkDonate = ["https://www.paypal.com/pools/c/8yl6auiU6e", "https://ko-fi.com/saveriomorelli", "https://liberapay.com/Sav22999/donate"]; //{paypal, ko-fi}

function loaded(permissionDesc) {
function loaded() {
browser.tabs.query({active: true, currentWindow: true}, function (tabs) {
// since only one tab should be active and in the current window at once
// the return variable should only have one entry
Expand Down Expand Up @@ -73,36 +73,36 @@ function loadUI() {
disableSwitch(true);
if (isUrlSupported(fullUrl)) {
browser.storage.local.get("websites", function (value) {
timeSpentToday = 0;
timeSpentAlways = 0;
if (value["websites"] != undefined) {
websites_json = value["websites"];
if (websites_json[urlToUse] != undefined) {
if (firstTime == true) {
let enabled = false;
if (websites_json[urlToUse]["enabled"] != undefined) enabled = websites_json[urlToUse]["enabled"];
switchToOnOrOff(false, "toggle-thumb", true, enabled);
firstTime = false;
}
if (websites_json[urlToUse][getToday()] != undefined) {
timeSpentToday = websites_json[urlToUse][getToday()];
} else {
timeSpentToday = 0;
}
if (websites_json[urlToUse]["always"] != undefined) {
timeSpentAlways = websites_json[urlToUse]["always"];
} else {
timeSpentAlways = 0;
timeSpentToday = 0;
timeSpentAlways = 0;
if (value["websites"] != undefined) {
websites_json = value["websites"];
if (websites_json[urlToUse] != undefined) {
if (firstTime == true) {
let enabled = false;
if (websites_json[urlToUse]["enabled"] != undefined) enabled = websites_json[urlToUse]["enabled"];
switchToOnOrOff(false, "toggle-thumb", true, enabled);
firstTime = false;
}
timeSpentToday = 0;
if (websites_json[urlToUse][getToday()] != undefined) {
timeSpentToday = websites_json[urlToUse][getToday()];
}
timeSpentAlways = 0;
for (var key in websites_json[currentUrl]) {
if (key != "always" && key != "enabled") {
//console.log(k + " : " + websites_json[currentUrl][k])
timeSpentAlways += websites_json[currentUrl][key];
}
} else {
}
} else {
}
disableSwitch(false);
document.getElementById("today-time").innerHTML = getTimeConverted(timeSpentToday);
document.getElementById("always-time").innerHTML = getTimeConverted(timeSpentAlways);
} else {
}
)
disableSwitch(false);
document.getElementById("today-time").innerHTML = getTimeConverted(timeSpentToday);
document.getElementById("always-time").innerHTML = getTimeConverted(timeSpentAlways);
})
} else {
disableSwitch(true);
switchToOff("toggle-thumb");
Expand Down Expand Up @@ -326,7 +326,7 @@ function getTimeConverted(time) {
function getSecondOrSeconds(timeToUse) {
let timeToReturn = "";
if (timeToUse == 1) timeToReturn = timeToUse + " second";
else if (timeToUse > 1) timeToReturn = timeToUse + " seconds";
else if (timeToUse == 0 || timeToUse > 1) timeToReturn = timeToUse + " seconds";
return timeToReturn;
}

Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "Limite",
"version": "1.0.1",
"version": "1.0.2",
"description": "Check how much time you spend on each website every day.\nOptimise your productivity, your time and your life as well.\nDon't lose precious time!",
"icons": {
"16": "./img/icon-16.png",
Expand Down

0 comments on commit a2f9b81

Please sign in to comment.