Skip to content

Commit c177ed0

Browse files
authored
Merge pull request #17 from murdercode/notifications
Notifications
2 parents 2f6fae5 + 35f9e41 commit c177ed0

File tree

7 files changed

+37
-40
lines changed

7 files changed

+37
-40
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
matrix:
2020
include:
2121
- platform: 'macos-latest'
22-
args: '--target aarch64-apple-darwin --bundles dmg'
22+
args: '--target aarch64-apple-darwin --bundles app'
2323
arch: 'aarch64'
2424
- platform: 'macos-latest'
25-
args: '--target x86_64-apple-darwin --bundles dmg'
25+
args: '--target x86_64-apple-darwin --bundles app'
2626
arch: 'x86_64'
2727

2828
runs-on: ${{ matrix.platform }}
@@ -65,9 +65,9 @@ jobs:
6565
6666
### Installation Notes
6767
68-
**macOS**: Download the `.dmg` file for your architecture:
69-
- `presto_x.x.x_aarch64.dmg` for Apple Silicon (M1/M2/M3 Macs)
70-
- `presto_x.x.x_x64.dmg` for Intel Macs
68+
**macOS**: Download the `.app` file for your architecture:
69+
- `presto_x.x.x_aarch64.app.tar.gz` for Apple Silicon (M1/M2/M3 Macs)
70+
- `presto_x.x.x_x64.app.tar.gz` for Intel Macs
7171
7272
### Auto-Updates
7373

generate-keys.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,28 @@
55

66
echo "🔐 Generating update signing keys for Tauri..."
77

8-
# Verifica se tauri CLI è disponibile
9-
if ! command -v tauri &> /dev/null; then
10-
echo "❌ Tauri CLI not found. Please install it first:"
11-
echo "npm install --save-dev @tauri-apps/cli@latest"
8+
# Verifica se npm è disponibile
9+
if ! command -v npm &> /dev/null; then
10+
echo "❌ npm not found. Please install Node.js first."
1211
exit 1
1312
fi
1413

14+
# Controlla se è stata passata l'opzione --force
15+
FORCE_OPTION=""
16+
if [[ "$@" == *"--force"* ]]; then
17+
FORCE_OPTION="--force"
18+
echo "⚠️ Force option detected. Will overwrite existing keys."
19+
fi
20+
1521
# Genera le chiavi di firma
1622
echo "📝 Generating signing keypair..."
17-
tauri signer generate -w ~/.tauri/tempo_signing_key
23+
npx tauri signer generate -w ~/.tauri/tempo_signing_key $FORCE_OPTION
1824

1925
if [ $? -eq 0 ]; then
2026
echo "✅ Keys generated successfully!"
2127
echo ""
2228
echo "🔑 Your public key is:"
23-
tauri signer sign -k ~/.tauri/tempo_signing_key --password "" | head -1
29+
npx tauri signer sign -k ~/.tauri/tempo_signing_key --password "" | head -1
2430
echo ""
2531
echo "📋 Next steps:"
2632
echo "1. Copy the public key above"

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ update_homebrew_tap() {
175175
# Funzione per fare la build
176176
build_app() {
177177
print_step "Avvio build dell'applicazione..."
178-
npm run build
178+
# Modifica per utilizzare bundles app invece di dmg
179+
npm run tauri build -- --bundles app
179180
print_success "Build completata"
180181
}
181182

@@ -312,7 +313,7 @@ main() {
312313
# Mostra informazioni sui file generati
313314
if [[ -d "src-tauri/target" ]]; then
314315
echo "File di build generati:"
315-
find src-tauri/target -name "*.dmg" -o -name "*.app" -o -name "*.deb" -o -name "*.AppImage" 2>/dev/null | head -5
316+
find src-tauri/target -name "*.app.tar.gz" -o -name "*.app" -o -name "*.deb" -o -name "*.AppImage" 2>/dev/null | head -5
316317
fi
317318
}
318319

src-tauri/tauri.conf.json

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,41 +24,25 @@
2424
}
2525
},
2626
"bundle": {
27-
"createUpdaterArtifacts": true,
27+
"active": true,
2828
"targets": [
29-
"dmg",
3029
"app"
3130
],
31+
"createUpdaterArtifacts": true,
3232
"icon": [
3333
"icons/32x32.png",
3434
"icons/128x128.png",
3535
3636
"icons/icon.icns",
3737
"icons/icon.ico"
38-
],
39-
"macOS": {
40-
"dmg": {
41-
"appPosition": {
42-
"x": 180,
43-
"y": 170
44-
},
45-
"applicationFolderPosition": {
46-
"x": 480,
47-
"y": 170
48-
},
49-
"windowSize": {
50-
"width": 660,
51-
"height": 400
52-
}
53-
}
54-
}
38+
]
5539
},
5640
"plugins": {
5741
"updater": {
5842
"endpoints": [
59-
"https://api.github.com/repos/murdercode/presto/releases/latest"
43+
"https://github.com/murdercode/presto/releases/latest/download/latest.json"
6044
],
61-
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEIwQTUwNDBBQkRENTBDQjgKUldT\nNEROVzlDZ1Nsc0Q4eExoSG5jbjE1N1ppLzZRYUFvUUNqR1VYQmJFaEpvcFpjV3c4VDljSHoK",
45+
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IENCNDYxMDAyQjIxQkM4MjAKUldRZ3lCdXlBaEJHeXp3bnRHYWRwOVM2WFo1T3IzMXJWUnlJYUtwWlEzcnBKVHpnaXpJNjhmK1gK",
6246
"dangerousInsecureTransportProtocol": false
6347
}
6448
}

src/core/pomodoro-timer.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,9 @@ export class PomodoroTimer {
548548

549549
this.updateButtons();
550550
this.updateDisplay();
551-
NotificationUtils.playNotificationSound();
551+
if (this.enableSoundNotifications) {
552+
NotificationUtils.playNotificationSound();
553+
}
552554
NotificationUtils.showNotificationPing('Timer started! 🍅', 'info', this.currentMode);
553555

554556
// Start smart pause monitoring if enabled
@@ -846,7 +848,9 @@ export class PomodoroTimer {
846848
await this.saveSessionData();
847849
await this.updateWeeklyStats();
848850
this.showNotification();
849-
NotificationUtils.playNotificationSound();
851+
if (this.enableSoundNotifications) {
852+
NotificationUtils.playNotificationSound();
853+
}
850854

851855
// Show completion message
852856
let completionMessage;
@@ -940,7 +944,9 @@ export class PomodoroTimer {
940944

941945
// Show notification
942946
this.showNotification();
943-
NotificationUtils.playNotificationSound();
947+
if (this.enableSoundNotifications) {
948+
NotificationUtils.playNotificationSound();
949+
}
944950

945951
// Show completion message for continuous sessions
946952
const continuousMessages = {

src/utils/theme-loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ThemeLoader {
3939
// that gets updated by the build process or manually maintained
4040

4141
// This could be enhanced to use a build-time script that generates this list
42-
const knownThemes = [
42+
const knownThemes = [
4343
'espresso.css',
4444
'matrix.css',
4545
'pommodore64.css'

0 commit comments

Comments
 (0)