diff --git a/app/Application.php b/app/Application.php
index 4a8ae835..e60e8bfe 100644
--- a/app/Application.php
+++ b/app/Application.php
@@ -9,11 +9,7 @@ class Application extends Model
//
public function icon()
{
- $path = public_path('storage/apps/'.$this->icon);
- if(!file_exists($path)) {
- Storage::putFileAs('apps', new File(app_path('Apps/'.$this->name.'/'.$this->icon)), $this->icon);
- }
- return asset('storage/apps/'.$this->icon);
+ return asset($this->icon);
}
public function defaultColour()
@@ -25,7 +21,7 @@ class Application extends Model
public function class()
{
- $class = '\App\SupportedApps\\'.$this->name;
+ $class = '\App\SupportedApps\\'.$this->name.'\\'.$this->name;
return $class;
}
}
diff --git a/app/EnhancedApps.php b/app/EnhancedApps.php
index 1e69ea87..4cc7b89a 100644
--- a/app/EnhancedApps.php
+++ b/app/EnhancedApps.php
@@ -3,9 +3,8 @@
use GuzzleHttp\Exception\GuzzleException;
use GuzzleHttp\Client;
-interface EnhancedApps {
+interface EnhancedApps
{
- public $config;
}
\ No newline at end of file
diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index f71dc863..14e99368 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -9,6 +9,7 @@ use App\User;
use GrahamCampbell\GitHub\Facades\GitHub;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
+use App\SupportedApps;
class ItemController extends Controller
{
@@ -282,17 +283,19 @@ class ItemController extends Controller
{
$output = [];
$appname = $request->input('app');
+ //die($appname);
$app_details = Application::where('name', $appname)->firstOrFail();
- $app = new $appname->class();
+ $appclass = $app_details->class();
+ $app = new $appclass;
// basic details
$output['icon'] = $app_details->icon();
$output['colour'] = $app_details->defaultColour();
// live details
- if($app_details instanceof \App\SupportedApps\EnhancedApps) {
- $output['config'] = $app->configDetails();
+ if($app instanceof \App\EnhancedApps) {
+ $output['config'] = $app_details->name.'.config';
} else {
$output['config'] = null;
}
@@ -332,18 +335,22 @@ class ItemController extends Controller
public function checkAppList()
{
- $localapps = Application::all()->pluck('name');
- $allapps = GitHub::connection('none')->repo()->contents()->show('linuxserver', 'Heimdall-Apps');
- $applist = collect($allapps)->pluck('name');
- $diff = $applist->diff($localapps);
-
- print_r($diff->all());
- foreach($allapps as $app) {
-
+ $localapps = Application::all();
+ $list = json_decode(SupportedApps::getList()->getBody());
+ foreach($list->apps as $app) {
+ if(!file_exists(app_path('SupportedApps/'.$app->name))) {
+ SupportedApps::getFiles($app);
+ $application = new Application;
+ SupportedApps::saveApp($app, $application);
+ } else {
+ // check if there has been an update for this app
+ $localapp = $localapps->where('name', $app->name)->first();
+ if($localapp->sha !== $app->sha) {
+ SupportedApps::getFiles($app);
+ SupportedApps::saveApp($app, $localapp);
+ }
+ }
}
- $files = GitHub::connection('none')->gitData()->trees()->show('linuxserver', 'Heimdall-Apps', 'eaf3659bbbc25e41501f3c540fcc7fe5da3e45c2');
- print_r($localapps);
- //print_r($appcheck);
}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index ab01f8ee..c7ae1637 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -91,6 +91,8 @@ class AppServiceProvider extends ServiceProvider
});
+ $this->app['view']->addNamespace('SupportedApps', app_path('SupportedApps'));
+
if (env('FORCE_HTTPS') === true) {
\URL::forceScheme('https');
diff --git a/app/SupportedApps.php b/app/SupportedApps.php
index d81bc07f..335c10c8 100644
--- a/app/SupportedApps.php
+++ b/app/SupportedApps.php
@@ -27,4 +27,46 @@ abstract class SupportedApps
}
+ public static function getList()
+ {
+ $list_url = 'https://apps.heimdall.site/list';
+ $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
+ return $client->request('GET', $list_url);
+ }
+
+ public static function getFiles($app)
+ {
+ $zipurl = $app->files;
+ $client = new Client(['http_errors' => false, 'timeout' => 60, 'connect_timeout' => 15]);
+ $res = $client->request('GET', $zipurl);
+
+ $src = app_path('SupportedApps/'.$app->name.'.zip');
+ file_put_contents($src, $res->getBody());
+
+ $zip = new \ZipArchive();
+ $x = $zip->open($src); // open the zip file to extract
+ if ($x === true) {
+ $zip->extractTo(app_path('SupportedApps')); // place in the directory with same name
+ $zip->close();
+ unlink($src); //Deleting the Zipped file
+ }
+ }
+
+ public static function saveApp($details, $app)
+ {
+ $img_src = app_path('SupportedApps/'.$details->name.'/'.$details->icon);
+ $img_dest = public_path('storage/supportedapps/'.$details->icon);
+ copy($img_src, $img_dest);
+
+ $app->name = $details->name;
+ $app->sha = $details->sha;
+ $app->icon = 'storage/supportedapps/'.$details->icon;
+ $app->website = $details->website;
+ $app->license = $details->license;
+ $app->description = $details->description;
+ $app->enhanced = $details->enhanced;
+ $app->tile_background = $details->tile_background;
+ $app->save();
+ }
+
}
\ No newline at end of file
diff --git a/resources/views/items/scripts.blade.php b/resources/views/items/scripts.blade.php
index 5493be37..751f98a8 100644
--- a/resources/views/items/scripts.blade.php
+++ b/resources/views/items/scripts.blade.php
@@ -13,7 +13,7 @@
source: availableTags,
select: function( event, ui ) {
$.post('/appload', { app: ui.item.value }, function(data) {
- $('#appimage').html("![](/storage/"+data.icon+")
");
+ $('#appimage').html("![]("+data.icon+")
");
$('input[name=colour]').val(data.colour);
hueb.setColor( data.colour );
$('input[name=pinned]').prop('checked', true);
diff --git a/resources/views/supportedapps/couchpotato.blade.php b/resources/views/supportedapps/couchpotato.blade.php
deleted file mode 100644
index 402deda1..00000000
--- a/resources/views/supportedapps/couchpotato.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-{{ __('app.apps.config') }} ({{ __('app.optional') }})
-
-
-
-
-
-
- {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
-
-
-
- {!! Form::text('config[apikey]', null, array('placeholder' => __('app.apps.apikey'), 'data-config' => 'apikey', 'class' => 'form-control config-item')) !!}
-
-
-
-
-
{{ __('app.apps.config') }} ({{ __('app.optional') }})
-
-
-
-
-
- {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
-
-
-
- {!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!}
-
-
-
- {!! Form::text('config[password]', null, array('placeholder' => __('app.apps.password'), 'data-config' => 'password', 'class' => 'form-control config-item')) !!}
-
-
-
-
-
{{ __('app.apps.config') }} ({{ __('app.optional') }})
-
-
-
-
- {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
-
-
-
-
- {!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!}
-
-
-
-
-
-
-
-
-
{{ __('app.apps.config') }} ({{ __('app.optional') }})
-
-
-
-
-
- {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
-
-
-
-
- {!! Form::hidden('config[enabled]', '0') !!}
-
-
-
-
-
-
{{ __('app.apps.config') }} ({{ __('app.optional') }})
-
-
-
-
- {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
-
-
-
- {!! Form::text('config[apikey]', null, array('placeholder' => __('app.apps.apikey'), 'data-config' => 'apikey', 'class' => 'form-control config-item')) !!}
-
-
-
-
-
{{ __('app.apps.config') }} ({{ __('app.optional') }})
-
-
-
-
- {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
-
-
-
-
- {!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!}
-
-
-
-
-
-
-
-
-
{{ __('app.apps.config') }} ({{ __('app.optional') }})
-
-
-
-
-
- {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
-
-
-
-
- {!! Form::hidden('config[enabled]', '0') !!}
-
-
-
-
-
-
{{ __('app.apps.config') }} ({{ __('app.optional') }})
-
-
-
-
-
- {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
-
-
-
-
- {!! Form::text('config[apikey]', null, array('placeholder' => __('app.apps.apikey'), 'data-config' => 'apikey', 'class' => 'form-control config-item')) !!}
-
-
-
-
-
{{ __('app.apps.config') }} ({{ __('app.optional') }})
-
-
-
-
- {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
-
-
-
- {!! Form::text('config[apikey]', null, array('placeholder' => __('app.apps.apikey'), 'data-config' => 'apikey', 'class' => 'form-control config-item')) !!}
-
-
-
-
-
{{ __('app.apps.config') }} ({{ __('app.optional') }})
-
-
-
-
- {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
-
-
-
-
-
{{ __('app.apps.config') }} ({{ __('app.optional') }})
-
-
-
-
-
- {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
-
-
-
- {!! Form::text('config[username]', null, array('placeholder' => __('app.apps.username'), 'data-config' => 'username', 'class' => 'form-control config-item')) !!}
-
-
-
- {!! Form::text('config[password]', null, array('placeholder' => __('app.apps.password'), 'data-config' => 'password', 'class' => 'form-control config-item')) !!}
-
-
-
-
-