preparing for v1.4

This commit is contained in:
Rpsl 2022-12-25 00:23:51 +02:00
parent 491dcb791b
commit 4a35e0ea81
3 changed files with 50 additions and 51 deletions

View File

@ -1,11 +1,11 @@
// 'use strict';
chrome.runtime.onInstalled.addListener(function() {
chrome.runtime.onInstalled.addListener(function () {
// https://stackoverflow.com/questions/19377262/regex-for-youtube-url
chrome.contextMenus.create({
id: 'metube',
title: "Send to MeTube",
targetUrlPatterns: [
'https://www.youtube.com/*',
'https://www.youtube.com/*',
'https://m.youtube.com/*',
'https://youtu.be/*'
],
@ -14,16 +14,19 @@ chrome.runtime.onInstalled.addListener(function() {
// Set sane defaults for click behaviors at extension install time
chrome.storage.sync.set({
"clickBehavior": "go-to-metube",
"clickBehavior": "send-current-url",
"contextMenuClickBehavior": "context-menu-send-current-url-and-switch"
});
});
function sendVideoUrlToMetube(videoUrl, metubeUrl, callback) {
console.log("Sending videoUrl=" + videoUrl + " to metubeUrl=" + metubeUrl);
if (typeof callback !== 'function'){
callback = function(){};
if (typeof callback !== 'function') {
callback = function () {
};
}
fetch(metubeUrl + "/add", {
method: 'POST',
headers: {
@ -35,72 +38,70 @@ function sendVideoUrlToMetube(videoUrl, metubeUrl, callback) {
"url": videoUrl
})
})
.then(response=>response.json())
.then(function (response) {
if (response.status === 'ok') {
callback();
}
else {
console.log("Ran into an error when submitting URL to meTube: " + response.msg);
}
})
.catch(e => console.log("Ran into an unexpected error: " + e));
.then(response => response.json())
.then(function (response) {
if (response.status === 'ok') {
callback();
}
})
.catch(e => console.log("Ran into an unexpected error: " + e));
}
chrome.contextMenus.onClicked.addListener(function(item, tab) {
chrome.storage.sync.get(['metube', 'contextMenuClickBehavior'], function(data) {
chrome.contextMenus.onClicked.addListener(function (item, tab) {
chrome.storage.sync.get(['metube', 'contextMenuClickBehavior'], function (data) {
if (data === undefined || !data.hasOwnProperty('metube') || data.metube === "") {
openTab(chrome.runtime.getURL('options.html'), tab);
return
}
let needToSwitch = (data.contextMenuClickBehavior === 'context-menu-send-current-url-and-switch');
sendVideoUrlToMetube(item.linkUrl, data.metube, function() {
if (!needToSwitch) {
return;
sendVideoUrlToMetube(item.linkUrl, data.metube, function () {
if (needToSwitch) {
openTab(data.metube, tab);
}
openTab(data.metube, tab);
});
});
});
chrome.action.onClicked.addListener(function(tab) {
chrome.storage.sync.get(['metube', 'clickBehavior'], function(data) {
chrome.action.onClicked.addListener(function (tab) {
chrome.storage.sync.get(['metube', 'clickBehavior'], function (data) {
if (data === undefined || !data.hasOwnProperty('metube') || data.metube === "") {
openTab(chrome.runtime.getURL('options.html'), tab);
return
}
let needToSwitch = (data.clickBehavior === 'send-current-url-and-switch');
if (data.clickBehavior == 'do-nothing') {
return
} else if (data.clickBehavior == 'go-to-metube') {
console.log("Going to Metube URL...");
if (data.clickBehavior === 'go-to-metube') {
openTab(data.metube, tab);
} else {
chrome.tabs.query({
active: true,
lastFocusedWindow: true
}, function(tabs) {
// use this tab to get the youtube video URL
let videoUrl = tabs[0].url;
sendVideoUrlToMetube(videoUrl, data.metube, function() {
if (!needToSwitch) {
return;
}
openTab(data.metube, tab);
});
});
return;
}
let needToSwitch = (data.clickBehavior === 'send-current-url-and-switch');
chrome.tabs.query({
active: true,
lastFocusedWindow: true
}, function (tabs) {
// use this tab to get the youtube video URL
let videoUrl = tabs[0].url;
sendVideoUrlToMetube(videoUrl, data.metube, function () {
if (!needToSwitch) {
openTab(data.metube, tab);
}
});
});
});
});
function openTab(url, currentTab) {
chrome.tabs.query({
url: url + "/*"
}, function(tabs) {
}, function (tabs) {
if (tabs.length !== 0) {
chrome.tabs.update(tabs[0].id, {
'active': true
}, () => {});
}, () => {
});
} else {
chrome.tabs.create({
url: url,

View File

@ -35,7 +35,6 @@
<br>
<h4>When you left-click on the extension icon, you'd like it to:</h4>
<input type="radio" name="click-behavior" id="do-nothing" value="do-nothing"><label for="do-nothing">Do Nothing</label><br>
<input type="radio" name="click-behavior" id="go-to-metube" value="go-to-metube"><label for="go-to-metube">Go to MeTube URL</label><br>
<input type="radio" name="click-behavior" id="send-current-url" value="send-current-url"><label for="send-current-url">Send current tab URL to MeTube (no tab switch)</label><br>
<input type="radio" name="click-behavior" id="send-current-url-and-switch" value="send-current-url-and-switch"><label for="send-current-url-and-switch">Send current tab URL to MeTube and switch to MeTube</label><br>

View File

@ -6,9 +6,7 @@ async function saveOptions() {
}
let sites = document.getElementById("additional").value;
let clickBehavior = document.querySelector('input[name="click-behavior"]:checked').value;
let contextMenuClickBehavior = document.querySelector('input[name="context-menu-click-behavior"]:checked').value;
chrome.storage.sync.set({
@ -54,19 +52,20 @@ async function restoreOptions() {
'clickBehavior',
'contextMenuClickBehavior'
], function (data) {
if (data.metube != undefined) {
if (data.metube !== undefined) {
document.getElementById("metube").value = data.metube;
}
if (data.sites != undefined) {
if (data.sites !== undefined) {
document.getElementById("additional").value = data.sites;
}
if (data.clickBehavior != undefined) {
alert(data.clickBehavior);
if (data.clickBehavior !== undefined) {
document.getElementById(data.clickBehavior).checked = true;
}
if (data.contextMenuClickBehavior != undefined) {
if (data.contextMenuClickBehavior !== undefined) {
document.getElementById(data.contextMenuClickBehavior).checked = true;
}
})