Skip to content

Commit ecdcfdd

Browse files
committed
Merge branch 'master' of https://github.com/linuxserver/Heimdall-Apps into WhatsupDocker
2 parents 5687522 + aa082c6 commit ecdcfdd

20 files changed

Lines changed: 82 additions & 16 deletions

File tree

.github/workflows/linter.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919

2020
- name: PHP syntax checker 8.2
2121
uses: prestashop/github-action-php-lint/8.2@master
@@ -25,7 +25,7 @@
2525
# runs-on: ubuntu-latest
2626
# steps:
2727
# - name: Checkout
28-
# uses: actions/checkout@v4
28+
# uses: actions/checkout@v5
2929
#
3030
# - name: PHP Mess Detector
3131
# uses: php-actions/phpmd@v1
@@ -40,7 +40,7 @@
4040
runs-on: ubuntu-latest
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@v5
4444

4545
- name: PHP Code Sniffer
4646
uses: php-actions/phpcs@v1
@@ -59,12 +59,12 @@
5959
# runs-on: ubuntu-latest
6060
# steps:
6161
# - name: Checkout
62-
# uses: actions/checkout@v4
62+
# uses: actions/checkout@v5
6363
# with:
6464
# path: src
6565
#
6666
# - name: Checkout Heimdall repo for dependencies
67-
# uses: actions/checkout@v4
67+
# uses: actions/checkout@v5
6868
# with:
6969
# repository: linuxserver/Heimdall
7070
# path: ./heimdall-src

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020

2121
- name: Setup node env
2222
uses: actions/setup-node@v4

.github/workflows/prchecks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121

2222
- name: Setup node env
2323
uses: actions/setup-node@v4

.github/workflows/svgo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919
- name: Optimize SVGs
2020
uses: ericcornelissen/svgo-action@v4
2121
id: svgo

Dozzle/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"description": "Dozzle is a real-time log viewer for docker containers.",
77
"enhanced": false,
88
"tile_background": "dark",
9-
"icon": "dozzle.png"
9+
"icon": "dozzle.svg"
1010
}

Dozzle/dozzle.png

-2.43 KB
Binary file not shown.

Dozzle/dozzle.svg

Lines changed: 1 addition & 0 deletions
Loading

Immich/Immich.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,18 @@ public function test()
2626
echo $test->status;
2727
}
2828

29+
private function formatLargeNumber($number)
30+
{
31+
$suffixes = [ "", "k", "M", "G" ];
32+
$rank = 0;
33+
while (abs($number) > 1000 && $rank < count($suffixes)) {
34+
$number /= 1000;
35+
$rank++;
36+
}
37+
$decimals = $number < 10 && $rank > 0 ? 1 : 0;
38+
return number_format($number, $decimals) . $suffixes[$rank];
39+
}
40+
2941
public function livestats()
3042
{
3143
$status = "inactive";
@@ -42,8 +54,8 @@ public function livestats()
4254

4355
if ($details) {
4456
$status = "active";
45-
$data["photos"] = number_format($details->photos);
46-
$data["videos"] = number_format($details->videos);
57+
$data["photos"] = $this->formatLargeNumber($details->photos);
58+
$data["videos"] = $this->formatLargeNumber($details->videos);
4759
$usageInGiB = number_format($details->usage / 1073741824, 2);
4860
$data["usage"] = $usageInGiB . 'GiB';
4961
}

Immich/livestats.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<ul class="livestats">
22
<li>
3-
<span class="title">Photos</span>
3+
<span class="title">Pics</span>
44
<strong>{!! $photos !!}</strong>
55
</li>
66
<li>
7-
<span class="title">Videos</span>
7+
<span class="title">Vids</span>
88
<strong>{!! $videos !!}</strong>
99
</li>
1010
<li>

OpenWebUI/OpenWebUI.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php
2+
3+
namespace App\SupportedApps\OpenWebUI;
4+
5+
class OpenWebUI extends \App\SupportedApps
6+
{
7+
}

0 commit comments

Comments
 (0)