From 2257f532eb3a81c6cb8d0e26dfa0f679f24bfa1b Mon Sep 17 00:00:00 2001 From: Jan Grewe <jan@faked.org> Date: Sun, 22 Jun 2014 19:42:25 +0200 Subject: [PATCH] put images for movies and shows in separate folders --- api.php | 35 +++++++++++++++++++++++------------ cache/dummy | 0 fanart/dummy | 0 logo/dummy | 0 poster/dummy | 0 5 files changed, 23 insertions(+), 12 deletions(-) delete mode 100644 cache/dummy delete mode 100644 fanart/dummy delete mode 100644 logo/dummy delete mode 100644 poster/dummy diff --git a/api.php b/api.php index e133b68..887a71d 100644 --- a/api.php +++ b/api.php @@ -55,12 +55,18 @@ if ($_GET['get'] == 'movies' && $_GET['limit'] && isset($_GET['offset'])) { if ($_GET['get'] == 'poster' && (!empty($_GET['show']) || !empty($_GET['movie']))) { + if(isset($_GET['show'])) { + $type = 'show'; + }else{ + $type = 'movie'; + } + if($_GET['show'] && $_GET['season']) - $poster = get_absolute_path('poster/'.cleanName($_GET['show']).'-S'.$_GET['season'].'.jpg'); + $poster = get_absolute_path('poster/'.$type.'/'.cleanName($_GET['show']).'-S'.$_GET['season'].'.jpg'); elseif($_GET['show']) - $poster = get_absolute_path('poster/'.cleanName($_GET['show']).'.jpg'); + $poster = get_absolute_path('poster/'.$type.'/'.cleanName($_GET['show']).'.jpg'); else - $poster = get_absolute_path('poster/'. cleanName($_GET['movie']).'.jpg'); + $poster = get_absolute_path('poster/'.$type.'/'.cleanName($_GET['movie']).'.jpg'); if(!file_exists($poster)) { @@ -98,11 +104,13 @@ if ($_GET['get'] == 'poster' && (!empty($_GET['show']) || !empty($_GET['movie']) if ($_GET['get'] == 'fanart' && (!empty($_GET['show']) || !empty($_GET['movie']))) { - if($_GET['show']) - $fanart = get_absolute_path('fanart/'. cleanName($_GET['show']).'.jpg'); - else - $fanart = get_absolute_path('fanart/'. cleanName($_GET['movie']).'.jpg'); - + if(isset($_GET['show'])) { + $type = 'show'; + }else{ + $type = 'movie'; + } + + $fanart = get_absolute_path('fanart/'.$type.'/'. cleanName($_GET[$type]).'.jpg'); if(!file_exists($fanart)) { @@ -139,10 +147,13 @@ if ($_GET['get'] == 'fanart' && (!empty($_GET['show']) || !empty($_GET['movie']) if ($_GET['get'] == 'logo' && (!empty($_GET['show']) || !empty($_GET['movie']))) { - if($_GET['show']) - $logo = get_absolute_path('logo/'.cleanName($_GET['show']).'.png'); - else - $logo = get_absolute_path('logo/'.cleanName($_GET['movie']).'.png'); + if(isset($_GET['show'])) { + $type = 'show'; + }else{ + $type = 'movie'; + } + + $logo = get_absolute_path('logo/'.cleanName($_GET[$type]).'.png'); if(!file_exists($logo)) { diff --git a/cache/dummy b/cache/dummy deleted file mode 100644 index e69de29..0000000 diff --git a/fanart/dummy b/fanart/dummy deleted file mode 100644 index e69de29..0000000 diff --git a/logo/dummy b/logo/dummy deleted file mode 100644 index e69de29..0000000 diff --git a/poster/dummy b/poster/dummy deleted file mode 100644 index e69de29..0000000 -- GitLab