Skip to content

Commit

Permalink
nightly-202402202001
Browse files Browse the repository at this point in the history
  • Loading branch information
@garfield69
garfield69 committed Feb 20, 2024
1 parent d0a9cda commit 3e1f7e6
Show file tree
Hide file tree
Showing 9 changed files with 117 additions and 54 deletions.
14 changes: 13 additions & 1 deletion css/dialogs.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,16 @@

.modal-content .table strong {
color: white;
}
}

@media (min-width: 1120px) {
/* Increase default modal size a bit but also to offset the margin added to .modal-content */
.modal-lg {
width: 1030px;
}

.modal-content {
/* Small margin prevents accidently clicking outside the modal */
margin: 10px 20px 0;
}
}
84 changes: 67 additions & 17 deletions css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ background-rotator .placeholder {
text-align: left;
line-height: 37px;
vertical-align: super;
padding-left: 25px;
padding-left: 15px;
}

.settings .buttons .btn.choose-client:hover {
Expand Down Expand Up @@ -564,7 +564,7 @@ input[type=text], input[type=url], input[type=password], input[type=number], opt
border-radius: 5px;
font-family: helvetica, sans-serif;
text-shadow: 2px 2px 2px black;
transition: all 0.5s ease-in-out;
transition: all 0.35s ease-in-out;
padding-left: 5px;
}

Expand Down Expand Up @@ -602,10 +602,9 @@ option {
}

.form-control:focus {
border-color: #222;
border-color: #66afe9;
outline: 0;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(2, 2, 2, .6);
background-color: rgba(0, 0, 0, 0.6);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px rgba(102, 175, 233,.6);
}

input[type=checkbox], input[type=radio] {
Expand Down Expand Up @@ -1153,10 +1152,55 @@ series-list .trakt-import serieheader h3, series-list .backup-import serieheader
padding: 0 5px;
}

.torrentBtns .tb-activeIcon {
margin-right: 3px;
}

.torrentBtns .tb-jackettIcon {
margin-left: 2px;
}

.torrentBtns .sort-btn {
border-color: rgba(255, 255, 255, 0.4);
}

.torrentBtns button {
display: flex;
justify-content: center;
align-items: center;
}

.torrentBtns loading-spinner {
margin: 0 0 0 3px;
width: 20px;
height: 20px;
position: relative;
}

.torrentDialog_topNav {
display: flex;
flex-flow: row nowrap;
margin-bottom: 3px;
}

.torrentDialog_qualityBtns {
flex-shrink: 0;
}

.torrentDialog_searchBar {
width: 54%;
width: -webkit-fill-available;
}

.torrentDialog_searchBar .input-group-btn button {
background-color: rgba(55, 55, 55, 0.3);
border: 1px solid rgba(255, 255, 255, 0.4);
}

.torrentDialog_searchBar .input-group-btn button:hover {
background-color: rgba(60, 60, 60, 0.6);
}

.torrent-dialog, .subtitle-dialog {
display: inline-block;
list-style: none;
Expand Down Expand Up @@ -2125,7 +2169,7 @@ sidepanel h2 {
color: #fff;
margin-top: 13px;
margin-bottom: 0;
font-size: 28px;
font-size: 26px;
}

sidepanel .buttons {
Expand All @@ -2149,7 +2193,7 @@ sidepanel .buttons strong {

sidepanel .buttons a {
display: block;
padding: 12px;
padding: 11px 12px;
margin: 5px 15px;
border: 1px solid #fff;
border-radius: 9px;
Expand Down Expand Up @@ -2210,6 +2254,10 @@ sidepanel .buttons a.no-hover {
text-decoration: none;
}

sidepanel .buttons a.no-hover:hover, sidepanel .buttons a.no-hover:hover span {
text-decoration: none;
}

sidepanel .buttons i.glyphicon {
float: left;
font-size: 22px;
Expand Down Expand Up @@ -2323,7 +2371,6 @@ sidepanel .buttons .two-face-torrent .download {
}

sidepanel .buttons .two-face-torrent .auto-download {
padding: 12px 10px;
margin: 0px;
border-left: 0px;
border-bottom-left-radius: 0;
Expand All @@ -2332,7 +2379,8 @@ sidepanel .buttons .two-face-torrent .auto-download {
}

sidepanel .buttons .two-face-torrent .torrent-settings {
padding: 15px 10px;
padding-left: 10px;
padding-right: 10px;
margin: 0;
}

Expand All @@ -2349,7 +2397,8 @@ sidepanel .buttons .torrent-mini-remote-control>span {

sidepanel .buttons .torrent-mini-remote-control a {
margin: 0 1px;
padding: 5px;
padding: 4px 6px;
border-radius: 6px;
}

sidepanel .buttons .torrent-mini-remote-control a i.glyphicon {
Expand Down Expand Up @@ -2380,7 +2429,7 @@ sidepanel .serie-overview .mark-button .left-glyph i {

sidepanel .serie-overview .mark-button .right-text-glyph {
width: 100%;
text-align: center
text-align: center;
}

sidepanel .serie-overview .mark-button .right-text-glyph span {
Expand All @@ -2392,6 +2441,7 @@ sidepanel .serie-overview .mark-button .right-text-glyph i {
font-size: 14px;
color: white !important;
left: -1px;
margin-left: 2px;
}

sidepanel h1 {
Expand Down Expand Up @@ -2681,8 +2731,8 @@ sidepanel .seasons serieheader {
}

.setting-divider {
margin-top: 22.5px;
margin-bottom: 22.5px;
margin-top: 18px;
margin-bottom: 18px;
}

.settings .label {
Expand Down Expand Up @@ -2745,10 +2795,10 @@ sidepanel .seasons serieheader {
}

.smallsettingicon {
width: 34px;
height: 34px;
margin-left: -5px;
margin-top: -5px;
width: 30px;
height: 30px;
margin-left: -4px;
margin-top: -4px;
float: left;
}

Expand Down
2 changes: 1 addition & 1 deletion js/directives/torrentDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ DuckieTV
serie: '=serie',
episode: '=episode'
},
template: '<a class="torrent-dialog" ng-click="openDialog()" uib-tooltip="{{getTooltip()}}"><i class="glyphicon glyphicon-download"></i><span ng-transclude></span></a>',
template: '<a class="torrent-dialog" ng-click="openDialog()" uib-tooltip="{{getTooltip()}}"><i class="glyphicon glyphicon-download"></i><strong ng-transclude></strong></a>',
controller: ['$scope',
function($scope) {
// Translates the tooltip
Expand Down
18 changes: 13 additions & 5 deletions js/services/TorrentSearchEngines/GenericTorrentSearchEngine.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,8 @@ function GenericTorrentSearchEngine(config, $q, $http, $injector) { // eslint-di
}

/**
* Execute a generic torrent search, parse the results and return them as an array
*/
* Execute a generic torrent search, parse the results and return them as an array
*/
this.search = function(what, noCancel, orderBy) {
what = what.replace(/'/g, '')
var d = $q.defer()
Expand All @@ -309,11 +309,19 @@ function GenericTorrentSearchEngine(config, $q, $http, $injector) { // eslint-di
d.reject(E)
}
}, function(err) {
if (err.status == -1) {
d.reject("net::ERR_NO_RESPONSE. see console log for details.")
if (err.status === -1) {
d.reject('net::ERR_NO_RESPONSE. see console log for details.')
}

// cloudflare challenge, the page needs to be opened normally for the challenge to be complete which
// will allow future requests for a short time
if (err.status === 403 && err.data?.includes('challenge-platform')) {
d.reject('status 403 - cloudflare challenge, see console log for details.')
console.warn('Cloudflare challege detected, open url or torrent website in new tab to solve challenge', err.config?.url)
}

if (err.status > 300) {
if (err.status == 404) {
if (err.status === 404) {
d.resolve([])
} else if (config.mirrorResolver && config.mirrorResolver !== null) {
$injector.get(config.mirrorResolver).findMirror().then(function(result) {
Expand Down
39 changes: 18 additions & 21 deletions templates/dialogs/torrent2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,32 @@ <h1 translate-value-itemslength="{{items.length || 0}}" translate>TORRENTDIALOG2
<a ui-sref="settings.tab({tab: 'torrent-search'})" ng-click="close()"> <i class="glyphicon glyphicon-cog"></i> <span translate-once>COMMON/torrent-search-settings/glyph</span></a>
</div>

<div style="width:52%; display:inline-block;">
<div class="input-group">
<div class="torrentDialog_topNav">
<div class="input-group torrentDialog_searchBar">
<input type="text" ng-model="query" ng-model-options="{debounce: 500}" focus-watch='searching' ng-change="search(query)" class="form-control" translate-once-placeholder="COMMON/type-your-search/lbl">
<span class="input-group-btn">
<button class="btn btn-default" style="height: 40px">
<i class="glyphicon glyphicon-search" ng-click="search(query)" uib-tooltip="{{'TORRENTDIALOG2/search-now/tooltip'|translate}}" tooltip-append-to-body="true"></i>
<button class="btn btn-default" style="height: 40px" ng-click="search(query)" uib-tooltip="{{'TORRENTDIALOG2/search-now/tooltip'|translate}}" tooltip-append-to-body="true">
<i class="glyphicon glyphicon-search"></i>
</button>
</span>
</div>
</div>
<!-- quality list -->
<div class="torrentBtns" style="display:inline-block; vertical-align: top;">
<div class="btn-group">
<button type="button" class="btn btn-default" ng-class="{active: searchquality == ''}" ng-click="setQuality('');" translate-once>COMMON/all/btn</button>
<button ng-repeat="quality in getSetting('torrenting.searchqualitylist') " ng-click="setQuality(quality)" type="button" class="btn btn-default" ng-class="{active: searchquality == quality}">{{quality}}</button>

<div class="torrentBtns torrentDialog_qualityBtns">
<div class="btn-group">
<button type="button" class="btn btn-default" ng-class="{active: searchquality == ''}" ng-click="setQuality('');" translate-once>COMMON/all/btn</button>
<button ng-repeat="quality in getSetting('torrenting.searchqualitylist') " ng-click="setQuality(quality)" type="button" class="btn btn-default" ng-class="{active: searchquality == quality}">{{quality}}</button>
</div>
</div>
</div>

<!-- active search engines list -->
<div style="padding-bottom: 3px" uib-collapse="!showAdvanced">
<div class="torrentBtns btn-group">
<button ng-disabled="name === defaultProvider" type="button" class="btn btn-default" ng-repeat="name in clients | orderBy: name" ng-click="toggleSE(name)" ng-style="{color: name !== defaultProvider ? 'white' : 'gray'}">
<i class="glyphicon glyphicon-{{activeSE[name] ? 'ok' : 'remove'}}"></i>
<i class="tb-activeIcon glyphicon glyphicon-{{activeSE[name] ? 'ok' : 'remove'}}"></i>
&nbsp;{{::name}}&nbsp;
<i ng-if="isJackett(name)" class="glyphicon glyphicon-jackett-small" style="float:right"></i>
<loading-spinner ng-show="searchingSE[name]" style="margin:0 auto; display:block; width:20px; height:20px; position:relative;"></loading-spinner>
<i ng-if="isJackett(name)" class="tb-jackettIcon glyphicon glyphicon-jackett-small" style="float:right"></i>
<loading-spinner ng-show="searchingSE[name]"></loading-spinner>
</button>
</div>
</div>
Expand Down Expand Up @@ -79,7 +79,7 @@ <h1 translate-value-itemslength="{{items.length || 0}}" translate>TORRENTDIALOG2
</div>

<!-- search results -->
<div style="max-height: 620px;overflow-x: auto">
<div style="max-height: 660px; overflow-x: auto">
<table class="torrents table table-condensed white" style="max-height: 800px;overflow-x: auto">
<thead>
<tr ng-show="searching">
Expand All @@ -104,13 +104,10 @@ <h2 style='text-align:center' translate-once>COMMON/type-your-search/lbl</h2>
</tr>
</tbody>
<tbody ng-show="!searching && error != false && error != 'null' ">
<tr>
<th style='text-align:center'>:(</th>
<th style='text-align:left;white-space:pre-wrap;'>{{errorEngine}}</th>
<th style='text-align:left;white-space:pre-wrap;'>{{error}}</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<tr style="font-size: 12px;">
<td style='text-align:center'>:(</td>
<td style='text-align:left;white-space:pre-wrap;'>{{errorEngine}}</td>
<td style='text-align:left;white-space:pre-wrap;' colspan="4">{{error}}</td>
</tr>
</tbody>
<tbody ng-show="!searching && items.length > 0">
Expand Down
4 changes: 1 addition & 3 deletions templates/sidepanel/episode-details.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,10 @@ <h5 style="text-align: center;">{{::sidepanel.episode.firstaired | date: 'medium
<torrent-dialog class="download" episode='sidepanel.episode' serie="sidepanel.serie">
<strong style="padding-left:21px" translate-once>SIDEPANEL/EPISODE-DETAILS/find-torrent/btn</strong>
</torrent-dialog>
<span class="sr-only" translate-once>COMMON/split-button/sr</span>
</td>
<td style="padding-right:6px">
<a class="auto-download" ng-click="sidepanel.autoDownload(episode)" uib-tooltip="{{'COMMON/auto-download/lbl'|translate}}">
<i class="glyphicon glyphicon-cloud-download"></i><strong style="display:flex">&nbsp;</strong>
<span class="sr-only" translate-once>COMMON/split-button/sr</span>
</a>
</td>
<td style="padding-right:15px">
Expand All @@ -76,7 +74,7 @@ <h5 style="text-align: center;">{{::sidepanel.episode.firstaired | date: 'medium
</tr>
<tr ng-if="getSetting('torrenting.enabled') && sidepanel.episode.magnetHash">
<td colspan="2" class="buttons">
<a class="no-hover" >
<a class="no-hover">
<torrent-remote-control info-hash="sidepanel.episode.magnetHash" downloaded="sidepanel.episode.isDownloaded()" template-url="templates/sidepanel/torrentRemoteControl.html"></torrent-remote-control>
</a>
</td>
Expand Down
2 changes: 0 additions & 2 deletions templates/sidepanel/episodes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,12 @@ <h2 style='border-bottom:1px solid white;padding:5px;margin-top:10px' translate-
<td style="width:100%;padding-left:20px">
<a class="download" ng-click="season.autoDownloadAll()">
<i class="glyphicon glyphicon-cloud-download"></i><strong translate-once>SIDEPANEL/EPISODES/auto-download-all/lbl</strong>
<span class="sr-only" translate-once>COMMON/split-button/sr</span>
</a>
</td>
<td style="padding-right:20px">
<torrent-dialog class="auto-download" q='season.getSeasonSearchString(sidepanel.serie,season.season)'>
<strong style="display:flex">&nbsp;</strong>
</torrent-dialog>
<span class="sr-only" translate-once>COMMON/split-button/sr</span>
</td>
</tr>
</table>
Expand Down
4 changes: 2 additions & 2 deletions templates/sidepanel/mark-downloaded.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<i class="glyphicon glyphicon-floppy-{{sidepanel.episode.downloaded ? 'saved' : 'disk'}}"></i>
</td>
<td class="right-text-glyph">
<strong><span translate-once>COMMON/mark-as/lbl</span>&nbsp;</strong>
<strong translate-once>COMMON/mark-as/lbl</strong>
<i class="glyphicon glyphicon-floppy-{{sidepanel.episode.downloaded ? 'disk' : 'saved'}}"></i>
</td>
</tr>
</table>
</a>
</a>
4 changes: 2 additions & 2 deletions templates/sidepanel/mark-watched.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<i class="glyphicon glyphicon-eye-{{sidepanel.episode.watched ? 'open' : 'close'}}"></i>
</td>
<td class="right-text-glyph">
<strong><span translate-once>COMMON/mark-as/lbl</span>&nbsp;</strong>
<strong translate-once>COMMON/mark-as/lbl</strong>
<i class="glyphicon glyphicon-eye-{{sidepanel.episode.watched ? 'close' : 'open'}}"></i>
</td>
</tr>
</table>
</a>
</a>

0 comments on commit 3e1f7e6

Please sign in to comment.