Skip to content

Commit 0b729bd

Browse files
FlaminelFlaminel
committed
test latest
1 parent 3541a84 commit 0b729bd

File tree

17 files changed

+203
-96
lines changed

17 files changed

+203
-96
lines changed

‎.github/ISSUE_TEMPLATE/1-bug.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ body:
66
- type: markdown
77
attributes:
88
value: |
9-
Thanks for taking the time to improve cleanuperr!
9+
Thanks for taking the time to improve Cleanuparr!
1010
- type: checkboxes
1111
id: init
1212
attributes:
1313
label: "Before submitting a bug report, I have:"
1414
options:
1515
- label: Reviewed the documentation.
1616
required: true
17-
- label: Ensured I am using ghcr.io/flmorg/cleanuperr docker repository.
17+
- label: Ensured I am using ghcr.io/Cleanuparr/Cleanuparr docker repository.
1818
required: true
1919
- label: Ensured I am using the latest version.
2020
required: true

‎.github/ISSUE_TEMPLATE/2-feature.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
- type: markdown
77
attributes:
88
value: |
9-
Thanks for taking the time to improve cleanuperr!
9+
Thanks for taking the time to improve Cleanuparr!
1010
- type: textarea
1111
id: description
1212
attributes:

‎.github/ISSUE_TEMPLATE/3-help.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ body:
1414
options:
1515
- label: Reviewed the documentation.
1616
required: true
17-
- label: Ensured I am using ghcr.io/flmorg/cleanuperr docker repository.
17+
- label: Ensured I am using ghcr.io/Cleanuparr/Cleanuparr docker repository.
1818
required: true
1919
- label: Ensured I am using the latest version.
2020
required: true

‎.github/workflows/build-macos-arm-installer.yml‎

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -94,31 +94,57 @@ jobs:
9494
--self-contained \
9595
-o dist/Cleanuparr.app/Contents/MacOS \
9696
/p:PublishSingleFile=true \
97-
/p:Version=${{ env.appVersion }}
97+
/p:Version=${{ env.appVersion }} \
98+
/p:DebugType=None \
99+
/p:DebugSymbols=false
98100
99101
- name: Verify architecture
100102
run: |
101103
echo "Checking architecture of built binary:"
102-
file dist/Cleanuparr.app/Contents/MacOS/cleanuparr
104+
file dist/Cleanuparr.app/Contents/MacOS/Cleanuparr
103105
if command -v lipo >/dev/null 2>&1; then
104-
lipo -info dist/Cleanuparr.app/Contents/MacOS/cleanuparr
106+
lipo -info dist/Cleanuparr.app/Contents/MacOS/Cleanuparr
105107
fi
106108
107109
- name: Create macOS app bundle structure
108110
run: |
109111
# Create proper app bundle structure
110112
mkdir -p dist/Cleanuparr.app/Contents/{MacOS,Resources}
111113
112-
# Create Info.plist
114+
# Convert ICO to ICNS for macOS app bundle
115+
if command -v iconutil >/dev/null 2>&1; then
116+
# Create iconset directory structure
117+
mkdir -p Cleanuparr.iconset
118+
119+
# Use existing PNG files from Logo directory for different sizes
120+
cp Logo/16.png Cleanuparr.iconset/icon_16x16.png
121+
cp Logo/32.png Cleanuparr.iconset/[email protected]
122+
cp Logo/32.png Cleanuparr.iconset/icon_32x32.png
123+
cp Logo/64.png Cleanuparr.iconset/[email protected]
124+
cp Logo/128.png Cleanuparr.iconset/icon_128x128.png
125+
cp Logo/256.png Cleanuparr.iconset/[email protected]
126+
cp Logo/256.png Cleanuparr.iconset/icon_256x256.png
127+
cp Logo/512.png Cleanuparr.iconset/[email protected]
128+
cp Logo/512.png Cleanuparr.iconset/icon_512x512.png
129+
cp Logo/1024.png Cleanuparr.iconset/[email protected]
130+
131+
# Create ICNS file
132+
iconutil -c icns Cleanuparr.iconset -o dist/Cleanuparr.app/Contents/Resources/Cleanuparr.icns
133+
134+
# Clean up iconset directory
135+
rm -rf Cleanuparr.iconset
136+
fi
137+
138+
# Create Info.plist with icon reference
113139
cat > dist/Cleanuparr.app/Contents/Info.plist << EOF
114140
<?xml version="1.0" encoding="UTF-8"?>
115141
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
116142
<plist version="1.0">
117143
<dict>
118144
<key>CFBundleExecutable</key>
119-
<string>cleanuparr</string>
145+
<string>Cleanuparr</string>
120146
<key>CFBundleIdentifier</key>
121-
<string>org.cleanuparr.app</string>
147+
<string>Cleanuparr</string>
122148
<key>CFBundleName</key>
123149
<string>Cleanuparr</string>
124150
<key>CFBundleVersion</key>
@@ -131,6 +157,8 @@ jobs:
131157
<string>APPL</string>
132158
<key>CFBundleSignature</key>
133159
<string>????</string>
160+
<key>CFBundleIconFile</key>
161+
<string>Cleanuparr</string>
134162
<key>NSHighResolutionCapable</key>
135163
<true/>
136164
<key>NSRequiresAquaSystemAppearance</key>
@@ -141,18 +169,12 @@ jobs:
141169
</plist>
142170
EOF
143171
144-
# Create sample configuration
172+
# Create sample configuration with simplified settings
145173
mkdir -p dist/Cleanuparr.app/Contents/Resources
146-
cat > dist/Cleanuparr.app/Contents/Resources/appsettings.json << EOF
174+
cat > dist/Cleanuparr.app/Contents/Resources/config/cleanuparr.json << EOF
147175
{
148-
"Logging": {
149-
"LogLevel": {
150-
"Default": "Information",
151-
"Microsoft.AspNetCore": "Warning"
152-
}
153-
},
154-
"AllowedHosts": "*",
155-
"HTTP_PORTS": "11011"
176+
"HTTP_PORTS": 11011,
177+
"BASE_PATH": "/"
156178
}
157179
EOF
158180
@@ -167,8 +189,8 @@ jobs:
167189
mkdir -p "$HOME/Library/Application Support/Cleanuparr"
168190
169191
# Create sample configuration if it doesn't exist
170-
if [ ! -f "$HOME/Library/Application Support/Cleanuparr/appsettings.json" ]; then
171-
cp "/Applications/Cleanuparr.app/Contents/Resources/appsettings.json" "$HOME/Library/Application Support/Cleanuparr/"
192+
if [ ! -f "$HOME/Library/Application Support/Cleanuparr/cleanuparr.json" ]; then
193+
cp "/Applications/Cleanuparr.app/Contents/Resources/cleanuparr.json" "$HOME/Library/Application Support/Cleanuparr/"
172194
fi
173195
174196
# Set permissions
@@ -189,7 +211,7 @@ jobs:
189211
# Create PKG installer
190212
pkgbuild --root dist/ \
191213
--scripts scripts/ \
192-
--identifier org.cleanuparr.app \
214+
--identifier Cleanuparr.app \
193215
--version ${{ env.appVersion }} \
194216
--install-location /Applications \
195217
${pkg_name}
@@ -199,7 +221,7 @@ jobs:
199221
- name: Upload installer as artifact
200222
uses: actions/upload-artifact@v4
201223
with:
202-
name: cleanuparr-macos-arm64-installer
224+
name: Cleanuparr-macos-arm64-installer
203225
path: '${{ env.pkgName }}'
204226
retention-days: 30
205227

‎.github/workflows/build-macos-intel-installer.yml‎

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -94,31 +94,57 @@ jobs:
9494
--self-contained \
9595
-o dist/Cleanuparr.app/Contents/MacOS \
9696
/p:PublishSingleFile=true \
97-
/p:Version=${{ env.appVersion }}
97+
/p:Version=${{ env.appVersion }} \
98+
/p:DebugType=None \
99+
/p:DebugSymbols=false
98100
99101
- name: Verify architecture
100102
run: |
101103
echo "Checking architecture of built binary:"
102-
file dist/Cleanuparr.app/Contents/MacOS/cleanuparr
104+
file dist/Cleanuparr.app/Contents/MacOS/Cleanuparr
103105
if command -v lipo >/dev/null 2>&1; then
104-
lipo -info dist/Cleanuparr.app/Contents/MacOS/cleanuparr
106+
lipo -info dist/Cleanuparr.app/Contents/MacOS/Cleanuparr
105107
fi
106108
107109
- name: Create macOS app bundle structure
108110
run: |
109111
# Create proper app bundle structure
110112
mkdir -p dist/Cleanuparr.app/Contents/{MacOS,Resources}
111113
112-
# Create Info.plist
114+
# Convert ICO to ICNS for macOS app bundle
115+
if command -v iconutil >/dev/null 2>&1; then
116+
# Create iconset directory structure
117+
mkdir -p Cleanuparr.iconset
118+
119+
# Use existing PNG files from Logo directory for different sizes
120+
cp Logo/16.png Cleanuparr.iconset/icon_16x16.png
121+
cp Logo/32.png Cleanuparr.iconset/[email protected]
122+
cp Logo/32.png Cleanuparr.iconset/icon_32x32.png
123+
cp Logo/64.png Cleanuparr.iconset/[email protected]
124+
cp Logo/128.png Cleanuparr.iconset/icon_128x128.png
125+
cp Logo/256.png Cleanuparr.iconset/[email protected]
126+
cp Logo/256.png Cleanuparr.iconset/icon_256x256.png
127+
cp Logo/512.png Cleanuparr.iconset/[email protected]
128+
cp Logo/512.png Cleanuparr.iconset/icon_512x512.png
129+
cp Logo/1024.png Cleanuparr.iconset/[email protected]
130+
131+
# Create ICNS file
132+
iconutil -c icns Cleanuparr.iconset -o dist/Cleanuparr.app/Contents/Resources/Cleanuparr.icns
133+
134+
# Clean up iconset directory
135+
rm -rf Cleanuparr.iconset
136+
fi
137+
138+
# Create Info.plist with icon reference
113139
cat > dist/Cleanuparr.app/Contents/Info.plist << EOF
114140
<?xml version="1.0" encoding="UTF-8"?>
115141
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
116142
<plist version="1.0">
117143
<dict>
118144
<key>CFBundleExecutable</key>
119-
<string>cleanuparr</string>
145+
<string>Cleanuparr</string>
120146
<key>CFBundleIdentifier</key>
121-
<string>org.cleanuparr.app</string>
147+
<string>Cleanuparr</string>
122148
<key>CFBundleName</key>
123149
<string>Cleanuparr</string>
124150
<key>CFBundleVersion</key>
@@ -131,6 +157,8 @@ jobs:
131157
<string>APPL</string>
132158
<key>CFBundleSignature</key>
133159
<string>????</string>
160+
<key>CFBundleIconFile</key>
161+
<string>Cleanuparr</string>
134162
<key>NSHighResolutionCapable</key>
135163
<true/>
136164
<key>NSRequiresAquaSystemAppearance</key>
@@ -141,18 +169,12 @@ jobs:
141169
</plist>
142170
EOF
143171
144-
# Create sample configuration
145-
mkdir -p dist/Cleanuparr.app/Contents/Resources
146-
cat > dist/Cleanuparr.app/Contents/Resources/appsettings.json << EOF
172+
# Create sample configuration with simplified settings
173+
mkdir -p dist/Cleanuparr.app/Contents/Resources/config
174+
cat > dist/Cleanuparr.app/Contents/Resources/config/cleanuparr.json << EOF
147175
{
148-
"Logging": {
149-
"LogLevel": {
150-
"Default": "Information",
151-
"Microsoft.AspNetCore": "Warning"
152-
}
153-
},
154-
"AllowedHosts": "*",
155-
"HTTP_PORTS": "11011"
176+
"HTTP_PORTS": 11011,
177+
"BASE_PATH": "/"
156178
}
157179
EOF
158180
@@ -167,8 +189,8 @@ jobs:
167189
mkdir -p "$HOME/Library/Application Support/Cleanuparr"
168190
169191
# Create sample configuration if it doesn't exist
170-
if [ ! -f "$HOME/Library/Application Support/Cleanuparr/appsettings.json" ]; then
171-
cp "/Applications/Cleanuparr.app/Contents/Resources/appsettings.json" "$HOME/Library/Application Support/Cleanuparr/"
192+
if [ ! -f "$HOME/Library/Application Support/Cleanuparr/cleanuparr.json" ]; then
193+
cp "/Applications/Cleanuparr.app/Contents/Resources/config/cleanuparr.json" "$HOME/Library/Application Support/Cleanuparr/"
172194
fi
173195
174196
# Set permissions
@@ -189,7 +211,7 @@ jobs:
189211
# Create PKG installer
190212
pkgbuild --root dist/ \
191213
--scripts scripts/ \
192-
--identifier org.cleanuparr.app \
214+
--identifier Cleanuparr \
193215
--version ${{ env.appVersion }} \
194216
--install-location /Applications \
195217
${pkg_name}
@@ -199,7 +221,7 @@ jobs:
199221
- name: Upload installer as artifact
200222
uses: actions/upload-artifact@v4
201223
with:
202-
name: cleanuparr-macos-intel-installer
224+
name: Cleanuparr-macos-intel-installer
203225
path: '${{ env.pkgName }}'
204226
retention-days: 30
205227

‎.github/workflows/build-windows-installer.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,20 @@ jobs:
8686
8787
- name: Build Windows executable
8888
run: |
89-
dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime win-x64 --self-contained -o dist /p:PublishSingleFile=true /p:Version=${{ env.appVersion }}
89+
dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime win-x64 --self-contained -o dist /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugType=None /p:DebugSymbols=false
9090
9191
- name: Create sample configuration
9292
shell: pwsh
9393
run: |
94+
# Create config directory
95+
New-Item -ItemType Directory -Force -Path "config"
96+
9497
$config = @{
95-
"Logging" = @{
96-
"LogLevel" = @{
97-
"Default" = "Information"
98-
"Microsoft.AspNetCore" = "Warning"
99-
}
100-
}
101-
"AllowedHosts" = "*"
102-
"HTTP_PORTS" = "11011"
98+
"HTTP_PORTS" = 11011
99+
"BASE_PATH" = "/"
103100
}
104101
105-
$config | ConvertTo-Json -Depth 3 | Out-File -FilePath "appsettings.json" -Encoding UTF8
102+
$config | ConvertTo-Json | Out-File -FilePath "config/cleanuparr.json" -Encoding UTF8
106103
107104
- name: Setup Inno Setup
108105
shell: pwsh
@@ -133,6 +130,9 @@ jobs:
133130
# Copy installer script to root
134131
Copy-Item "installers/windows/cleanuparr-installer.iss" -Destination "cleanuparr-installer.iss"
135132
133+
# The installer script has been pre-updated with proper icon and config paths
134+
# No dynamic modifications needed as the base script now includes correct references
135+
136136
# Run Inno Setup compiler
137137
& "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" "cleanuparr-installer.iss"
138138
@@ -154,7 +154,7 @@ jobs:
154154
- name: Upload installer artifact
155155
uses: actions/upload-artifact@v4
156156
with:
157-
name: cleanuparr-windows-installer
157+
name: Cleanuparr-windows-installer
158158
path: installer/${{ env.installerName }}
159159
retention-days: 30
160160

‎.github/workflows/build_executable.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,19 @@ jobs:
8787
cp -r code/frontend/dist/ui/browser/* code/backend/${{ env.executableName }}/wwwroot/
8888
8989
- name: Build win-x64
90-
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime win-x64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-win-amd64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }}
90+
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime win-x64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-win-amd64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
9191

9292
- name: Build linux-x64
93-
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime linux-x64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-linux-amd64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }}
93+
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime linux-x64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-linux-amd64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
9494

9595
- name: Build linux-arm64
96-
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime linux-arm64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-linux-arm64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }}
96+
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime linux-arm64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-linux-arm64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
9797

9898
- name: Build osx-x64
99-
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime osx-x64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-osx-amd64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }}
99+
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime osx-x64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-osx-amd64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
100100

101101
- name: Build osx-arm64
102-
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime osx-arm64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-osx-arm64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }}
102+
run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime osx-arm64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-osx-arm64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
103103

104104
- name: Create sample configuration files
105105
run: |

0 commit comments

Comments
 (0)