Code refactoring and optimise

pull/9/head
Chewbaka 6 years ago
parent bf874c3d2c
commit f993a9ec01

@ -18,7 +18,7 @@ class Controller_Rest_Browse extends Controller_Rest
));
} else {
$server = Model_Server::find(array(
'select' => array('id', 'name', 'url', 'port', 'token'),
'select' => array('*'),
'where' => array(
'id' => Input::get('server_id')
)

@ -8,29 +8,33 @@ class Controller_Rest_Movie extends Controller_Rest
{
public function get_stream()
{
$movie_id = Input::get('movie_id');
try {
$movie_id = Input::get('movie_id');
if(!$movie_id)
throw new FuelException('No movie id');
if (!$movie_id)
throw new FuelException('No movie id');
$movie = Model_Movie::find_by_pk($movie_id);
$movie = Model_Movie::find_by_pk($movie_id);
if(!$movie)
throw new FuelException('No movie found');
if (!$movie)
throw new FuelException('No movie found');
$user_settings = Model_Settings::find_one_by('user_id', Session::get('user')->id);
$user_settings = Model_Settings::find_one_by('user_id', Session::get('user')->id);
if($movie->type !== 'movie')
$episodes = $movie->getSeason()->getEpisodes();
else
$episodes = [$movie];
if ($movie->type !== 'movie')
$episodes = $movie->getSeason()->getEpisodes();
else
$episodes = [$movie];
$view = View::forge('stream/index');
$view = View::forge('stream/index');
$view->set('user_settings', $user_settings);
$view->set('movie', $movie);
$view->set('episodes', $episodes);
$view->set('user_settings', $user_settings);
$view->set('movie', $movie);
$view->set('episodes', $episodes);
return $this->response($view->render());
return $this->response($view->render());
} catch (Exception $exception) {
return $this->response($exception->getMessage(), 500);
}
}
}

@ -43,8 +43,8 @@ echo \Asset::js(isset($js_bottom) ? $js_bottom : null);
echo \Asset::js(['bootstrap.min.js']);
?>
<script>
$(document).ready(function () {
$('[data-toggle="tooltip"]').tooltip({ container: 'body'});
$(window).on('load', function() {
$('[data-toggle="tooltip"]').tooltip({ container: 'body', template: '<div class="tooltip Tooltip-tooltipPortal-1IUlb"><div class="tooltip-arrow"></div><div class="tooltip-inner Tooltip-tooltip-2AL-W"></div></div>'});
});
</script>
</body>

@ -266,7 +266,8 @@
}).done(function (view) {
launchPlayer(view);
}).fail(function (data) {
console.error(data);
console.error(data.responseText);
show_alert('error', data.responseText);
});
});
/** LOADING PICTURE **/

@ -5,7 +5,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<?php
echo \Asset::css(['normalize.css', 'plex.css', 'main.css']);
echo \Asset::js('jquery.min.js');
echo \Asset::js(['jquery.min.js']);
?>
<link rel="shortcut icon"
href="//assets.plex.tv/deploys/desktop/env-eb2798cc3c7d9533df5b563963d5c394/3.34.1-b51c37a/favicon.ico">

@ -11,5 +11,4 @@
'MenuServer' => isset($MenuServer) ? $MenuServer : null,
'js_bottom' => isset($js_bottom) ? $js_bottom : null,
]); ?>
<!-- Created By Chewbaka69 // https://github.com/Chewbaka69/PlexShare -->
</html>

@ -85,5 +85,6 @@
</div>
</div>
</div>
<devBy style="display: none;">Created By Chewbaka69 // https://github.com/Chewbaka69/PlexShare</devBy>
</body>
</html>

@ -96,7 +96,7 @@
<div class="PrePlayMetadataInnerContent-innerContent-1BPzw">
<div class="PrePlayPrimaryTitle-primaryTitle-1r9P9">
<div class="PrePlayLeftTitle-leftTitle-Ev1KG">
<a title="<?php echo $movie->title; ?>" href="#" role="link" class=" Link-link-2XYrU Link-default-32xSO"><?php echo $movie->title; ?></a>
<a title="<?php echo $movie->title; ?>" href="#" role="link" class=" Link-link-2XYrU Link-default-32xSO"><i class="plex-icon-marketing-dvr-560" style="text-decoration: none"></i> <?php echo $movie->title; ?></a>
</div>
</div>
<div class="PrePlaySecondaryTitle-secondaryTitle-YJRGC PrePlayPrimaryTitle-primaryTitle-1r9P9"
@ -132,6 +132,7 @@
</div>
<div class="PrePlayRightTitle-rightTitle-VxiwU">
<span>
<a style="text-decoration: none; color: #fff;"><i class="plex-icon-tag-auto-560"></i></a>
<?php if(isset($movie->metadata['Genre'])) :?>
<?php foreach ($movie->metadata['Genre'] as $genre) : ?>
<?php $genre = isset($movie->metadata['Genre']['@attributes']) ? $movie->metadata['Genre'] : $genre; ?>

@ -123,5 +123,6 @@
$('#password').pwstrength();
});
</script>
<devBy style="display: none;">Created By Chewbaka69 // https://github.com/Chewbaka69/PlexShare</devBy>
</body>
</html>

@ -1,3 +1,5 @@
<!DOCTYPE html>
<html data-cast-api-enabled="true" lang="en">
<head>
<title>PlexShare :: Settings</title>
<meta charset="utf-8">
@ -5,6 +7,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<?php
echo \Asset::css(['normalize.css', 'plex.css', 'settings.css']);
echo \Asset::css(isset($css) ? $css : null);
echo \Asset::js('jquery.min.js');
?>
<link rel="shortcut icon"
@ -39,7 +42,7 @@
</div>
<script>
$(window).on('load', function() {
$('[data-toggle="tooltip"]').tooltip({ container: 'body'});
$('[data-toggle="tooltip"]').tooltip({ container: 'body', template: '<div class="tooltip Tooltip-tooltipPortal-1IUlb"><div class="tooltip-arrow"></div><div class="tooltip-inner Tooltip-tooltip-2AL-W"></div></div>'});
});
</script>
<?php

@ -15,9 +15,4 @@
}
.AudioVideoFullPlayer-topBar-2XUGM{
transform: translateY(0);
}
.vjs-controls-disabled .vjs-control-bar,
.vjs-controls-disabled .vjs-modal-dialog,
.vjs-controls-disabled .vjs-modal-dialog {
display: none;
}

@ -90,7 +90,10 @@ body {
outline: none;
border: 0;
border-radius: 0;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
background: none;
background-color: rgba(0, 0, 0, 0);
text-align: inherit;
text-decoration: none;
cursor: pointer;
@ -101,7 +104,7 @@ body {
-ms-user-select: none;
user-select: none;
touch-action: manipulation;
-webkit-tap-highlight-color: transparent
-webkit-tap-highlight-color: transparent;
}
.Link-link-2XYrU:hover {
@ -1012,6 +1015,14 @@ body {
color: hsla(0, 0%, 100%, .15)
}
.QuickSearchHubContainer-hubTitle-2B0GD {
margin:9px 0 6px 24px;
height:18px;
color:hsla(0,0%,100%,.3);
font-size:12px;
font-family:Open Sans Bold,Helvetica Neue,Helvetica,Arial,sans-serif
}
.MenuContainer-menu-3Gtlw {
font-size: 13px;
font-family: Open Sans Semibold, Helvetica Neue, Helvetica, Arial, sans-serif;
@ -5669,6 +5680,36 @@ a:hover .DisclosureArrow-disclosureArrow-1sBFv, button:hover .DisclosureArrow-di
background: #eee
}
.QuickSearchPlaceholderLink-placeholder-1Wxzp {
display:-webkit-box;
display:-webkit-flex;
display:flex;
-webkit-box-align:center;
-webkit-align-items:center;
align-items:center;
overflow:hidden;
padding:4px 10px 4px 24px;
width:346px;
height:44px;
border-top-right-radius:4px;
border-bottom-right-radius:4px;
color:hsla(0,0%,100%,.75);
font-size:13px;
font-family:Open Sans Semibold,Helvetica Neue,Helvetica,Arial,sans-serif;
-webkit-transition:color .2s,background-color .2s;
transition:color .2s,background-color .2s
}
.QuickSearchPlaceholderLink-placeholder-1Wxzp:hover {
background-color:hsla(0,0%,100%,.05);
color:#fff
}
.QuickSearchPlaceholderLink-isPlaceholderSelected-rDCpK {
background-color:hsla(0,0%,100%,.08);
color:#fff
}
.QuickSearchInput-closeIcon-3AV1c, .QuickSearchInput-searchIcon-1f6m9 {
margin: 4px 10px 0 5px;
font-size: 12px
@ -5803,6 +5844,26 @@ a:hover .DisclosureArrow-disclosureArrow-1sBFv, button:hover .DisclosureArrow-di
pointer-events: none
}
.QuickSearchResult-overlay-38WrL {
position:absolute;
top:0;
left:0;
display:block;
width:100%;
height:100%;
display:-webkit-box;
display:-webkit-flex;
display:flex;
-webkit-box-align:center;
-webkit-align-items:center;
align-items:center;
-webkit-box-orient:horizontal;
-webkit-box-direction:normal;
-webkit-flex-direction:row;
flex-direction:row;
padding:4px 10px 4px 24px
}
.QuickSearchResult-button-1ZHpO a, .QuickSearchResult-button-1ZHpO button {
pointer-events: all
}
@ -5819,6 +5880,15 @@ a:hover .DisclosureArrow-disclosureArrow-1sBFv, button:hover .DisclosureArrow-di
background-color: hsla(0, 0%, 100%, .08)
}
.QuickSearchResult-underlay-QgyJt {
position: absolute;
top: 0;
left: 0;
display: block;
width: 100%;
height: 100%;
}
.QuickSearchResult-link-3JPgF {
position: absolute;
top: 0;

Loading…
Cancel
Save