Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Lodash by built-in ES6 methods #300

Merged
merged 2 commits into from Sep 13, 2020
Merged

Replace Lodash by built-in ES6 methods #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6374c2d
Replace Lodash by built-in ES6 methods
kellnerd Sep 13, 2020
aa9229e
Fix some old linter issues
kellnerd Sep 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 26 additions & 31 deletions batch-add-recording-relationships.user.js
View file
Open in desktop
@@ -1,7 +1,7 @@
// ==UserScript==
// @name MusicBrainz: Batch-add "performance of" relationships
// @description Batch link recordings to works from artist Recordings page.
// @version 2018.2.18.1
// @version 2020.9.12.1
// @author Michael Wiencek
// @license X11
// @downloadURL https://raw.githubusercontent.com/murdos/musicbrainz-userscripts/master/batch-add-recording-relationships.user.js
Expand Down Expand Up @@ -39,7 +39,7 @@
// authorization.
// ==/License==

var scr = document.createElement('script');
const scr = document.createElement('script');
scr.textContent = `(${batch_recording_rels})();`;
document.body.appendChild(scr);

Expand Down Expand Up @@ -304,30 +304,24 @@ function batch_recording_rels() {
function normalizeTitle(title) {
title = title.toLowerCase().replace(/\s+/g, '');

_.each(ASCII_PUNCTUATION, function (val) {
ASCII_PUNCTUATION.forEach(function (val) {
title = title.replace(val[0], val[1]);
});

return title;
}

let RECORDING_TITLES = _.chain($recordings)
.map(function (row) {
let RECORDING_TITLES = Object.fromEntries(
Array.from($recordings).map(function (row) {
let $title = $(row).find(TITLE_SELECTOR),
mbid = $title.attr('href').match(MBID_REGEX)[0],
norm_title = normalizeTitle($title.text().match(WITHOUT_PAREN_CLAUSES_REGEX)[1]);

return [mbid, norm_title];
})
.fromPairs()
.value();
);

let $work_options = _.chain(['type', 'language'])
.map(function (kind) {
return [kind, $(`<select id="bpr-work-${kind}"></select>`)];
})
.fromPairs()
.value();
let $work_options = Object.fromEntries(['type', 'language'].map(kind => [kind, $(`<select id="bpr-work-${kind}"></select>`)]));

// Add button to manage performance ARs
let $relate_table = table(
Expand Down Expand Up @@ -393,14 +387,13 @@ function batch_recording_rels() {
// Get actual work types/languages
ws_requests.unshift_get('/dialog?path=%2Fwork%2Fcreate', function (data) {
let nodes = $.parseHTML(data);
function populate($obj, kind) {
Object.entries($work_options).forEach(function populate([kind, $obj]) {
$obj.append($(`#id-edit-work\\.${kind}_id`, nodes).children())
.val(setting(`work_${kind}`) || 0)
.on('change', function () {
setting(`work_${kind}`, this.value);
});
}
_.each($work_options, populate);
});
});

$('<span></span>').append('<img src="/static/images/icons/loading.gif"/> ', $recordings_load_msg).insertBefore($relate_table);
Expand Down Expand Up @@ -553,7 +546,7 @@ function batch_recording_rels() {
}

if (recs) {
_.each(recs, extract_rec);
recs.forEach(extract_rec);
} else {
extract_rec(data);
}
Expand Down Expand Up @@ -587,7 +580,7 @@ function batch_recording_rels() {
} arid:${ARTIST_MBID}&limit=100&offset=${page * 100}&fmt=json`;

ws_requests.push_get(url, function (data) {
_.each(data.recordings, function (r) {
data.recordings.forEach(function (r) {
queue_recordings_request(`/ws/2/recording/${r.id}?inc=work-rels&fmt=json`);
});

Expand All @@ -604,7 +597,7 @@ function batch_recording_rels() {
$row.data('performances', []);
$attrs.data('checked', false).css('color', 'black');

_.each(node.relations, function (rel) {
node.relations.forEach(function (rel) {
if (rel.type.match(/performance/)) {
if (!performed) {
$row.addClass('performed');
Expand All @@ -616,7 +609,7 @@ function batch_recording_rels() {
}

let attrs = [];
_.each(rel.attributes, function (name) {
rel.attributes.forEach(function (name) {
let cannonical_name = name.toLowerCase();
let $button = $attrs.find(`span.${cannonical_name}`);

Expand All @@ -634,7 +627,7 @@ function batch_recording_rels() {
//Use the dates in "live YYYY-MM-DD" disambiguation comments

let comment = node.disambiguation;
let date = comment && comment.match && comment.match(/live(?: .+)?, ([0-9]{4}(?:-[0-9]{2}(?:-[0-9]{2})?)?)(?:\: .+)?$/);
let date = comment && comment.match && comment.match(/live(?: .+)?, ([0-9]{4}(?:-[0-9]{2}(?:-[0-9]{2})?)?)(?:: .+)?$/);
if (date) {
$attrs.find('input.date').val(date[1]).trigger('input');
}
Expand All @@ -645,12 +638,12 @@ function batch_recording_rels() {
} else {
let url = `/ws/2/recording/${node.id}?inc=releases+release-groups&fmt=json`;

var request_rec = function () {
const request_rec = function () {
$.get(url, function (data) {
let releases = data.releases;

for (let i = 0; i < releases.length; i++) {
if (_.includes(releases[i]['release-group']['secondary-types'], 'Live')) {
if (releases[i]['release-group']['secondary-types'].includes('Live')) {
$attrs.find('span.live').click();
break;
}
Expand Down Expand Up @@ -780,7 +773,7 @@ function batch_recording_rels() {
let tmp_comments = [];
let tmp_norm_titles = [];

_.each(result, function (parts) {
result.forEach(function (parts) {
let mbid = parts.slice(0, 36);
let rest = parts.slice(36).split('\u00a0');

Expand All @@ -802,7 +795,7 @@ function batch_recording_rels() {
let works = data.works;
let loaded = [];

_.each(works, function (work) {
works.forEach(function (work) {
let comment = work.disambiguation;
loaded.push(work.id + work.title + (comment ? `\u00a0${comment}` : ''));
});
Expand Down Expand Up @@ -867,7 +860,7 @@ function batch_recording_rels() {
}
};

var iid = setInterval(function () {
const iid = setInterval(function () {
let j = current++;
let norm_work_title = norm_titles[j];
let score = sim(rec_title, norm_work_title);
Expand Down Expand Up @@ -927,9 +920,11 @@ function batch_recording_rels() {
let item_key = `bpr_artists ${ARTIST_MBID}`;
localStorage.setItem(
item_key,
_.filter(localStorage.getItem(item_key).split('\n'), function (artist) {
return artist.slice(0, 36) !== mbid;
}).join('\n')
localStorage
.getItem(item_key)
.split('\n')
.filter(artist => artist.slice(0, 36) !== mbid)
.join('\n')
);
}

Expand Down Expand Up @@ -1103,7 +1098,7 @@ function batch_recording_rels() {
function create_new_work(title, callback) {
function post_edit() {
let data = `edit-work.name=${title}`;
_.each($work_options, function ($obj, kind) {
Object.entries($work_options).forEach(function ([kind, $obj]) {
if ($obj.val()) {
data += `&edit-work.${kind}_id=${$obj.val()}`;
}
Expand Down Expand Up @@ -1210,7 +1205,7 @@ function batch_recording_rels() {
if (selected('instrumental')) attrs.push('c031ed4f-c9bb-4394-8cf5-e8ce4db512ae');
if (selected('cover')) attrs.push('1e8536bd-6eda-3822-8e78-1c0f4d3d2113');

_.each(attrs, function (attr, index) {
attrs.forEach(function (attr, index) {
data[`rel-editor.rels.0.attributes.${index}.type.gid`] = attr;
});

Expand Down
18 changes: 11 additions & 7 deletions set-recording-comments.user.js
View file
Open in desktop
@@ -1,7 +1,7 @@
// ==UserScript==
// @name MusicBrainz: Set recording comments for a release
// @description Batch set recording comments from a Release page.
// @version 2019.5.10.1
// @version 2020.9.12.1
// @author Michael Wiencek
// @license X11
// @namespace 790382e7-8714-47a7-bfbd-528d0caa2333
Expand Down Expand Up @@ -41,7 +41,7 @@
// authorization.
// ==/License==

var scr = document.createElement('script');
const scr = document.createElement('script');
scr.textContent = `$(${setRecordingComments});`;
document.body.appendChild(scr);

Expand All @@ -56,7 +56,7 @@ function setRecordingComments() {
)
);

var delay = setInterval(function () {
const delay = setInterval(function () {
$tracks = $('.medium tbody tr[id]');

if ($tracks.length) {
Expand All @@ -80,7 +80,11 @@ function setRecordingComments() {
let release = location.pathname.match(MBID_REGEX)[0];

$.get(`/ws/2/release/${release}?inc=recordings&fmt=json`, function (data) {
let comments = _.map(_.map(_.flatten(_.map(data.media, 'tracks')), 'recording'), 'disambiguation');
let comments = Array.from(data.media)
.map(medium => medium.tracks)
.flat()
.map(track => track.recording)
.map(recording => recording.disambiguation);

for (let i = 0, len = comments.length; i < len; i++) {
let comment = comments[i];
Expand All @@ -93,8 +97,8 @@ function setRecordingComments() {
return;
}

var MBID_REGEX = /[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}/,
editing = false,
const MBID_REGEX = /[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}/;
let editing = false,
activeRequest = null;

$('body').on('input.rc', '.recording-comment', function () {
Expand Down Expand Up @@ -148,7 +152,7 @@ function setRecordingComments() {
$inputs.filter(':visible').val(this.value).trigger('input.rc');
});

var $submitButton = $('#submit-recording-comments').on('click', function () {
const $submitButton = $('#submit-recording-comments').on('click', function () {
if (activeRequest) {
activeRequest.abort();
activeRequest = null;
Expand Down