linuxserver/Heimdall
1
0
Fork 0
mirror of https://github.com/linuxserver/Heimdall.git synced 2025-11-03 06:22:39 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Normalise classname to remove non alpha chars

Browse Source
This commit is contained in:
Chris
2018-10-29 15:12:47 +00:00
parent 21c1401859
commit 2507cda94c
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Application.php
View File

@@ -30,7 +30,10 @@ class Application extends Model
public function class() public function class()
{ {
$class = '\App\SupportedApps\\'.$this->name.'\\'.$this->name; $name = $this->name;
$name = preg_replace('/\PL/u', '', $name);
$class = '\App\SupportedApps\\'.$name.'\\'.$name;
return $class; return $class;
} }
@@ -40,7 +43,10 @@ class Application extends Model
$all = self::all(); $all = self::all();
$list['null'] = 'None'; $list['null'] = 'None';
foreach($all as $app) { foreach($all as $app) {
$list['\App\SupportedApps\\'.$app->name.'\\'.$app->name] = $app->name; $name = $app->name;
$name = preg_replace('/\PL/u', '', $name);
$list['\App\SupportedApps\\'.$name.'\\'.$name] = $app->name;
} }
return $list; return $list;
} }

8
app/Helper.php
View File

@@ -34,3 +34,11 @@ function title_color($hex)
return ' white'; return ' white';
} }
} }
function className($name)
{
$name = preg_replace('/\PL/u', '', $name);
return $name;
}

2
app/Http/Controllers/ItemController.php
View File

@@ -352,7 +352,7 @@ class ItemController extends Controller
$validapps = []; $validapps = [];
foreach($list->apps as $app) { foreach($list->apps as $app) {
$validapps[] = $app->appid; $validapps[] = $app->appid;
if(!file_exists(app_path('SupportedApps/'.$app->name))) { if(!file_exists(app_path('SupportedApps/'.className($app->name)))) {
SupportedApps::getFiles($app); SupportedApps::getFiles($app);
$application = new Application; $application = new Application;
SupportedApps::saveApp($app, $application); SupportedApps::saveApp($app, $application);

6
app/SupportedApps.php
View File

@@ -88,7 +88,7 @@ abstract class SupportedApps
mkdir(app_path('SupportedApps'), 0777, true); mkdir(app_path('SupportedApps'), 0777, true);
} }
$src = app_path('SupportedApps/'.$app->name.'.zip'); $src = app_path('SupportedApps/'.className($app->name).'.zip');
file_put_contents($src, $res->getBody()); file_put_contents($src, $res->getBody());
$zip = new \ZipArchive(); $zip = new \ZipArchive();
@@ -102,8 +102,8 @@ abstract class SupportedApps
public static function saveApp($details, $app) public static function saveApp($details, $app)
{ {
$img_src = app_path('SupportedApps/'.$details->name.'/'.$details->icon); $img_src = app_path('SupportedApps/'.className($details->name).'/'.$details->icon);
$img_dest = public_path('storage/supportedapps/'.$details->icon); $img_dest = public_path('storage/supportedapps/'.className($details->icon));
//die("i: ".$img_src); //die("i: ".$img_src);
copy($img_src, $img_dest); copy($img_src, $img_dest);