From 0d0e4dc6aff2457dffe6ed168b7fcabfcbdb99b4 Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Sat, 16 Jul 2022 18:15:17 +0300 Subject: [PATCH 001/140] Update popcorn-time.rb --- casks/popcorn-time.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/casks/popcorn-time.rb b/casks/popcorn-time.rb index 9fa47b6bbc..b1ed59f5fa 100644 --- a/casks/popcorn-time.rb +++ b/casks/popcorn-time.rb @@ -22,7 +22,7 @@ end if MacOS.version < :monterey || ENV["HOMEBREW_POPCORN_TIME_BUILD"] == "false" - sha256 "97cc4984614f87285edc4afe98ee82ac2b1ba7879b5561a497cff8401f4ba0ec" + sha256 "7fd9fb25734f7587d60349c29b8a7d425e677f08cb0e981452e98e7a2db4a942" url "#{homepage}/build/#{zip}" else From e76dea74f0237ce0fda76efd672fed6286ce0039 Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Sun, 17 Jul 2022 15:48:33 +0300 Subject: [PATCH 002/140] Update loading.js --- src/app/lib/views/player/loading.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/lib/views/player/loading.js b/src/app/lib/views/player/loading.js index 505d9138ae..b32c8127aa 100644 --- a/src/app/lib/views/player/loading.js +++ b/src/app/lib/views/player/loading.js @@ -131,7 +131,9 @@ $('.loading').css({'height': '0', 'width': '0'}); this.ui.minimizeIcon.hide(); this.ui.maximizeIcon.show(); - $('.filter-bar').show(); + if (!App.ViewStack.includes('settings-container-contain')) { + $('.filter-bar').show(); + } Mousetrap.bind(['esc', 'backspace'], function(e) { App.vent.trigger('show:closeDetail'); App.vent.trigger('movie:closeDetail'); From fa5127d18f9369b80ee6d59beca26cab053ddabe Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Sun, 17 Jul 2022 15:49:02 +0300 Subject: [PATCH 003/140] Update loading.styl --- src/app/styl/views/loading.styl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/styl/views/loading.styl b/src/app/styl/views/loading.styl index 28a78be559..85054a4e0f 100644 --- a/src/app/styl/views/loading.styl +++ b/src/app/styl/views/loading.styl @@ -1,5 +1,6 @@ .loading position: absolute + z-index: 9 background-color: $BgColor1 -webkit-user-select: none width 100% From c4e50c9db3fc416ece3719349c693904da5712bc Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Sun, 17 Jul 2022 16:50:15 +0300 Subject: [PATCH 004/140] Update list.js --- src/app/lib/views/browser/list.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/app/lib/views/browser/list.js b/src/app/lib/views/browser/list.js index 6e8d06396b..8fd4492495 100644 --- a/src/app/lib/views/browser/list.js +++ b/src/app/lib/views/browser/list.js @@ -262,9 +262,15 @@ Mousetrap.bind('i', function () { if ((App.PlayerView === undefined || App.PlayerView.isDestroyed) && $('#player').children().length <= 0) { - $('.filter-bar').hide(); - $('#header').addClass('header-shadow'); - App.vent.trigger('about:show'); + if (!App.ViewStack.includes('about')) { + $('.filter-bar').hide(); + App.vent.trigger('about:show'); + } else { + if (!App.ViewStack.includes('settings-container-contain')) { + $('.filter-bar').show(); + } + App.vent.trigger('about:close'); + } } }, 'keydown'); }, From ae9fd6c47a05adf2f856e5f879649af43b788d2a Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Sun, 17 Jul 2022 17:23:38 +0300 Subject: [PATCH 005/140] Update about.styl --- src/app/lib/views/about.js | 4 ---- src/app/lib/views/browser/list.js | 14 ++++---------- src/app/styl/views/about.styl | 8 ++++---- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/app/lib/views/about.js b/src/app/lib/views/about.js index e8cbbadcc2..2a023bbcf4 100644 --- a/src/app/lib/views/about.js +++ b/src/app/lib/views/about.js @@ -25,10 +25,6 @@ onBeforeDestroy: function () { Mousetrap.unbind(['esc', 'backspace']); - if (!App.ViewStack.includes('settings-container-contain')) { - $('.filter-bar').show(); - $('#header').removeClass('header-shadow'); - } $('#movie-detail').show(); }, diff --git a/src/app/lib/views/browser/list.js b/src/app/lib/views/browser/list.js index 8fd4492495..f4a9dde555 100644 --- a/src/app/lib/views/browser/list.js +++ b/src/app/lib/views/browser/list.js @@ -261,16 +261,10 @@ }, 'keydown'); Mousetrap.bind('i', function () { - if ((App.PlayerView === undefined || App.PlayerView.isDestroyed) && $('#player').children().length <= 0) { - if (!App.ViewStack.includes('about')) { - $('.filter-bar').hide(); - App.vent.trigger('about:show'); - } else { - if (!App.ViewStack.includes('settings-container-contain')) { - $('.filter-bar').show(); - } - App.vent.trigger('about:close'); - } + if (!App.ViewStack.includes('about')) { + App.vent.trigger('about:show'); + } else { + App.vent.trigger('about:close'); } }, 'keydown'); }, diff --git a/src/app/styl/views/about.styl b/src/app/styl/views/about.styl index 4af9eec3ad..2e8654673b 100644 --- a/src/app/styl/views/about.styl +++ b/src/app/styl/views/about.styl @@ -1,5 +1,5 @@ .about-container - z-index 10 + z-index 14 height 100% width 100% position fixed @@ -154,7 +154,7 @@ background rgba(0,0,0,.8) display none position fixed - top 32px + top 0px width 100vw height 100vh z-index 2 @@ -162,7 +162,7 @@ .title font-size 24px padding 0 0 20px - margin-top 5vh + margin-top 10vh color #fff font-family $AlternateFont text-align center @@ -171,7 +171,7 @@ color #efefef text-align justify font-family $AlternateFont - width 70% + width 60% height 70% margin 0 auto margin-top 2vh From e7f3ee49c53928714b38424f5b3c98ffb7ddb7b2 Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Sun, 17 Jul 2022 17:27:12 +0300 Subject: [PATCH 006/140] Update about.styl --- src/app/styl/views/about.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/styl/views/about.styl b/src/app/styl/views/about.styl index 2e8654673b..6dbe1b706a 100644 --- a/src/app/styl/views/about.styl +++ b/src/app/styl/views/about.styl @@ -171,7 +171,7 @@ color #efefef text-align justify font-family $AlternateFont - width 60% + width 65% height 70% margin 0 auto margin-top 2vh From 99942b6412f60ad9e050f0871aec5ed6ca8a050f Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Sun, 17 Jul 2022 19:05:03 +0300 Subject: [PATCH 007/140] Update streamer.js --- src/app/lib/streamer.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/lib/streamer.js b/src/app/lib/streamer.js index 328c65e6fe..d8d65d8ef4 100644 --- a/src/app/lib/streamer.js +++ b/src/app/lib/streamer.js @@ -610,6 +610,8 @@ } else { state = 'ready'; // file can be played } + this.streamInfo.updateInfos(); + this.torrentModel.off('change'); } else if (torrentModel.downloaded) { if (torrentModel.downloadSpeed) { state = 'downloading'; // is actively downloading From 881266d3291d19350eb48777d8837c6eae74e77b Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Mon, 18 Jul 2022 01:00:07 +0300 Subject: [PATCH 008/140] Update main_window.js --- src/app/lib/views/main_window.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/lib/views/main_window.js b/src/app/lib/views/main_window.js index a967659dab..ec176b2ed2 100644 --- a/src/app/lib/views/main_window.js +++ b/src/app/lib/views/main_window.js @@ -360,7 +360,7 @@ policy.ignore(); }); - App.vent.trigger('updatePostersSizeStylesheet'); + this.updatePostersSizeStylesheet(true); App.vent.trigger('main:ready'); }, @@ -623,14 +623,16 @@ $(window).trigger('resize'); }, - updatePostersSizeStylesheet: function() { + updatePostersSizeStylesheet: function(start) { var that = this; - App.db .getSetting({ key: 'postersWidth' }) .then(function(doc) { + if (!doc || (doc.value === 134 && start)) { + return; + } var postersWidth = doc.value; var postersHeight = Math.round( postersWidth * Settings.postersSizeRatio @@ -654,7 +656,7 @@ '.list .items .item .cover,', '.load-more {', - 'background-size: cover;', + 'background-size: ', postersWidth, 'px ', postersHeight, 'px;', 'width: ', postersWidth, 'px;', From b926405c001d985bc51ef0171ae0df05f94eaf75 Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Mon, 18 Jul 2022 01:16:35 +0300 Subject: [PATCH 009/140] Update main_window.js --- src/app/lib/views/main_window.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/lib/views/main_window.js b/src/app/lib/views/main_window.js index ec176b2ed2..d4e87a3934 100644 --- a/src/app/lib/views/main_window.js +++ b/src/app/lib/views/main_window.js @@ -630,7 +630,7 @@ key: 'postersWidth' }) .then(function(doc) { - if (!doc || (doc.value === 134 && start)) { + if (!doc || (parseInt(doc.value) === 134 && start)) { return; } var postersWidth = doc.value; From 553b83b4166268510bbbf6535a98e41044210757 Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Mon, 18 Jul 2022 14:06:09 +0300 Subject: [PATCH 010/140] Update seedbox.styl --- src/app/styl/views/seedbox.styl | 16 +++------------- src/app/styl/views/torrent_collection.styl | 2 +- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/app/styl/views/seedbox.styl b/src/app/styl/views/seedbox.styl index 1ea6c64008..87e1c1a838 100644 --- a/src/app/styl/views/seedbox.styl +++ b/src/app/styl/views/seedbox.styl @@ -276,35 +276,25 @@ li.file-item, li.result-item - border-bottom 1px solid rgba(255, 255, 255, 0) background $FileSelectorBg text-align left cursor pointer color $FileSelectorText - height 46px + height 44px padding-left 34px - padding-top 14px + padding-top 13px padding-right 50px margin-right -2px &:hover backdrop-filter contrast(80%) - border-bottom 1px solid rgba(255, 255, 255, 0) &.unselected opacity 0.3 background none - border-bottom 1px solid rgba(255, 255, 255, 0.1) &:hover opacity 0.6 - border-bottom 1px solid rgba(255, 255, 255, 0.04) - - &:last-child - border-bottom 1px solid rgba(255, 255, 255, 0) - - &:last-child - border-bottom 1px solid rgba(255, 255, 255, 0) .filesize color rgba($FileSelectorText, 0.6) @@ -344,7 +334,7 @@ color rgba($FileSelectorText, 0.4) transition all 0.3s cursor pointer - top -17px + top -18px &:hover color $CloseButtonHover diff --git a/src/app/styl/views/torrent_collection.styl b/src/app/styl/views/torrent_collection.styl index 9dc12f1a13..2cc19aabd4 100644 --- a/src/app/styl/views/torrent_collection.styl +++ b/src/app/styl/views/torrent_collection.styl @@ -288,7 +288,7 @@ text-align left cursor pointer color $SettingsText1 - height 46px + height 44px padding-left 40px padding-right 50px font-family $MainFont From ed16d0f53442619817e9ffc09b14e2a5c138588e Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Mon, 18 Jul 2022 14:41:27 +0300 Subject: [PATCH 011/140] Update build.yml --- .github/workflows/build.yml | 60 ------------------------------------- 1 file changed, 60 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1393e981b9..57ef411b40 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -140,18 +140,6 @@ jobs: asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}.pkg asset_content_type: application/octet-stream - - name: Upload Release Asset [macOS-update] - if: startsWith(github.ref, 'refs/tags/v') - continue-on-error: true - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./macOS-latest/update-${{ steps.get_version.outputs.VERSION }}-osx64.zip - asset_name: update-${{ steps.get_version.outputs.VERSION }}-osx64.zip - asset_content_type: application/octet-stream - - name: Upload Release Asset [ubuntu-deb-amd64] if: startsWith(github.ref, 'refs/tags/v') continue-on-error: true @@ -176,18 +164,6 @@ jobs: asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-linux64.zip asset_content_type: application/octet-stream - - name: Upload Release Asset [ubuntu-update-x64] - if: startsWith(github.ref, 'refs/tags/v') - continue-on-error: true - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./ubuntu-latest/update-${{ steps.get_version.outputs.VERSION }}-linux64.zip - asset_name: update-${{ steps.get_version.outputs.VERSION }}-linux64.zip - asset_content_type: application/octet-stream - - name: Upload Release Asset [ubuntu-deb-i386] if: startsWith(github.ref, 'refs/tags/v') continue-on-error: true @@ -212,18 +188,6 @@ jobs: asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-linux32.zip asset_content_type: application/octet-stream - - name: Upload Release Asset [ubuntu-update-x32] - if: startsWith(github.ref, 'refs/tags/v') - continue-on-error: true - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./ubuntu-latest/update-${{ steps.get_version.outputs.VERSION }}-linux32.zip - asset_name: update-${{ steps.get_version.outputs.VERSION }}-linux32.zip - asset_content_type: application/octet-stream - - name: Upload Release Asset [windows-zip-x64] if: startsWith(github.ref, 'refs/tags/v') continue-on-error: true @@ -271,27 +235,3 @@ jobs: asset_path: ./windows-latest/Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-win32-Setup.exe asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-win32-Setup.exe asset_content_type: application/octet-stream - - - name: Upload Release Asset [window-update-x64] - if: startsWith(github.ref, 'refs/tags/v') - continue-on-error: true - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./windows-latest/update-${{ steps.get_version.outputs.VERSION }}-win64.zip - asset_name: update-${{ steps.get_version.outputs.VERSION }}-win64.zip - asset_content_type: application/octet-stream - - - name: Upload Release Asset [window-update-ia32] - if: startsWith(github.ref, 'refs/tags/v') - continue-on-error: true - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./windows-latest/update-${{ steps.get_version.outputs.VERSION }}-win32.zip - asset_name: update-${{ steps.get_version.outputs.VERSION }}-win32.zip - asset_content_type: application/octet-stream From 2784863a5f29a605c18535c42499f9a07fb82b08 Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Mon, 18 Jul 2022 15:24:43 +0300 Subject: [PATCH 012/140] Update gulpfile.js --- gulpfile.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index af25770e94..5247c6bb19 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -710,12 +710,7 @@ gulp.task( 'deb', 'mac-pkg', 'nsis', - 'prepareUpdater', - 'prepareUpdater:win', - 'compressUpdater', 'cleanForDist', - 'clean:updater', - 'clean:updater:win', function(done) { // default task code here done(); From 9256f8ef97b0fe3b251e28099eb2a037c5a508c9 Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Mon, 18 Jul 2022 16:17:01 +0300 Subject: [PATCH 013/140] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 03a0cd3a8b..5eb50e3824 100644 --- a/README.md +++ b/README.md @@ -56,9 +56,6 @@ Also, if you keep a [_Brewfile_](https://github.com/Homebrew/homebrew-bundle#usa cask "popcorn-time" #, args: { "no-quarantine": true } ~~~ -Update from _zip_ file: - * Unpack the contents of the zip file. This should leave you with a file named `update.tar`. Unpacking the .tar file should get you a folder named `Content`. Navigate to your `Application` folder, right click on Popcorn Time and press `Show Package Content` then replace the `Content` folder there with the `Content` folder from the `update.zip` - ### Linux - Debian/Ubuntu based distros: Download and install: From 383d080cbe54e5fec735d535a1bf79dd55d1cc4e Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Mon, 18 Jul 2022 17:34:57 +0300 Subject: [PATCH 014/140] Update list.styl --- src/app/styl/views/browser/list.styl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/styl/views/browser/list.styl b/src/app/styl/views/browser/list.styl index dc76898780..b31b2ac35a 100644 --- a/src/app/styl/views/browser/list.styl +++ b/src/app/styl/views/browser/list.styl @@ -95,7 +95,7 @@ z-index: 1; .loading-container - margin: 180px auto 0px + margin: 50vh auto 0px opacity: .8; .default-frame .list @@ -106,4 +106,4 @@ margin-top $FilterBarHeight .items_movie &::-webkit-scrollbar-track - margin-top $FilterBarHeight \ No newline at end of file + margin-top $FilterBarHeight From c34dd6bacddc37545b7f6149ec842b2d69da9680 Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Mon, 18 Jul 2022 20:38:36 +0300 Subject: [PATCH 015/140] Update settings-container.tpl --- src/app/settings.js | 2 +- src/app/templates/settings-container.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/settings.js b/src/app/settings.js index 83f6542c38..cd5c19b18e 100644 --- a/src/app/settings.js +++ b/src/app/settings.js @@ -125,7 +125,7 @@ Settings.showAdvancedSettings = true; Settings.language = ''; Settings.contentLanguage = ''; Settings.contentLangOnly = false; -Settings.translateTitle = 'translated-origin'; +Settings.translateTitle = 'translated'; Settings.translateEpisodes = true; Settings.translateSynopsis = true; Settings.translatePosters = true; diff --git a/src/app/templates/settings-container.tpl b/src/app/templates/settings-container.tpl index 0bc1ee00b0..762eea7b14 100644 --- a/src/app/templates/settings-container.tpl +++ b/src/app/templates/settings-container.tpl @@ -219,10 +219,10 @@

<%= i18n.__("Title translation") %>

From 649e0197c236259a85b84fce478b20de9ea5ec36 Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Sat, 23 Jul 2022 12:54:08 +0300 Subject: [PATCH 016/140] Stop unnecessary event handlers --- src/app/bootstrap.js | 1 + src/app/lib/views/movie_detail.js | 2 +- src/app/lib/views/show_detail.js | 2 +- src/app/lib/views/torrent_collection.js | 2 +- src/app/templates/torrent-list.tpl | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/bootstrap.js b/src/app/bootstrap.js index cbcb70a0c8..c5e9529551 100644 --- a/src/app/bootstrap.js +++ b/src/app/bootstrap.js @@ -29,6 +29,7 @@ script.src = 'lib/providers/' + file; script.onload = function() { + this.onload = null; win.info('loaded', file); q.resolve(file); }; diff --git a/src/app/lib/views/movie_detail.js b/src/app/lib/views/movie_detail.js index adb0839b21..c82d72ffb2 100644 --- a/src/app/lib/views/movie_detail.js +++ b/src/app/lib/views/movie_detail.js @@ -106,7 +106,7 @@ this.icons.getLink(provider, torrent.provider) .then((icon) => torrent.icon = icon || '/src/app/images/icons/' + torrent.provider + '.png') .catch((error) => { !torrent.icon ? torrent.icon = '/src/app/images/icons/' + torrent.provider + '.png' : null; }) - .then(() => $('.source-link').html(``)); + .then(() => $('.source-link').html(``)); $('.source-link').show().attr('data-original-title', torrent.source.split('//').pop().split('/')[0]); } else { $('.source-link').html(''); diff --git a/src/app/lib/views/show_detail.js b/src/app/lib/views/show_detail.js index 1ae31d442c..208b75b10b 100644 --- a/src/app/lib/views/show_detail.js +++ b/src/app/lib/views/show_detail.js @@ -945,7 +945,7 @@ this.icons.getLink(showProvider, provider) .then((icon) => providerIcon = icon || '/src/app/images/icons/' + provider + '.png') .catch((error) => { !providerIcon ? providerIcon = '/src/app/images/icons/' + provider + '.png' : null; }) - .then(() => $('.source-icon').html(``)); + .then(() => $('.source-icon').html(``)); $('.source-icon').show().attr('data-original-title', sourceURL.split('//').pop().split('/')[0]); } else { $('.source-icon').html(''); diff --git a/src/app/lib/views/torrent_collection.js b/src/app/lib/views/torrent_collection.js index 2bb870f8fe..d45600a0e9 100644 --- a/src/app/lib/views/torrent_collection.js +++ b/src/app/lib/views/torrent_collection.js @@ -339,7 +339,7 @@ $('.onlinesearch-info>ul.file-list').append( '
  • '+ '' + item.title + ''+ - '
    '+ + '
    '+ '
    '+item.seeds+' / '+item.peers+'
    '+ '
    '+item.size+'
    '+ '
    • ' diff --git a/src/app/templates/torrent-list.tpl b/src/app/templates/torrent-list.tpl index 4268e5c76b..3f21e11b4f 100644 --- a/src/app/templates/torrent-list.tpl +++ b/src/app/templates/torrent-list.tpl @@ -1,7 +1,7 @@ <%_.each(torrents, function(torrent, k) { %> - + From f90ac7d822de8a992fd470b06861158ad622781a Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Sun, 24 Jul 2022 11:43:21 +0300 Subject: [PATCH 017/140] Fix 'Show all available subtitles for the default subtitle language' option --- src/app/lib/subtitle/generic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/lib/subtitle/generic.js b/src/app/lib/subtitle/generic.js index 2d14567d3e..2d0b3e5ec4 100644 --- a/src/app/lib/subtitle/generic.js +++ b/src/app/lib/subtitle/generic.js @@ -28,7 +28,7 @@ var vname = path.basename(vpath).substring(0, path.basename(vpath).lastIndexOf(vext)); // video file name var folder = path.dirname(vpath); // cwd var furl = data.url; // subtitle url - var fpath = path.join(folder, vname + '.' + data.lang); // subtitle local path, no extension + var fpath = path.join(folder, vname + '.' + data.lang.substr(0,2)); // subtitle local path, no extension request.get(furl).on('response', function (response) { var rtype = (response.headers['content-type'] || '').split(';')[0].trim(); // response type From c39325564bac7cce739d7131ed2053428063eec2 Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Sun, 24 Jul 2022 13:06:26 +0300 Subject: [PATCH 018/140] Update movie_detail.js --- src/app/lib/views/movie_detail.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/lib/views/movie_detail.js b/src/app/lib/views/movie_detail.js index c82d72ffb2..4b392d8257 100644 --- a/src/app/lib/views/movie_detail.js +++ b/src/app/lib/views/movie_detail.js @@ -167,11 +167,11 @@ var images = this.model.get('images'); var p = this.model.get('image') || - images.poster || + (images ? images.poster : null) || this.model.get('poster') || noimg; var b = - images.fanart || + (images ? images.fanart : null) || this.model.get('backdrop') || this.model.get('poster') || nobg; From a509d34910ee6e033b46e4c210b85672d327227a Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Sun, 24 Jul 2022 13:07:18 +0300 Subject: [PATCH 019/140] Update movie_detail.styl --- src/app/styl/views/movie_detail.styl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/styl/views/movie_detail.styl b/src/app/styl/views/movie_detail.styl index e596b7eb4f..c3a83ab534 100644 --- a/src/app/styl/views/movie_detail.styl +++ b/src/app/styl/views/movie_detail.styl @@ -41,6 +41,7 @@ .mcover-image float: right width: 100% + height: 100% max-width: 50vh max-height: 75vh position: relative From 600c55cc71832da2cfa47729728735d415e5404b Mon Sep 17 00:00:00 2001 From: Ivan Borzenkov Date: Mon, 25 Jul 2022 23:39:43 +0300 Subject: [PATCH 020/140] update torrent collection --- package.json | 2 +- yarn.lock | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 88c7f4f518..cbd06e7e53 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "socks-proxy-agent": "^6.0.0", "srt-to-vtt": "^1.1", "tar": "4.4.18", - "torrentcollection5": "1.0.4", + "torrentcollection5": "1.0.5", "trakt.tv": "7.x.x", "trakt.tv-images": "5.x.x", "trakt.tv-matcher": "7.x.x", diff --git a/yarn.lock b/yarn.lock index 0767bf1519..ffe12c198f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7141,10 +7141,10 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -thehiddenbay@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/thehiddenbay/-/thehiddenbay-1.0.1.tgz#cb4d0d9bad74473ab9fd77e784fc12e017ffc9d7" - integrity sha512-wyJGGx9F6sXS5QPuLpQRrQICmH+utO5CLgG7wGHpCLLMCVKLfbgrY7S94qbsliltYgFOcGCTbvoY/M/Iwe/Xig== +thehiddenbay@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/thehiddenbay/-/thehiddenbay-1.0.2.tgz#b8bbf07947a8999a0ff8e0b75b2690eb9c4d2e38" + integrity sha512-FT9Faj/IJKl+YxsIHQzBMNQTIYi6XsNIpcjeEbaux3eN20IokXlHkgsBfr0zz0qhfVeMFNFckjzSrmwAkXy+cA== dependencies: axios "^0.21" cheerio "^1.0.0-rc.3" @@ -7353,27 +7353,27 @@ torrent-piece@^2.0.1: resolved "https://registry.yarnpkg.com/torrent-piece/-/torrent-piece-2.0.1.tgz#a1a50fffa589d9bf9560e38837230708bc3afdc6" integrity sha512-JLSOyvQVLI6JTWqioY4vFL0JkEUKQcaHQsU3loxkCvPTSttw8ePs2tFwsP4XIjw99Fz8EdOzt/4faykcbnPbCQ== -torrentapi-wrapper3@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/torrentapi-wrapper3/-/torrentapi-wrapper3-0.0.4.tgz#65b2a7027a68a1baa3940f54022136666b442498" - integrity sha512-k4U8nss+a+VdDAcGZqHOZO6DMxA6a5GqUnCNx7e5Ko8rla0P9CK7ltK/ZlJT7qoUf84nTiD7h1R9WrQSTihgMw== +torrentapi-wrapper3@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/torrentapi-wrapper3/-/torrentapi-wrapper3-0.0.5.tgz#dae19035e6bcb31ff528be854ede4d40c01d70f9" + integrity sha512-JI71HvalZYRFg3og+Jg1R81TusU2oCw2rnINNPoB9V+RuyaRq7t4t9drTupQo0eSLjaK/WE4n6aDOKBoTtHhMg== dependencies: got "11.x.x" -torrentcollection5@1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/torrentcollection5/-/torrentcollection5-1.0.4.tgz#bce5fed3c3b3b09349b8f89ae77ac873226622e9" - integrity sha512-/kBs7AF+Hr7kiGBqPeti4ENM3j/iJwuxFLXJ9tx5mKB9P+CO9JUQ+QUzFjB29sU0OkACJN+U/I+8iZSUjJiS5g== +torrentcollection5@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/torrentcollection5/-/torrentcollection5-1.0.5.tgz#bb9cbcc9bf137d3d479be39bf3a176ebd0c4302c" + integrity sha512-ovKMx5nkBGunQMCQvKXhTwvCKZVzG9li/mN3dxBr3xOW83Zrq6OYji1rHF1NVAu5SxfSbwu64W73EumS3tO4Dw== dependencies: - thehiddenbay "1.0.1" - torrentapi-wrapper3 "0.0.4" - torrentgalaxy "1.0.3" + thehiddenbay "1.0.2" + torrentapi-wrapper3 "0.0.5" + torrentgalaxy "1.0.4" xtorrent-pt "1.0.1" -torrentgalaxy@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/torrentgalaxy/-/torrentgalaxy-1.0.3.tgz#b0ecf55610bd3594e007ba15bf8a37f42b663b4d" - integrity sha512-QXwQjUdY9EuVhqEqX14HNwLmzQsJ+K2bL/DvOg95PX4AXrBiXHQ2gSzYwK+oZ4/FQgPKRSrLdYNvWMubudk/Pg== +torrentgalaxy@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/torrentgalaxy/-/torrentgalaxy-1.0.4.tgz#1b5f34b5bb7f44435feeff64dbf4c0aba2ac9946" + integrity sha512-69mExFGw20yLes6kjYa9/+tyYwyBVuMRK+e85ycOq06uln+WYoc4q8JAfUgL9Ti0Ud1inebo4gpVcmaIthQJew== dependencies: axios "^0.21" cheerio "^1.0.0-rc.3" From 582a7f5495af8f82b005271a0d29501762cd0f31 Mon Sep 17 00:00:00 2001 From: kiriles90 <38388670+kiriles90@users.noreply.github.com> Date: Mon, 25 Jul 2022 23:55:17 +0300 Subject: [PATCH 021/140] Add Source link to the Torrent Collection search results --- src/app/lib/views/torrent_collection.js | 26 ++++++++++++++++++++++-- src/app/templates/torrent_collection.tpl | 2 +- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/app/lib/views/torrent_collection.js b/src/app/lib/views/torrent_collection.js index d45600a0e9..7c732cc32f 100644 --- a/src/app/lib/views/torrent_collection.js +++ b/src/app/lib/views/torrent_collection.js @@ -13,7 +13,8 @@ 'click .file-item a': 'openFileSelector', 'contextmenu .file-item > *:not(.torrent-icon)': 'openMagnet', 'click .result-item': 'onlineOpen', - 'contextmenu .result-item > *': 'openMagnet', + 'contextmenu .result-item > *:not(.item-icon)': 'openMagnet', + 'mousedown .result-item .item-icon img': 'openSource', 'mousedown .item-delete': 'deleteItem', 'mousedown .item-rename': 'renameItem', 'click .magnet-icon': 'openMagnet', @@ -150,6 +151,7 @@ provider: 'thepiratebay.org', icon: 'tpb', title: item.title, + url: item.url, magnet: item.magnet, seeds: item.seed, peers: item.leech, @@ -187,6 +189,7 @@ provider: '1337x.to', icon: 'T1337x', title: item.Name, + url: item.Url, magnet: item.Magnet, seeds: item.Seeders, peers: item.Leechers, @@ -224,6 +227,7 @@ provider: 'rarbg.to', icon: 'rarbg', title: item.title, + url: item.info_page, magnet: item.download, seeds: item.seeders, peers: item.leechers, @@ -261,6 +265,7 @@ provider: 'torrentgalaxy.to', icon: 'TorrentGalaxy', title: item.title, + url: item.url, magnet: item.magnet, seeds: item.seed, peers: item.leech, @@ -337,7 +342,7 @@ onlineAddItem: function (item) { $('.onlinesearch-info>ul.file-list').append( - '
  • '+ + '
  • '+ '' + item.title + ''+ '
    '+ '
    '+item.seeds+' / '+item.peers+'
    '+ @@ -440,6 +445,23 @@ Common.openOrClipboardLink(e, torrentFile, i18n.__('torrent file'), false, true); }, + openSource: function(e) { + this.$('.tooltip').css('display', 'none'); + e.preventDefault(); + e.stopPropagation(); + var sourceLink; + if (e.currentTarget.parentNode.className.indexOf('file-item') !== -1) { + // stored + var _file = e.currentTarget.parentNode.innerText, + file = _file.substring(0, _file.length - 2); // avoid ENOENT + sourceLink = fs.readFileSync(collection + file, 'utf8'); + } else { + // search result + sourceLink = e.currentTarget.parentNode.parentNode.attributes['data-source'].value; + } + Common.openOrClipboardLink(e, sourceLink, i18n.__('source link')); + }, + deleteItem: function (e) { this.$('.tooltip').css('display', 'none'); e.preventDefault(); diff --git a/src/app/templates/torrent_collection.tpl b/src/app/templates/torrent_collection.tpl index 030331a942..7bb05f8115 100644 --- a/src/app/templates/torrent_collection.tpl +++ b/src/app/templates/torrent_collection.tpl @@ -57,7 +57,7 @@ <%=i18n.__("Saved Torrents") %>
    • <%=torrent.title %> <%=torrent.seed || torrent.seeds || 0 %> / <%=torrent.peer || torrent.peers || 0 %> <%=torrent.quality %>