+
+
Search Filters
+
+
+
+
+
Your Subscription list is currently empty. Start adding subscriptions
diff --git a/src/js/events.js b/src/js/events.js
index 66b1d6b81..4d5e3ce35 100644
--- a/src/js/events.js
+++ b/src/js/events.js
@@ -73,7 +73,6 @@ let playPauseVideo = function (event) {
* Handle keyboard shortcut commands.
*/
let videoShortcutHandler = function (event) {
-
if (event.which == 68 && event.altKey === true) {
$('#search').focus();
}
diff --git a/src/js/history.js b/src/js/history.js
index 01bc5df45..4df612414 100644
--- a/src/js/history.js
+++ b/src/js/history.js
@@ -25,12 +25,30 @@ along with FreeTube. If not, see .
*
* @return {Void}
*/
-function addToHistory(videoId){
- const data = {
- videoId: videoId,
- timeWatched: new Date().getTime(),
- };
- historyDb.insert(data, (err, newDoc) => {});
+function addToHistory(data){
+ historyDb.findOne({ videoId: data.videoId }, function (err, doc) {
+ if(doc === null) {
+ historyDb.insert(data, (err, newDoc) => {});
+ } else {
+ historyDb.update(
+ { videoId: data.videoId },
+ {
+ videoId: data.videoId,
+ author: data.author,
+ authorId: data.authorId,
+ published: data.published,
+ publishedText: data.publishedText,
+ description: data.description,
+ viewCount: data.viewCount,
+ title: data.title,
+ description: data.description,
+ lengthSeconds: data.lengthSeconds,
+ videoThumbnails: data.videoThumbnails,
+ type: 'video',
+ timeWatched: data.timeWatched,
+ }, {}, (err, newDoc) => {});
+ }
+ });
}
/**
@@ -62,23 +80,38 @@ function showHistory(){
historyDb.find({}).sort({
timeWatched: -1
}).exec((err, docs) => {
-
- if (docs.length < 100) {
- for (let i = 0; i < docs.length; i++) {
- invidiousAPI('videos', docs[i].videoId, {}, (data) => {
- data.position = i;
- displayVideo(data, 'history');
- });
- }
- }
- else{
- for (let i = 0; i < 100; i++) {
- invidiousAPI('videos', docs[i].videoId, {}, (data) => {
- data.position = i;
- displayVideo(data, 'history');
- });
- }
- }
+ docs.forEach((video, index) => {
+ if (video.authorId === undefined) {
+ // History data is from old version of FreeTube, update data for future calls.
+ invidiousAPI('videos', video.videoId, {}, (data) => {
+ let publishedText = new Date(data.published * 1000);
+ publishedText = dateFormat(publishedText, "mmm dS, yyyy");
+ let videoData = {
+ videoId: video.videoId,
+ published: data.published,
+ publishedText: publishedText,
+ description: data.description,
+ viewCount: data.viewCount,
+ title: data.title,
+ lengthSeconds: data.lengthSeconds,
+ videoThumbnails: data.videoThumbnails[4].url,
+ author: data.author,
+ authorId: data.authorId,
+ liveNow: false,
+ paid: false,
+ type: 'video',
+ timeWatched: video.timeWatched,
+ };
+ addToHistory(videoData);
+ videoData.position = index;
+ displayVideo(videoData, 'history');
+ });
+ }
+ else{
+ video.position = index;
+ displayVideo(video, 'history');
+ }
+ });
loadingView.seen = false;
});
diff --git a/src/js/init.js b/src/js/init.js
index 927d86a47..059d43a70 100644
--- a/src/js/init.js
+++ b/src/js/init.js
@@ -24,7 +24,8 @@ const {
app,
BrowserWindow,
dialog,
- protocol
+ protocol,
+ ipcMain
} = require('electron');
const path = require('path');
const url = require('url');
@@ -163,6 +164,17 @@ let init = function () {
const menu = Menu.buildFromTemplate(template);
Menu.setApplicationMenu(menu);
+
+ /**
+ * Sets proxy when setProxy event is sent from renderer
+ *
+ * example data "SOCKS5://127.0.0.1:9050"
+ */
+ ipcMain.on("setProxy", (_e, data) => {
+ win.webContents.session.setProxy({ proxyRules: data }, function () {
+ win.webContents.send("proxyAvailable")
+ });
+ });
};
/**
diff --git a/src/js/layout.js b/src/js/layout.js
index 11deecaeb..eff376204 100644
--- a/src/js/layout.js
+++ b/src/js/layout.js
@@ -38,18 +38,6 @@ const shell = electron.shell; // Used to open external links into the user's nat
const clipboard = electron.clipboard;
const getOpml = require('opml-to-json'); // Gets the file type for imported files.
const fs = require('fs'); // Used to read files. Specifically in the settings page.
-const tor = require('tor-request');
-
-// User Defaults
-let currentTheme = '';
-let useTor = false;
-let rememberHistory = true;
-let autoplay = true;
-let enableSubtitles = false;
-let checkForUpdates = true;
-let currentVolume = 1;
-let defaultQuality = 720;
-let defaultPlaybackRate = '1';
let dialog = electron.remote.dialog; // Used for opening file browser to export / import subscriptions.
let toastTimeout; // Timeout for toast notifications.
@@ -69,6 +57,11 @@ electron.ipcRenderer.on('ping', function(event, message) {
ft.log(message);
});
+// Listens for proxy to be set in main process
+electron.ipcRenderer.on('proxyAvailable', function(event, message) {
+ proxyAvailable = true;
+});
+
$(document).ready(() => {
const searchBar = document.getElementById('search');
const jumpToInput = document.getElementById('jumpToInput');
@@ -208,4 +201,29 @@ function showVideoOptions(element) {
} else {
element.nextElementSibling.style.display = 'none'
}
-}
\ No newline at end of file
+}
+
+/**
+ * Wrapper around AJAX calls to wait for proxy to become available
+ * @return {Void}
+ */
+function proxyRequest(callback) {
+ let proxyCheckingInterval;
+ let counter = 0;
+
+ // Wait for proxy to become available
+ proxyCheckingInterval = setInterval(function() {
+ if(proxyAvailable) {
+ clearInterval(proxyCheckingInterval)
+
+ callback();
+
+ } else {
+ if(counter > 10) {
+ clearInterval(proxyCheckingInterval);
+ showToast('Unable to connect to the Tor network. Check the help page if you\'re having trouble setting up your node.');
+ }
+ counter++;
+ }
+ }, 100);
+}
diff --git a/src/js/player.js b/src/js/player.js
index 04d489c7b..84b34b8a4 100644
--- a/src/js/player.js
+++ b/src/js/player.js
@@ -38,6 +38,7 @@ function playVideo(videoId, playlistId = '') {
playerView.valid480p = true;
playerView.video720p = undefined;
playerView.valid720p = true;
+ playerView.videoUrl = '';
playerView.embededHtml = "";
let videoHtml = '';
@@ -54,8 +55,82 @@ function playVideo(videoId, playlistId = '') {
playerView.savedIconType = 'fas saved';
}
});
- //"kpkXPy_jXmU"
- invidiousAPI('videos', videoId, {}, function (data) {
+
+ youtubedlGetInfo(videoId, (data) => {
+ console.log(data);
+
+ let videoUrls = data.formats;
+ let formatUrls = data.player_response.streamingData.adaptiveFormats;
+
+ // Search through the returned object to get the 480p and 720p video URLs (If available)
+ Object.keys(videoUrls).forEach((key) => {
+ switch (videoUrls[key]['itag']) {
+ case '18':
+ playerView.video480p = decodeURIComponent(videoUrls[key]['url']);
+ // console.log(playerView.video480p);
+ break;
+ case '22':
+ playerView.video720p = decodeURIComponent(videoUrls[key]['url']);
+ // console.log(playerView.video720p);
+ break;
+ }
+ });
+
+ // Last adaptive format will be best the quality audio stream (migrate fully to adaptive formats later)
+ playerView.videoAudio = decodeURIComponent(formatUrls[formatUrls.length - 1]['url']);
+
+ if (typeof(playerView.videoAudio) === 'undefined') {
+ console.log(playerView.videoAudio);
+ playerView.validAudio = false;
+ }
+
+ let useEmbedPlayer = false;
+
+ // Default to the embeded player if the URLs cannot be found.
+ if (typeof (playerView.video720p) === 'undefined' && typeof (playerView.video480p) === 'undefined') {
+ //useEmbedPlayer = true;
+ playerView.currentQuality = 'EMBED';
+ playerView.playerSeen = false;
+ //useEmbedPlayer = true;
+ showToast('Unable to get video file. Reverting to embeded player.');
+ }
+ else if (typeof (playerView.video720p) === 'undefined' && typeof (playerView.video480p) !== 'undefined') {
+ // Default to the 480p video if the 720p URL cannot be found.
+ console.log('Found');
+ playerView.videoUrl = playerView.video480p;
+ playerView.currentQuality = '480p';
+ } else {
+ // Default to the 720p video.
+ playerView.videoUrl = playerView.video720p;
+ playerView.currentQuality = '720p';
+ //playerView.videoUrl = playerView.liveManifest;
+ }
+
+ if (!useEmbedPlayer &&
+ typeof(data.player_response.captions) !== 'undefined' &&
+ typeof(data.player_response.captions.playerCaptionsTracklistRenderer) !== 'undefined' &&
+ typeof(data.player_response.captions.playerCaptionsTracklistRenderer.captionTracks) !== 'undefined') {
+ data.player_response.captions.playerCaptionsTracklistRenderer.captionTracks.forEach((caption) => {
+ let subtitleUrl = invidiousInstance + '/api/v1/captions/' + videoId + '?label=' + caption.name.simpleText;
+
+ videoHtml = videoHtml + '
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Your Info:
+
ip: {{checkProxyResult.ip}}
+
ip_decimal: {{checkProxyResult.ip_decimal}}
+
country: {{checkProxyResult.country}}
+
city: {{checkProxyResult.city || "N/A"}}
+
hostname: {{checkProxyResult.hostname || "N/A"}}
+
+
+
Clicking "TEST PROXY" button will send a request to https://ifconfig.co/json
+
+ {{proxyTestButtonText}}
+
+
+
+
IMPORT SUBSCRIPTIONS
diff --git a/src/templates/videoTemplate.html b/src/templates/videoTemplate.html
index 92238a641..b20a91cee 100644
--- a/src/templates/videoTemplate.html
+++ b/src/templates/videoTemplate.html
@@ -29,7 +29,7 @@
{{video.title}}
{{video.channelName}}
-
{{video.views}} {{video.viewText}} - {{video.publishedDate}}
+
{{video.views}} {{video.viewText}} - {{video.publishedDate}}
{{video.description}}
{{video.liveText}}
@@ -63,6 +65,34 @@