oreolek/trackmenot
1
0
Fork 0
mirror of https://github.com/Oreolek/TrackMeNot-Chrome.git synced 2024-05-13 06:28:20 +03:00
Code Issues Releases Wiki Activity

Bugfixing, less BS in console

Browse source
This commit is contained in:
Alexander Yakovlev 2016-12-03 17:22:24 +07:00
parent c920a3cc7f
commit 21125fa541
3 changed files with 76 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
option-script.js
View file

@ -19,7 +19,6 @@ function loadHandlers() {
$("#trackmenot-opt-showqueries").click( TMNShowQueries); $("#trackmenot-opt-showqueries").click( TMNShowQueries);
$("#validate-feed").click( function() { $("#validate-feed").click( function() {
var feeds = $("#trackmenot-seed").val(); var feeds = $("#trackmenot-seed").val();
var param = {"feeds": feeds}; var param = {"feeds": feeds};
@ -56,7 +55,6 @@ function loadHandlers() {
); );
} }
function TMNSetOptionsMenu( ) { function TMNSetOptionsMenu( ) {
var options = tmn._getOptions(); var options = tmn._getOptions();
var feedList = options.feedList; var feedList = options.feedList;
@ -84,17 +82,11 @@ function TMNSetOptionsMenu( ) {
setFrequencyMenu(options.timeout); setFrequencyMenu(options.timeout);
} }
function setFrequencyMenu(timeout){ function setFrequencyMenu(timeout){
var menu = $("#trackmenot-opt-timeout"); var menu = $("#trackmenot-opt-timeout");
$('#trackmenot-opt-timeout option[value=' +timeout+ ']').prop('selected', true); $('#trackmenot-opt-timeout option[value=' +timeout+ ']').prop('selected', true);
} }
function TMNClearLogs() { function TMNClearLogs() {
tmn._clearLogs(); tmn._clearLogs();
TMNShowLog(); TMNShowLog();

4
options.html
View file

@ -6,10 +6,10 @@
</head> </head>
<body BGCOLOR=#E6EAE2 MARGINWIDTH=0 MARGINHEIGHT=0> <body BGCOLOR=#E6EAE2 MARGINWIDTH=0 MARGINHEIGHT=0>
<table valign="top"> <table valign="top">
<tr> <tr>
<td width=900 valign="top" > <td width=900 valign="top" >
<table BGCOLOR=#E6EAE2 width=900 align=left valign="top" > <table BGCOLOR=#E6EAE2 width=900 align=left valign="top" >
<TR> <TR>
<TD> <TD>
<table valign="top"> <table valign="top">

134
trackmenot.js
View file

@ -23,7 +23,7 @@ TRACKMENOT.TMNSearch = function() {
var tmn_tab = null; var tmn_tab = null;
var useTab = false; var useTab = false;
var enabled = true; var enabled = true;
var debug_ = true; var debug_ = false;
var load_full_pages = false; var load_full_pages = false;
var last_url = ""; var last_url = "";
var stop_when = "start"; var stop_when = "start";
@ -236,7 +236,7 @@ TRACKMENOT.TMNSearch = function() {
function clearLog() { function clearLog() {
tmnLogs = []; tmnLogs = [];
sendLogToOption(); chrome.storage.local.set({"logs_tmn":"{}"});
} }
function saveOptionFromTab(options) { function saveOptionFromTab(options) {
@ -301,7 +301,7 @@ TRACKMENOT.TMNSearch = function() {
function createTab() { function createTab() {
if (!useTab || tmn_tab_id != -1) return; if (!useTab || tmn_tab_id != -1) return;
if(debug) cout('Creating tab for TrackMeNot'); if(debug) console.log ('Creating tab for TrackMeNot');
try { try {
chrome.tabs.create({ chrome.tabs.create({
'active': false, 'active': false,
@ -367,7 +367,10 @@ TRACKMENOT.TMNSearch = function() {
} }
function trim(s) { function trim(s) {
return s.replace(/\n/g,''); if (s !== null) {
return s.replace(/\n/g,'');
}
return s;
} }
function cerr(msg, e){ function cerr(msg, e){
@ -376,11 +379,7 @@ TRACKMENOT.TMNSearch = function() {
txt += "\n" + e; txt += "\n" + e;
if (e.message)txt+=" | "+e.message; if (e.message)txt+=" | "+e.message;
} else txt += " / No Exception"; } else txt += " / No Exception";
cout(txt); console.log (txt);
}
function cout (msg) {
console.log(msg);
} }
function debug (msg) { function debug (msg) {
@ -392,12 +391,6 @@ TRACKMENOT.TMNSearch = function() {
return Math.floor(Math.random()*(max+1))+min; return Math.floor(Math.random()*(max+1))+min;
} }
function randomElt(array) {
cout("Array length: "+array.length);
var index = roll(0,array.length-1);
return array[index];
}
function monitorBurst() { function monitorBurst() {
chrome.webNavigation.onCommitted.addListener(function(e) { chrome.webNavigation.onCommitted.addListener(function(e) {
var url = e.url; var url = e.url;
@ -442,7 +435,7 @@ TRACKMENOT.TMNSearch = function() {
result = url.match(regex); result = url.match(regex);
if (result) { if (result) {
cout(regex + " MATCHED! on "+eng.id ); console.log (regex + " MATCHED! on "+eng.id );
id = eng.id; id = eng.id;
break; break;
} }
@ -456,7 +449,7 @@ TRACKMENOT.TMNSearch = function() {
result.push(id); result.push(id);
return result; return result;
} }
cout("REGEX_ERROR: "+url); console.log ("REGEX_ERROR: "+url);
} }
result.push(id); result.push(id);
return result; return result;
@ -470,27 +463,42 @@ TRACKMENOT.TMNSearch = function() {
return engines[Math.floor(Math.random()*engines.length)]; return engines[Math.floor(Math.random()*engines.length)];
} }
/**
* The function that constructs a random search query.
* Used in doSearch, also see getSubQuery()
*/
function randomQuery() { function randomQuery() {
var randomElt = function (arr) {
var index = roll(0, arr.length - 1);
return arr[index];
}
var qtype = randomElt(typeoffeeds); var qtype = randomElt(typeoffeeds);
cout(qtype); debug (qtype);
var queries = []; var queries = TMNQueries[qtype];
if ( qtype != 'zeitgeist' && qtype!='extracted') { if ( qtype != 'zeitgeist' && qtype != 'extracted') {
var queryset = TMNQueries[qtype]; queries = randomElt(queries)
queries = randomElt(queryset).words; if (queries !== undefined && queries.words !== undefined) {
} else queries = TMNQueries[qtype]; queries = queries.words;
} else {
// no real result to return, try again
return randomQuery();
}
}
var term = trim( randomElt(queries) ); var term = trim( randomElt(queries) );
if (!term || term.length<1) if (!term || term.length<1) {
throw new Error("queryIdx="+queryIdx+" getQuery.term='"+term+"'"); throw new Error("getQuery.term='"+term+"'");
}
return term; return term;
} }
function validateFeeds(param) { function validateFeeds(param) {
TMNQueries.rss = []; TMNQueries.rss = [];
feedList = param.feeds; feedList = param.feeds;
cout("Validating the feeds: "+ feedList); console.log ("Validating the feeds: "+ feedList);
var feeds = feedList.split('|'); var feeds = feedList.split('|');
for (var i=0;i<feeds.length;i++) { for (var i=0;i<feeds.length;i++) {
cout(" Fetching " + feeds[i]); console.log (" Fetching " + feeds[i]);
doRssFetch(feeds[i]); doRssFetch(feeds[i]);
} }
saveOptions(); saveOptions();
@ -501,7 +509,7 @@ TRACKMENOT.TMNSearch = function() {
var splitRegExp = new RegExp('^[\\[\\]\\(\\)\\"\']', "g"); var splitRegExp = new RegExp('^[\\[\\]\\(\\)\\"\']', "g");
if (!html) { if (!html) {
cout("NO HTML!"); console.log ("NO HTML!");
return; return;
} }
@ -528,7 +536,7 @@ TRACKMENOT.TMNSearch = function() {
var rand = roll(0,TMNQueries.extracted.length-1); var rand = roll(0,TMNQueries.extracted.length-1);
TMNQueries.extracted.splice(rand , 1); TMNQueries.extracted.splice(rand , 1);
} }
cout(TMNQueries.extracted); debug (TMNQueries.extracted);
addQuery(queryToAdd,TMNQueries.extracted); addQuery(queryToAdd,TMNQueries.extracted);
} }
@ -584,7 +592,7 @@ TRACKMENOT.TMNSearch = function() {
return false; return false;
queryList.push(term); queryList.push(term);
//gtmn.cout("adding("+gtmn._queries.length+"): "+term); //gtmn.console.log ("adding("+gtmn._queries.length+"): "+term);
return true; return true;
} }
@ -637,7 +645,7 @@ TRACKMENOT.TMNSearch = function() {
var feedObject = {}; var feedObject = {};
feedObject.name = feedTitles[0].firstChild.nodeValue; feedObject.name = feedTitles[0].firstChild.nodeValue;
feedObject.words = []; feedObject.words = [];
//cout('ADD RSS title : '+ feedTitles[0].firstChild.nodeValue); //console.log ('ADD RSS title : '+ feedTitles[0].firstChild.nodeValue);
for (var i=1; i<feedTitles.length; i++){ for (var i=1; i<feedTitles.length; i++){
if ( feedTitles[i].firstChild ) { if ( feedTitles[i].firstChild ) {
rssTitles = feedTitles[i].firstChild.nodeValue; rssTitles = feedTitles[i].firstChild.nodeValue;
@ -646,7 +654,7 @@ TRACKMENOT.TMNSearch = function() {
var queryToAdd = filterKeyWords(rssTitles, feedUrl); var queryToAdd = filterKeyWords(rssTitles, feedUrl);
addQuery(queryToAdd,feedObject.words); addQuery(queryToAdd,feedObject.words);
} }
//cout(feedObject.name + " : " + feedObject.words) //console.log (feedObject.name + " : " + feedObject.words)
if (useRss) { if (useRss) {
TMNQueries.rss.push(feedObject); TMNQueries.rss.push(feedObject);
@ -685,14 +693,14 @@ TRACKMENOT.TMNSearch = function() {
req.onreadystatechange = function(){ req.onreadystatechange = function(){
if (req.readyState == 4) { if (req.readyState == 4) {
if (req.status == 200) { if (req.status == 200) {
cout(req.responseText); debug (req.responseText);
var adds = addRssTitles(req.responseXML, feedUrl); var adds = addRssTitles(req.responseXML, feedUrl);
} }
} }
}; };
req.send(null); req.send(null);
} catch (ex) { } catch (ex) {
cout( console.log (
"[WARN] doRssFetch("+ "[WARN] doRssFetch("+
feedUrl+ feedUrl+
")\n"+ ")\n"+
@ -807,7 +815,6 @@ TRACKMENOT.TMNSearch = function() {
function sendQuery(queryToSend) { function sendQuery(queryToSend) {
tmn_scheduledSearch = false; tmn_scheduledSearch = false;
cout("Engin: "+engine);
var url = getEngineById(engine).urlmap; var url = getEngineById(engine).urlmap;
var isIncr = (queryToSend === null); var isIncr = (queryToSend === null);
if (queryToSend === null){ if (queryToSend === null){
@ -815,7 +822,7 @@ TRACKMENOT.TMNSearch = function() {
queryToSend = incQueries.pop(); queryToSend = incQueries.pop();
else { else {
if (!queryToSend) if (!queryToSend)
cout('sendQuery error! queryToSendis null'); console.log ('sendQuery error! queryToSendis null');
return; return;
} }
} }
@ -842,7 +849,7 @@ TRACKMENOT.TMNSearch = function() {
} }
} else { } else {
var queryURL = queryToURL(url ,queryToSend); var queryURL = queryToURL(url ,queryToSend);
cout("The encoded URL is " + queryURL); debug ("The encoded URL is " + queryURL);
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open("GET", queryURL, true); xhr.open("GET", queryURL, true);
xhr.onreadystatechange = function() { xhr.onreadystatechange = function() {
@ -892,7 +899,7 @@ TRACKMENOT.TMNSearch = function() {
var pauseAfterError = Math.max(2*tmn_timeout, 60000); var pauseAfterError = Math.max(2*tmn_timeout, 60000);
tmn_mode = 'recovery'; tmn_mode = 'recovery';
burstCount=0; burstCount=0;
cout("[INFO] Trying again in "+(pauseAfterError/1000)+ "s"); console.log ("[INFO] Trying again in "+(pauseAfterError/1000)+ "s");
log({ log({
'type' : 'ERROR' , 'type' : 'ERROR' ,
'message': 'next search in '+(pauseAfterError/1000)+ "s", 'message': 'next search in '+(pauseAfterError/1000)+ "s",
@ -943,7 +950,7 @@ TRACKMENOT.TMNSearch = function() {
function enterBurst ( burst_engine ) { function enterBurst ( burst_engine ) {
if (!burstEnabled) if (!burstEnabled)
return; return;
cout("Entering burst mode for engine: " + burst_engine); console.log ("Entering burst mode for engine: " + burst_engine);
var logMessage = { var logMessage = {
type:'info', type:'info',
message:'User made a search, start burst', message:'User made a search, start burst',
@ -966,9 +973,8 @@ TRACKMENOT.TMNSearch = function() {
//ss.storage.kw_black_list = kwBlackList.join(","); //ss.storage.kw_black_list = kwBlackList.join(",");
var options = getOptions(); var options = getOptions();
localStorage.options_tmn = JSON.stringify(options); localStorage.options_tmn = JSON.stringify(options);
localStorage.tmn_id = tmn_id; localStorage.tmn_id = tmn_id;
localStorage.gen_queries = JSON.stringify(TMNQueries); localStorage.gen_queries = JSON.stringify(TMNQueries);
} }
function getOptions() { function getOptions() {
@ -985,7 +991,7 @@ TRACKMENOT.TMNSearch = function() {
options.saveLogs= saveLogs; options.saveLogs= saveLogs;
options.disableLogs = disableLogs; options.disableLogs = disableLogs;
options.useRss = useRss; options.useRss = useRss;
options.userList = userList; options.userList = userList.join(",");
options.useUserList = useUserList; options.useUserList = useUserList;
return options; return options;
} }
@ -1007,7 +1013,7 @@ TRACKMENOT.TMNSearch = function() {
function restoreOptions () { function restoreOptions () {
if (!localStorage.options_tmn) { if (!localStorage.options_tmn) {
initOptions(); initOptions();
cout("Init: "+ enabled); console.log ("Init: "+ enabled);
return; return;
} }
@ -1030,11 +1036,13 @@ TRACKMENOT.TMNSearch = function() {
options.useUserList = options.useUserList; options.useUserList = options.useUserList;
options.userList = options.userList.split(","); options.userList = options.userList.split(",");
tmnLogs = JSON.parse( localStorage.logs_tmn ); tmnLogs = JSON.parse( localStorage.logs_tmn );
engines = JSON.parse( localStorage.engines); engines = JSON.parse( localStorage.engines );
if (options.kw_black_list && opions.kw_black_list.length > 0) if (options.kw_black_list && opions.kw_black_list.length > 0) {
kwBlackList = options.kw_black_list.split(","); kwBlackList = options.kw_black_list.split(",");
}
} catch (ex) { } catch (ex) {
cout('No option recorded: '+ex); console.trace(ex);
console.log ('No option recorded: '+ex);
} }
} }
@ -1068,7 +1076,7 @@ TRACKMENOT.TMNSearch = function() {
function preserveTMNTab() { function preserveTMNTab() {
if ( useTab && enabled) { if ( useTab && enabled) {
tmn_tab = null; tmn_tab = null;
cout('TMN tab has been deleted by the user, reload it'); console.log ('TMN tab has been deleted by the user, reload it');
createTab(); createTab();
return; return;
} }
@ -1093,7 +1101,7 @@ TRACKMENOT.TMNSearch = function() {
} }
} }
catch(ex){ catch(ex){
cout("[ERROR] "+ ex +" / "+ ex.message + "\nlogging msg"); console.log ("[ERROR] "+ ex +" / "+ ex.message + "\nlogging msg");
} }
tmnLogs.unshift(entry); tmnLogs.unshift(entry);
chrome.storage.local.set({"logs_tmn":JSON.stringify(tmnLogs)}); chrome.storage.local.set({"logs_tmn":JSON.stringify(tmnLogs)});
@ -1101,7 +1109,7 @@ TRACKMENOT.TMNSearch = function() {
function sendClickEvent() { function sendClickEvent() {
if ( prev_engine ) { if ( prev_engine ) {
cout("About to click on " + prev_engine); console.log ("About to click on " + prev_engine);
chrome.tabs.sendMessage(tmn_tab_id,{tmn_engine:getEngineById(prev_engine)}); chrome.tabs.sendMessage(tmn_tab_id,{tmn_engine:getEngineById(prev_engine)});
} }
} }
@ -1109,7 +1117,7 @@ TRACKMENOT.TMNSearch = function() {
function handleRequest(request, sender, sendResponse) { function handleRequest(request, sender, sendResponse) {
if (request.tmnLog) { if (request.tmnLog) {
cout("Background logging : " + request.tmnLog); console.log ("Background logging : " + request.tmnLog);
var logtext = JSON.parse(request.tmnLog); var logtext = JSON.parse(request.tmnLog);
log(logtext); log(logtext);
sendResponse({}); sendResponse({});
@ -1121,7 +1129,7 @@ TRACKMENOT.TMNSearch = function() {
return; return;
} }
/*if (request.userSearch) { /*if (request.userSearch) {
cout("Detected User search") console.log ("Detected User search")
enterBurst(request.userSearch); enterBurst(request.userSearch);
sendResponse({}); sendResponse({});
return; return;
@ -1135,7 +1143,7 @@ TRACKMENOT.TMNSearch = function() {
return; return;
} }
if ( request.setURLMap) { if ( request.setURLMap) {
cout("Background handling : " + request.setURLMap); console.log ("Background handling : " + request.setURLMap);
var vars = request.setURLMap.split('--'); var vars = request.setURLMap.split('--');
var eng = vars[0]; var eng = vars[0];
var asearch = vars[1]; var asearch = vars[1];
@ -1150,7 +1158,7 @@ TRACKMENOT.TMNSearch = function() {
sendResponse({}); sendResponse({});
return; return;
} }
//cout("Background page received message: " + request.tmn); //console.log ("Background page received message: " + request.tmn);
switch (request.tmn) { switch (request.tmn) {
case "currentURL": case "currentURL":
sendResponse({ sendResponse({
@ -1184,7 +1192,7 @@ TRACKMENOT.TMNSearch = function() {
break; break;
case "isActiveTab": case "isActiveTab":
var active = (!sender.tab || sender.tab.id==tmn_tab_id); var active = (!sender.tab || sender.tab.id==tmn_tab_id);
cout("active: "+ active); console.log ("active: "+ active);
sendResponse( sendResponse(
{"isActive": active} {"isActive": active}
); );
@ -1238,14 +1246,20 @@ TRACKMENOT.TMNSearch = function() {
stop_when = "end"; stop_when = "end";
} }
if (useRss) {
typeoffeeds.push('rss'); typeoffeeds.push('rss');
TMNQueries.rss = []; TMNQueries.rss = [];
var feeds = feedList.split('|');
if ( useRss ) { var feeds = feedList.split('|');
for (var i=0;i<feeds.length;i++) for (var i=0;i<feeds.length;i++)
doRssFetch(feeds[i]); doRssFetch(feeds[i]);
} }
if (useUserList) {
typeoffeeds.push('userlist');
TMNQueries.userlist = userList.split(",");
}
if ( useDHSList ) { if ( useDHSList ) {
readDHSList(); readDHSList();
typeoffeeds.push('dhs'); typeoffeeds.push('dhs');
@ -1332,7 +1346,7 @@ TRACKMENOT.TMNSearch = function() {
_hideTMNTab : function(tab_id) { _hideTMNTab : function(tab_id) {
if (tab_id == tmn_tab_id ) { if (tab_id == tmn_tab_id ) {
cout('TMN tab has been selected by the user, hidding it'); console.log ('TMN tab has been selected by the user, hidding it');
chrome.tabs.remove( tmn_tab_id ); chrome.tabs.remove( tmn_tab_id );
return; return;
} }
@ -1341,7 +1355,7 @@ TRACKMENOT.TMNSearch = function() {
_deleteTabWhenClosing : function(win_id) { _deleteTabWhenClosing : function(win_id) {
if (useTabe && tmn_win_id == win_id ) { if (useTabe && tmn_win_id == win_id ) {
cout('TMN win has been closed by the user, close the tab'); console.log ('TMN win has been closed by the user, close the tab');
chrome.tabs.remove( tmn_tab_id ); chrome.tabs.remove( tmn_tab_id );
return; return;
} }
@ -1351,7 +1365,7 @@ TRACKMENOT.TMNSearch = function() {
_preserveTMNTab : function(tab_id) { _preserveTMNTab : function(tab_id) {
if (tab_id == tmn_tab_id && useTab ) { if (tab_id == tmn_tab_id && useTab ) {
tmn_tab_id = -1; tmn_tab_id = -1;
cout('TMN tab has been deleted by the user, reload it'); console.log ('TMN tab has been deleted by the user, reload it');
createTab(); createTab();
return; return;
} }