Skip to content

Commit 8c3dd39

Browse files
mneunomnemneunomne
authored
Merge pull request #2533 from mneunomne/master
minor fixes
2 parents 5b649ad + ac7c8eb commit 8c3dd39

File tree

12 files changed

+174
-174
lines changed

12 files changed

+174
-174
lines changed

‎assets/resources/scriptlets.js‎

Lines changed: 63 additions & 63 deletions
Large diffs are not rendered by default.

‎manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "3.21.1.1",
2+
"version": "3.21.1.3",
33
"key": "ilkggpgmkemaniponkfgnkonpajankkm",
44
"author": "Daniel C. Howe",
55
"background": {

‎platform/common/vapi-background.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
/******************************************************************************/
3030

3131
import webext from './webext.js';
32-
import { ubolog } from './console.js';
32+
import { adnlog } from './console.js';
3333
import { makeCloneable } from './adn/adn-utils.js';
3434

3535
/******************************************************************************/
@@ -1179,7 +1179,7 @@ vAPI.messaging = {
11791179
}
11801180

11811181
// Auxiliary process to main process: no handler
1182-
ubolog(
1182+
adnlog(
11831183
`vAPI.messaging.onPortMessage > unhandled request: ${JSON.stringify(request.msg)}`,
11841184
request
11851185
);

‎src/dashboard.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<a tabindex="0" class="tabButton" data-pane="links.html" data-i18n="aboutPageName"></a>
3131
<a tabindex="0" class="tabButton" data-pane="no-dashboard.html"></a>
3232
</div>
33+
<a class="wikilink fa-icon" href="https://github.com/gorhill/uBlock/wiki/Dashboard:-My-filters">book</a>
3334
<!--
3435
<span>
3536
<span class="logo"><img data-i18n-title="extName" src="img/ublock.svg" alt="uBlock Origin"></span>

‎src/js/assets.js‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import adnauseam from './adn/core.js'
2828
import dnt from './adn/dnt.js'
2929
import { broadcast } from './broadcast.js';
3030
import cacheStorage from './cachestorage.js';
31-
import { ubolog } from './console.js';
31+
import { adnlog } from './console.js';
3232
import { i18n$ } from './i18n.js';
3333
import logger from './logger.js';
3434
import * as sfp from './static-filtering-parser.js';
@@ -121,7 +121,7 @@ const resourceIsStale = (networkDetails, cacheDetails) => {
121121
if ( typeof cacheDetails.resourceTime !== 'number' ) { return false; }
122122
if ( cacheDetails.resourceTime === 0 ) { return false; }
123123
if ( networkDetails.resourceTime < cacheDetails.resourceTime ) {
124-
ubolog(`Skip ${networkDetails.url}\n\tolder than ${cacheDetails.remoteURL}`);
124+
adnlog(`Skip ${networkDetails.url}\n\tolder than ${cacheDetails.remoteURL}`);
125125
return true;
126126
}
127127
return false;
@@ -537,7 +537,7 @@ function getAssetSourceRegistry() {
537537
if ( bin instanceof Object ) {
538538
if ( bin.assetSourceRegistry instanceof Object ) {
539539
assetSourceRegistry = bin.assetSourceRegistry;
540-
ubolog('Loaded assetSourceRegistry');
540+
adnlog('Loaded assetSourceRegistry');
541541
return assetSourceRegistry;
542542
}
543543
}
@@ -549,7 +549,7 @@ function getAssetSourceRegistry() {
549549
: assets.fetchText(µb.assetsJsonPath);
550550
}).then(details => {
551551
updateAssetSourceRegistry(details.content, true);
552-
ubolog('Loaded assetSourceRegistry');
552+
adnlog('Loaded assetSourceRegistry');
553553
return assetSourceRegistry;
554554
});
555555
});
@@ -691,7 +691,7 @@ function getAssetCacheRegistry() {
691691
if ( Object.keys(assetCacheRegistry).length !== 0 ) {
692692
return console.error('getAssetCacheRegistry(): assetCacheRegistry reassigned!');
693693
}
694-
ubolog('Loaded assetCacheRegistry');
694+
adnlog('Loaded assetCacheRegistry');
695695
assetCacheRegistry = bin.assetCacheRegistry;
696696
}).then(( ) =>
697697
assetCacheRegistry
@@ -802,7 +802,7 @@ async function assetCacheRemove(pattern, options = {}) {
802802
const keys = await cacheStorage.keys(re);
803803
for ( const key of keys ) {
804804
removedContent.push(key);
805-
ubolog(`Removing stray ${key}`);
805+
adnlog(`Removing stray ${key}`);
806806
}
807807
}
808808
if ( removedContent.length !== 0 ) {
@@ -1250,7 +1250,7 @@ async function diffUpdater() {
12501250
}
12511251
}
12521252
if ( toHardUpdate.length === 0 ) { return; }
1253-
ubolog('Diff updater: cycle start');
1253+
adnlog('Diff updater: cycle start');
12541254
return new Promise(resolve => {
12551255
let pendingOps = 0;
12561256
const bc = new globalThis.BroadcastChannel('diffUpdater');
@@ -1259,7 +1259,7 @@ async function diffUpdater() {
12591259
bc.close();
12601260
resolve();
12611261
if ( typeof error !== 'string' ) { return; }
1262-
ubolog(`Diff updater: terminate because ${error}`);
1262+
adnlog(`Diff updater: terminate because ${error}`);
12631263
};
12641264
const checkAndCorrectDiffPath = data => {
12651265
if ( typeof data.text !== 'string' ) { return; }
@@ -1272,7 +1272,7 @@ async function diffUpdater() {
12721272
bc.onmessage = ev => {
12731273
const data = ev.data || {};
12741274
if ( data.what === 'ready' ) {
1275-
ubolog('Diff updater: hard updating', toHardUpdate.map(v => v.assetKey).join());
1275+
adnlog('Diff updater: hard updating', toHardUpdate.map(v => v.assetKey).join());
12761276
while ( toHardUpdate.length !== 0 ) {
12771277
const assetDetails = toHardUpdate.shift();
12781278
assetDetails.fetch = true;
@@ -1286,7 +1286,7 @@ async function diffUpdater() {
12861286
return;
12871287
}
12881288
if ( data.status === 'needtext' ) {
1289-
ubolog('Diff updater: need text for', data.assetKey);
1289+
adnlog('Diff updater: need text for', data.assetKey);
12901290
assetCacheRead(data.assetKey).then(result => {
12911291
data.text = result.content;
12921292
data.status = undefined;
@@ -1296,7 +1296,7 @@ async function diffUpdater() {
12961296
return;
12971297
}
12981298
if ( data.status === 'updated' ) {
1299-
ubolog(`Diff updater: successfully patched ${data.assetKey} using ${data.patchURL} (${data.patchSize})`);
1299+
adnlog(`Diff updater: successfully patched ${data.assetKey} using ${data.patchURL} (${data.patchSize})`);
13001300
const metadata = extractMetadataFromList(data.text, [
13011301
'Last-Modified',
13021302
'Expires',
@@ -1311,44 +1311,44 @@ async function diffUpdater() {
13111311
assetCacheSetDetails(data.assetKey, metadata);
13121312
updaterUpdated.push(data.assetKey);
13131313
} else if ( data.error ) {
1314-
ubolog(`Diff updater: failed to update ${data.assetKey} using ${data.patchPath}\n\treason: ${data.error}`);
1314+
adnlog(`Diff updater: failed to update ${data.assetKey} using ${data.patchPath}\n\treason: ${data.error}`);
13151315
} else if ( data.status === 'nopatch-yet' || data.status === 'nodiff' ) {
1316-
ubolog(`Diff updater: skip update of ${data.assetKey} using ${data.patchPath}\n\treason: ${data.status}`);
1316+
adnlog(`Diff updater: skip update of ${data.assetKey} using ${data.patchPath}\n\treason: ${data.status}`);
13171317
assetCacheSetDetails(data.assetKey, { writeTime: data.writeTime });
13181318
broadcast({
13191319
what: 'assetUpdated',
13201320
key: data.assetKey,
13211321
cached: true,
13221322
});
13231323
} else {
1324-
ubolog(`Diff updater: ${data.assetKey} / ${data.patchPath} / ${data.status}`);
1324+
adnlog(`Diff updater: ${data.assetKey} / ${data.patchPath} / ${data.status}`);
13251325
}
13261326
pendingOps -= 1;
13271327
if ( pendingOps === 0 && toSoftUpdate.length !== 0 ) {
1328-
ubolog('Diff updater: soft updating', toSoftUpdate.map(v => v.assetKey).join());
1328+
adnlog('Diff updater: soft updating', toSoftUpdate.map(v => v.assetKey).join());
13291329
while ( toSoftUpdate.length !== 0 ) {
13301330
bc.postMessage(toSoftUpdate.shift());
13311331
pendingOps += 1;
13321332
}
13331333
}
13341334
if ( pendingOps !== 0 ) { return; }
1335-
ubolog('Diff updater: cycle complete');
1335+
adnlog('Diff updater: cycle complete');
13361336
terminate();
13371337
};
13381338
const worker = new Worker('js/diff-updater.js');
13391339
}).catch(reason => {
1340-
ubolog(`Diff updater: ${reason}`);
1340+
adnlog(`Diff updater: ${reason}`);
13411341
});
13421342
}
13431343

13441344
function updateFirst() {
1345-
ubolog('Updater: cycle start');
1346-
ubolog('Updater: prefer', updaterAuto ? 'CDNs' : 'origin');
1345+
adnlog('Updater: cycle start');
1346+
adnlog('Updater: prefer', updaterAuto ? 'CDNs' : 'origin');
13471347
updaterStatus = 'updating';
13481348
updaterFetched.clear();
13491349
updaterUpdated.length = 0;
13501350
diffUpdater().catch(reason => {
1351-
ubolog(reason);
1351+
adnlog(reason);
13521352
}).finally(( ) => {
13531353
updateNext();
13541354
});
@@ -1422,10 +1422,10 @@ async function updateNext() {
14221422
remoteServerFriendly = false;
14231423

14241424
if ( result.error ) {
1425-
ubolog(`Full updater: failed to update ${assetKey}`);
1425+
adnlog(`Full updater: failed to update ${assetKey}`);
14261426
fireNotification('asset-update-failed', { assetKey: result.assetKey });
14271427
} else {
1428-
ubolog(`Full updater: successfully updated ${assetKey}`);
1428+
adnlog(`Full updater: successfully updated ${assetKey}`);
14291429
updaterUpdated.push(result.assetKey);
14301430
if ( result.assetKey === 'assets.json' && result.content !== '' ) {
14311431
updateAssetSourceRegistry(result.content);
@@ -1444,9 +1444,9 @@ function updateDone() {
14441444
updaterStatus = undefined;
14451445
updaterAuto = false;
14461446
updaterAssetDelay = updaterAssetDelayDefault;
1447-
ubolog('Updater: cycle end');
1447+
adnlog('Updater: cycle end');
14481448
if ( assetKeys.length ) {
1449-
ubolog(`Updater: ${assetKeys.join()} were updated`);
1449+
adnlog(`Updater: ${assetKeys.join()} were updated`);
14501450
}
14511451
fireNotification('after-assets-updated', { assetKeys });
14521452
}

‎src/js/background.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {
3030
import { internalLinkDomainsDefault } from './adn/adn-utils.js'; // adn
3131
import { FilteringContext } from './filtering-context.js';
3232
import logger from './logger.js';
33-
import { ubologSet } from './console.js';
33+
import { adnlogSet } from './console.js';
3434

3535
/******************************************************************************/
3636

@@ -97,7 +97,7 @@ const hiddenSettingsDefault = {
9797
if ( vAPI.webextFlavor.soup.has('devbuild') ) {
9898
hiddenSettingsDefault.consoleLogLevel = 'info';
9999
hiddenSettingsDefault.cacheStorageAPI = 'unset';
100-
ubologSet(true);
100+
adnlogSet(true);
101101
}
102102

103103
const userSettingsDefault = {

0 commit comments

Comments
 (0)