Compare commits
132 changed files with 250 additions and 15344 deletions
107
CHANGELOG.md
107
CHANGELOG.md
|
|
@ -1,123 +1,28 @@
|
|||
|
||||
# Changelog
|
||||
|
||||
## [1.0.8-rc33] - unstable
|
||||
|
||||
### Added
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
* [PostIt.Android] Avoid applying camera sensor rotation twice: account for the rotation already included in Camera2's SurfaceTexture matrix before rotating encoder input, while retaining portrait output dimensions.
|
||||
* [PostIt.Android] Fix zero-second camera captures after adding OpenGL rotation: align Camera2 timestamps with the recorder's monotonic clock, preserve frame intervals, ignore duplicate frames and start camera requests only after the encoder is ready. Add a real Camera2/microphone regression check for segment duration and H.264/AAC tracks.
|
||||
* [PostIt.Android] Keep the `VideoLAN.LibVLC.Android` JNI/native bindings alive in Release builds with a ProGuard rule set so the bundled `libvlc`/`libc++_shared` libraries are not stripped.
|
||||
* [PostIt.Android] Rotate camera frames before H.264 encoding using an OpenGL surface, based on sensor orientation, lens facing and display rotation at capture start. Portrait captures swap the encoded dimensions; live MPEG-TS/HLS and replays no longer depend on an ineffective MP4-only orientation hint. Restore compilation by reading display orientation from the activity rather than the capture service.
|
||||
|
||||
## [1.0.8-rc32] - unstable
|
||||
|
||||
### Added
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
* Performer notification audience
|
||||
* [PostIt.Android] Upgrade `VideoLAN.LibVLC.Android` to 3.7.0-beta to resolve the runtime `failed to load libc++_shared.so` problem on 16 KiB-page Android devices and document the native-library compatibility requirement.
|
||||
|
||||
## [1.0.8-rc31] - unstable
|
||||
|
||||
### Added
|
||||
|
||||
* [Yavsc.Org] Permalien public de podcasts performer avec jeton a durée
|
||||
limitée, page Razor de presentation et bandeau de prospection vers
|
||||
l'inscription Yavsc et le téléchargement de PostIt.
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
* Podcast availability from Android
|
||||
* avoid NRE in MailSender on rdv query notifications
|
||||
* Android emulator smoke test skipped in CI because Calabash instrumentation signature mismatches the target APK on hosted runners
|
||||
|
||||
## [1.0.8-rc30] - unstable
|
||||
|
||||
### Added
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
* Podcast availability from Android
|
||||
|
||||
## [1.0.8-rc29] - unstable
|
||||
|
||||
### Added
|
||||
|
||||
* [PostIt.Android] Lecture des podcasts directs et replays dans la page
|
||||
video partagée avec le desktop : surface LibVLC native Android et moteur
|
||||
embarque, transport authentifie commun et contrôles uniques. Liberation
|
||||
du lecteur en arrière-plan ; réouverture du flux au retour dans l'application.
|
||||
|
||||
* [PostIt.Android] Emission depuis la camera et le microphone Android
|
||||
(Android 8 minimum), encodage H.264/AAC natif et segmentation MPEG-TS
|
||||
sur images clés. Interface, envoi authentifie, retries et finalisation
|
||||
du replay partages avec le desktop. Service de premier plan avec
|
||||
notification d'arrêt et maintien de la capture en arrière-plan.
|
||||
|
||||
### Changed
|
||||
|
||||
* [PostIt] Mise a jour d'Avalonia vers 12.1.4.
|
||||
|
||||
### Fixed
|
||||
|
||||
* [Yavsc.Api, Yavsc.Server] Une demande de rendez-vous ne provoque plus
|
||||
d'erreur 500 (NullReferenceException dans MailSender) : l'API lie
|
||||
désormais la section Smtp, le modèle appsettings-api fournit Site.Owner
|
||||
et Smtp, et un envoi sans configuration mail complete est journalise
|
||||
puis ignore.
|
||||
|
||||
|
||||
## [1.0.8-rc28] - unstable
|
||||
|
||||
|
||||
### Added
|
||||
|
||||
* [Yavsc.Api, Yavsc.Server, Yavsc.Api.Client] Creation explicite et
|
||||
idempotente d'une facture depuis un devis doublement signe, avec lignes,
|
||||
total et parties figes. Historique des encaissements hors ligne attestes
|
||||
par le prestataire et des transactions PayPal vérifiées cote serveur ;
|
||||
references uniques, cumul atomique et protection contre les écritures
|
||||
concurrentes. Routes documentées, client HTTP et migration associes.
|
||||
|
||||
* [Yavsc.Abstract, Yavsc.Server] Modèle de solde des commandes facturables :
|
||||
montants dus et payes persistants, reste a payer et états non paye,
|
||||
partiellement paye ou acquitte. L'acquittement depend des montants,
|
||||
et non du seul statut PayPal ; migration sans montant historique invente.
|
||||
|
||||
* [PostIt.Desktop, Yavsc.Api] Podcasts en direct avec replay HLS conserve :
|
||||
capture camera et microphone par LibVLC (H.264/AAC, segments MPEG-TS),
|
||||
envoi ordonne et idempotent, catalogue et lecture authentifiée dans PostIt.
|
||||
envoi ordonne et idempotent, catalogue et lecture authentifiee dans PostIt.
|
||||
L'auteur peut terminer ou supprimer ses emissions ; stockage prive sur
|
||||
disque, quotas dédiés et conservation des segments reçus apres interruption.
|
||||
disque, quotas dedies et conservation des segments recus apres interruption.
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
* [Facturation] Les commandes facturées et leur devis ne peuvent plus être
|
||||
supprimes via les routes de commande usuelles. Les additions distinguent
|
||||
montant verse, solde restant et acquittement ; les anciennes routes de
|
||||
generation exigent une facture établie depuis un devis signe.
|
||||
|
||||
## [1.0.8-rc27] - unstable
|
||||
|
||||
### Added
|
||||
|
||||
* [PostIt.Desktop] Installeur NSIS Windows x64 par utilisateur, sans
|
||||
elevation : publication autonome, raccourci du menu Démarrer,
|
||||
protocole `postit://` pour la connexion et désinstallation via Windows.
|
||||
Instructions de generation ajoutées dans `INSTALL.md`.
|
||||
elevation : publication autonome, raccourci du menu Demarrer,
|
||||
protocole `postit://` pour la connexion et desinstallation via Windows.
|
||||
Instructions de generation ajoutees dans `INSTALL.md`.
|
||||
|
||||
* [PostIt, Yavsc.Api] Portage des outils des contrôleurs web
|
||||
d’administration : tableau de bord, rôles et affectations, clients OIDC
|
||||
|
|
|
|||
91
INSTALL.md
91
INSTALL.md
|
|
@ -140,97 +140,6 @@ reads a replay from its beginning; seeking is not implemented. Native
|
|||
camera/microphone permissions, drivers and codecs must still be verified
|
||||
on each target Windows/Linux machine.
|
||||
|
||||
### Android podcasts
|
||||
|
||||
The Android APK bundles LibVLC and uses a native Android video surface inside
|
||||
the same Avalonia video page as desktop. Catalogue, playback controls and
|
||||
authenticated segment downloads are shared; no external browser, public media
|
||||
URL or camera/microphone permissions are needed to watch a podcast.
|
||||
|
||||
Leaving the app stops playback and cancels downloads. Returning recreates the
|
||||
player: a replay starts from the beginning, and a live stream rejoins near the
|
||||
live edge. Seeking and background audio are not supported.
|
||||
|
||||
Broadcasting requires **Android 8 (API 26) or newer**. In the shared podcast
|
||||
page, detect devices, select front/rear camera and optionally the microphone,
|
||||
then start the live broadcast while PostIt is visible. Camera permission,
|
||||
microphone permission when selected, and notification permission on Android 13+
|
||||
must be granted. A permission denial is reported in the page without starting
|
||||
capture or creating a server broadcast. Permissions are requested before the
|
||||
server session is created so a long permission dialog cannot expire it.
|
||||
Watching does not request these permissions.
|
||||
|
||||
Android uses Camera2 and its native MediaRecorder H.264/AAC encoder, up to 480p at 30 fps,
|
||||
not the desktop LibVLC camera inputs or software encoders. MPEG-TS is segmented
|
||||
at IDR frames, with timestamps used for segment durations. Closed segments
|
||||
enter the same ordered upload/retry/quota/replay pipeline as desktop.
|
||||
Devices without a supported camera/encoder report a startup error.
|
||||
|
||||
Camera frames are rotated through an OpenGL surface before encoding, so both
|
||||
live playback and replays have upright pixels without relying on rotation
|
||||
metadata (not supported by the MPEG-TS recorder). The sensor, front/rear lens
|
||||
and display orientation are sampled when capture starts; portrait output swaps
|
||||
width and height. Camera2 may already include sensor rotation in the
|
||||
SurfaceTexture transform; only the remaining rotation is applied by OpenGL.
|
||||
Keep that device orientation during a broadcast, or stop and
|
||||
start a new broadcast after turning the device.
|
||||
|
||||
A camera/microphone foreground service and a partial wake lock maintain the
|
||||
broadcast when PostIt is backgrounded or the screen locks. Its ongoing
|
||||
notification returns to the app and offers **Arreter et publier**. Stopping
|
||||
flushes the final segment before completing the replay. Leaving the podcast
|
||||
page or logging out still stops capture. Android's explicit service stop,
|
||||
process termination or application restart does not automatically restart a
|
||||
camera; segments already received by the server remain available under the
|
||||
interrupted-replay rules above. Device power policies can impose additional
|
||||
restrictions and must be tested on the intended physical devices.
|
||||
|
||||
**Native library compatibility:** the Android app now uses
|
||||
`VideoLAN.LibVLC.Android` 3.7.0-beta, which is the minimum compatible package
|
||||
for 16 KiB-page devices. Older 3.6.5 binaries can fail at runtime with
|
||||
`failed to load libc++_shared.so` or the linker error `XA0141` because the
|
||||
native libraries are not aligned for 16 KiB memory pages. A successful APK
|
||||
build or a test on a 4 KiB-page emulator does not establish compatibility
|
||||
for 16 KiB-page devices or Play distribution requiring that alignment.
|
||||
|
||||
Build with the Android workload and SDK configured:
|
||||
|
||||
```bash
|
||||
dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj
|
||||
```
|
||||
|
||||
On an Android device, verify replay video/audio, live playback, pause/resume,
|
||||
rotation, Back navigation and returning after backgrounding the app. Also
|
||||
verify an expired session or interrupted network reports a playback error.
|
||||
For broadcasting, test front/rear cameras, microphone enabled/disabled,
|
||||
permission denial, screen lock, background capture, notification stop and the
|
||||
final replay. No automatic retry of a denied permission or a killed camera
|
||||
service is performed.
|
||||
|
||||
The Debug APK includes a local native-capture test activity (excluded from
|
||||
Release); it does not create a server podcast. On a dedicated emulator, grant
|
||||
camera, audio and notification permissions, then run:
|
||||
|
||||
```bash
|
||||
adb shell am start -W -f 0x18000000 -n fr.pschneider.postit/fr.pschneider.postit.PodcastCaptureTestActivity
|
||||
# Wait about 20 seconds for foreground/background recording and final flush.
|
||||
adb shell run-as fr.pschneider.postit cat files/podcast-capture-test-result.txt
|
||||
# Repeat with the second camera, no audio, and the notification stop action:
|
||||
adb shell am start -W -f 0x18000000 -n fr.pschneider.postit/fr.pschneider.postit.PodcastCaptureTestActivity --es microphone false --es camera front --es notificationStop true
|
||||
```
|
||||
|
||||
The result reports the segment count, the background progress and the private
|
||||
recording directory under `files/podcast-capture-tests`. Recordings remain
|
||||
there for local decoder inspection and can be removed after the test.
|
||||
|
||||
The implementation was checked on an Android 16 x64 emulator with 4 KiB
|
||||
pages: camera/microphone capture produced five independently decodable
|
||||
H.264/AAC segments across foreground/background operation; the second camera
|
||||
without audio produced six decodable H.264 segments, including screen-off
|
||||
operation and stop through the notification action. The foreground service
|
||||
was gone after both tests. These local tests do not replace an authenticated
|
||||
Android-to-server broadcast/replay test or validation on physical devices.
|
||||
|
||||
## Resources
|
||||
|
||||
System resources needed to install.
|
||||
|
|
|
|||
|
|
@ -138,9 +138,11 @@ Dans le cas des arrhes, à tout moment, jusqu'avant la date et l'heure de la pre
|
|||
|
||||
## Limitations
|
||||
|
||||
* **Aujourd'hui** : une prestation par commande, sur un axe client → prestataire unique, sans sous-traitance. **Cible roadmap** : montages multi-parties (plusieurs clients et/ou plusieurs fournisseurs collaborant autour d'un même projet, avec sous-traitance validée par le client) — voir la [ROADMAP](../ROADMAP.md).
|
||||
* **Annulation : partielle et non testée.** Côté client, `HairCutCommandController.ClientCancel` / `ClientCancelConfirm` supprime la commande **sans déclencher de refund PayPal** ni logique arrhes vs avance ; aucune action d'annulation côté prestataire. La description du README (arrhes +20%, avance non-annulable) **n'est pas implémentée**. Cible : câbler `RefundTransaction` et le workflow complet, voir [ROADMAP](../ROADMAP.md).
|
||||
* **Réclamation post-prestation : aucun support applicatif.** Passée la date de la prestation, le client n'a aucun chemin dans l'UI pour signaler un litige — aucune route, aucun contrôleur, aucun modèle. La fonctionnalité de conciliation est planifiée au **Jalon 5** (cf. [doc/ddd-exploration-2026-06-14.md](../doc/ddd-exploration-2026-06-14.md)) : double vue client/prestataire, dossier de conciliation, décision. En attendant, tout passe par e-mail au propriétaire de l'installation.
|
||||
* **Paiement : PayPal uniquement, via l'API NVP/SOAP.** Aucun autre PSP n'est intégré (pas de Stripe, pas d'Adyen). L'API NVP/SOAP que PayPal a dépréciée au profit de REST reste fonctionnelle mais n'est plus recommandée par PayPal ; aucune migration n'est planifiée à court terme.
|
||||
* **Périmètre métier étroit.** Pas de saisie de structures de projets complexes ; pas de ticketing associé à la prestation.
|
||||
* **Collecte centralisée.** Tous les paiements PayPal transitent par le compte du propriétaire de l'installation — c'est le seul identifiant configuré côté PSP. Les professionnels apparaissent comme tierces parties du point de vue PayPal.
|
||||
* **Pas de gestion de paie.** Aucune édition de fiche de paye, ni paiement en masse. Seuls les paiements unitaires sus-cités sont supportés.
|
||||
|
||||
|
|
|
|||
|
|
@ -6,17 +6,7 @@
|
|||
"https://preprod-blogs.$DOMAIN"
|
||||
],
|
||||
"Bills": "bills",
|
||||
"TempDir": "temp",
|
||||
"Owner": {
|
||||
"Name": "Paul Schneider",
|
||||
"EMail": "paul@pschneider.fr"
|
||||
}
|
||||
},
|
||||
"Smtp": {
|
||||
"Host": "mercure.pschneider.fr",
|
||||
"Port": 465,
|
||||
"UserName": "paul",
|
||||
"Password": "$SMTP_PASSWORD"
|
||||
"TempDir": "temp"
|
||||
},
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ La racine de l'architecture est [Architecture.md](Architecture.md).
|
|||
| [architecture/offres-frontmatter.md](architecture/offres-frontmatter.md) | Offre fournisseur, ClasseFormulaire, ClasseDevis, parsing frontmatter |
|
||||
| [architecture/postit-oidc.md](architecture/postit-oidc.md) | Client desktop PostIt, custom URI scheme, silent refresh |
|
||||
| [architecture/postit.md](architecture/postit.md) | PostIt — topologie des projets, ViewLocator custo, navigation, DI, conventions de binding |
|
||||
| [architecture/notifications.md](architecture/notifications.md) | Notifications persistées, messages Web et événements temps réel côté serveur, Web et PostIt |
|
||||
| [architecture/decoupage-organisation.md](architecture/decoupage-organisation.md) | Découpage des projets .NET (Abstract, Server, Org, Api, Blogs, Web, Org.Tests) |
|
||||
| [testing.md](testing.md) | Stratégie de test : conventions des dossiers, EF Core in-memory, auth stubs, scaffold partagé |
|
||||
| [onboarding-agents.md](onboarding-agents.md) | Parcours pas-à-pas pour prise en main agents IA + architecture + tests |
|
||||
|
|
|
|||
|
|
@ -1,229 +0,0 @@
|
|||
# Notifications Yavsc : serveur, Web et PostIt
|
||||
|
||||
Ce document décrit les mécanismes de notification actuellement présents
|
||||
dans le dépôt. Le terme « notification » recouvre plusieurs flux distincts :
|
||||
|
||||
1. les **annonces persistées** en base, affichées dans le site Web et sur
|
||||
l'accueil de PostIt ;
|
||||
2. les **messages temporaires de l'interface Web**, attachés à une réponse
|
||||
MVC par `ViewBag.Notify` ;
|
||||
3. les **événements temps réel** du chat et les événements métier diffusés par
|
||||
SignalR.
|
||||
|
||||
Ces flux n'ont ni le même stockage, ni le même cycle de vie, ni les mêmes
|
||||
clients.
|
||||
|
||||
## Vue d'ensemble
|
||||
|
||||
| Flux | Serveur / transport | Web | PostIt |
|
||||
|---|---|---|---|
|
||||
| Annonce persistée | Entité `Notification` en base, API HTTP | Affichée dans le layout et masquable | Liste sur `HomePage`, chargée par HTTP et masquable |
|
||||
| Message d'interface | Liste de portée requête dans `ViewBag.Notify` | Affichée comme alerte dans le layout | Non consommé |
|
||||
| Événement de chat | Hub SignalR authentifié à `/chathub` | Le site Web n'en consomme pas dans ses vues MVC | `notifyUser` et `notifyRoom` alimentent les journaux du chat |
|
||||
| Événement métier `push` | SignalR vers les connexions actives, plus e-mail | Pas de consommateur identifié dans les vues Web | Pas de gestionnaire `push` dans le client PostIt actuel |
|
||||
|
||||
Les notifications persistées sont donc différentes d'une notification système
|
||||
native (notification du navigateur ou du système d'exploitation). Le client
|
||||
PostIt affiche une liste dans sa page d'accueil ; il ne demande pas de
|
||||
permission de notification native.
|
||||
|
||||
## 1. Annonces persistées
|
||||
|
||||
### Modèle et stockage
|
||||
|
||||
L'entité partagée [`Notification`](../../src/Yavsc.Abstract/Messaging/Notification.cs)
|
||||
est enregistrée dans la table `Notification` via `ApplicationDbContext`.
|
||||
Elle contient :
|
||||
|
||||
- `Id`, identifiant généré ;
|
||||
- `title` et `body`, obligatoires, limités respectivement à 1 024 et 512
|
||||
caractères ;
|
||||
- `icon`, `sound`, `tag`, `color`, propriétés optionnelles ;
|
||||
- `click_action`, obligatoire, utilisé comme libellé d'action dans les
|
||||
interfaces ;
|
||||
- `Target`, chaîne de ciblage. Les valeurs documentées par le modèle sont
|
||||
`null` (tout le monde), `user/{UserId}`, `pub/{topic}` et
|
||||
`administration`.
|
||||
|
||||
Le masquage d'une annonce pour un utilisateur connecté est stocké dans
|
||||
`DismissClicked`, avec une clé composée de l'identifiant utilisateur et de
|
||||
l'identifiant de notification. Le même avis peut ainsi être masqué
|
||||
indépendamment par chaque utilisateur.
|
||||
|
||||
### API
|
||||
|
||||
[`NotificationsApiController`](../../src/Yavsc.Api/Controllers/Administration/NotificationsApiController.cs)
|
||||
expose les deux routes GET suivantes, sous le préfixe `/api/v1` :
|
||||
|
||||
| Route | Accès | Résultat |
|
||||
|---|---|---|
|
||||
| `GET /api/v1/notifications` | Anonyme ou authentifié | Notifications visibles à l'appelant, non masquées |
|
||||
| `GET /api/v1/notifications/me` | Anonyme ou authentifié | Même action et mêmes règles que la route sans suffixe |
|
||||
|
||||
La réponse est une liste JSON triée par `Id` décroissant. L'API exclut les
|
||||
notifications masquées par l'utilisateur authentifié, puis applique les
|
||||
règles d'audience : cible vide, cible `pub/…`, cible correspondant à
|
||||
`user/{identifiant courant}`, ou cible `administration` pour un administrateur.
|
||||
Une requête anonyme n'a ni identifiant utilisateur ni rôle administrateur.
|
||||
|
||||
[`DismissClicksApiController`](../../src/Yavsc.Api/Controllers/Administration/DismissClicksApiController.cs)
|
||||
est réservé aux utilisateurs authentifiés :
|
||||
|
||||
| Route | Effet |
|
||||
|---|---|
|
||||
| `GET /api/v1/dismiss` | Liste les identifiants masqués par l'utilisateur |
|
||||
| `POST /api/v1/dismiss/click/{notificationId}` | Masque l'avis pour l'utilisateur ; l'opération est idempotente |
|
||||
| `DELETE /api/v1/dismiss/click/{notificationId}` | Rétablit l'avis s'il était masqué ; renvoie `404` sinon |
|
||||
|
||||
Le POST renvoie `404` si l'identifiant de notification n'existe pas. Le modèle
|
||||
de réponse est [`DismissedNotification`](../../src/Yavsc.Abstract/Messaging/DismissedNotification.cs).
|
||||
|
||||
### Création et notifications métier
|
||||
|
||||
Le contrôleur MVC
|
||||
[`NotificationsController`](../../src/Yavsc.Org/Controllers/Communicating/NotificationsController.cs)
|
||||
permet la gestion CRUD des enregistrements de notification.
|
||||
|
||||
Le service [`YavscMessageSender`](../../src/Yavsc.Server/Services/YavscMessageSender.cs)
|
||||
crée aussi une notification persistée, ciblée sur `user/{id}`, pour les
|
||||
événements `RdvQueryEvent` et `ClientEstimateSignedEvent`. L'enregistrement
|
||||
est effectué avant l'envoi d'e-mail. Le même service tente ensuite d'envoyer
|
||||
un e-mail si l'adresse est disponible et confirmée, puis diffuse l'événement
|
||||
`push` aux connexions SignalR actives de l'utilisateur.
|
||||
|
||||
Cette diffusion `push` est conditionnée par la présence de connexions actives ;
|
||||
l'avis stocké en base reste, lui, disponible lors d'une récupération ultérieure
|
||||
par l'API.
|
||||
|
||||
## 2. Site Web
|
||||
|
||||
### Annonces persistées sur l'accueil
|
||||
|
||||
[`HomeController.Index`](../../src/Yavsc.Org/Controllers/HomeController.cs)
|
||||
charge les notifications non masquées et les place dans `ViewBag.Notify`.
|
||||
[`_Layout.cshtml`](../../src/Yavsc.Org/Views/Shared/_Layout.cshtml) les rend
|
||||
comme des alertes Bootstrap avec icône, titre, corps et action. Le titre et le
|
||||
corps passent par les composants Markdown du site.
|
||||
|
||||
Le clic sur l'action appelle `POST /Home/DismissNotification/{id}` via
|
||||
[`site.js`](../../src/Yavsc.Org/wwwroot/js/site.js) :
|
||||
|
||||
- pour un utilisateur connecté, le masquage est enregistré dans
|
||||
`DismissClicked` ;
|
||||
- pour un visiteur anonyme, les identifiants sont conservés dans la session
|
||||
Web (`clicked`).
|
||||
|
||||
La route renvoie `404` si l'avis n'existe pas et `204` après le masquage.
|
||||
Comme l'API, l'accueil Web filtre `Target` : les cibles `user/{id}` ne sont
|
||||
visibles qu'à l'utilisateur correspondant, et la cible `administration`
|
||||
uniquement aux administrateurs. Un visiteur anonyme ne reçoit que les
|
||||
notifications publiques (`Target` vide ou préfixe `pub/`).
|
||||
|
||||
### Messages temporaires par requête
|
||||
|
||||
Les helpers [`NotifyInfo`, `NotifyWarning` et `Notify`](../../src/Yavsc.Org/Helpers/ControllerHelpers.cs)
|
||||
ajoutent des objets à `ViewBag.Notify`. Ce mécanisme n'écrit pas en base :
|
||||
il ne vit que dans la réponse MVC qui rend le layout. Les méthodes
|
||||
`NotifyInfo` et `NotifyWarning` partagent actuellement le même rendu générique
|
||||
`alert-info`.
|
||||
|
||||
## 3. PostIt
|
||||
|
||||
[`NotificationsApiClient`](../../src/Yavsc.Api.Client/NotificationsApiClient.cs)
|
||||
construit les routes à partir de la base d'API de l'hôte métier configuré.
|
||||
Il fournit les méthodes de lecture publique et authentifiée, ainsi que les
|
||||
opérations de lecture, masquage et restauration.
|
||||
|
||||
Sur [`HomePage`](../../src/PostIt/PostIt/Views/Layout/HomePage.axaml),
|
||||
[`HomePageViewModel`](../../src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs)
|
||||
charge la liste :
|
||||
|
||||
- sans session valide, il appelle la route publique
|
||||
`GET /api/v1/notifications` ;
|
||||
- avec une session valide, il appelle
|
||||
`GET /api/v1/notifications/me` avec le client HTTP authentifié.
|
||||
|
||||
Le chargement est lancé à l'ouverture de la page et relancé lorsque l'état de
|
||||
connexion change. Un compteur de version ignore les réponses obsolètes si un
|
||||
chargement plus récent a déjà commencé. L'interface distingue l'état de
|
||||
chargement, la liste vide et l'erreur de chargement ; l'utilisateur peut aussi
|
||||
actualiser manuellement.
|
||||
|
||||
Le bouton d'une notification utilise `click_action` comme libellé et masque
|
||||
l'élément. En session authentifiée, PostIt appelle
|
||||
`POST /api/v1/dismiss/click/{id}` avant de retirer l'élément de la liste. Si
|
||||
l'appel échoue, l'élément reste affiché et une erreur est présentée. Sans
|
||||
session, l'élément est retiré de la liste locale, sans persistance du
|
||||
masquage côté serveur.
|
||||
|
||||
## 4. Événements temps réel
|
||||
|
||||
### Hub du chat
|
||||
|
||||
Le hub [`ChatHub`](../../src/Yavsc.Server/Hubs/ChatHub.cs) est publié par
|
||||
Yavsc.Api à la racine sous `/chathub` (et non sous `/api/v1`) et porte
|
||||
`[Authorize]`. Il s'appuie sur SignalR et sur `IConnexionManager` pour suivre
|
||||
les utilisateurs et les salons.
|
||||
|
||||
Les événements de notification émis par le hub comprennent notamment :
|
||||
|
||||
| Événement SignalR | Données | Utilisation PostIt |
|
||||
|---|---|---|
|
||||
| `notifyUser` | `type`, identifiant ou nom cible, message | Ajout au journal système |
|
||||
| `notifyRoom` | `type`, salon, utilisateur ou détail | Ajout au journal du salon ; met à jour la liste d'utilisateurs sur `UserJoin` |
|
||||
| `joint` | `ChatRoomInfo` | Initialise la vue du salon rejoint |
|
||||
| `ReceiveMessage` | message avec nom, salon et corps | Ajoute le message à l'historique du salon |
|
||||
| `notifyUserInRoom` | `type`, salon, message | Pas de gestionnaire correspondant dans `ChatViewModel` actuellement |
|
||||
|
||||
Les constantes de types du chat sont déclarées dans
|
||||
[`NotificationTypes`](../../src/Yavsc.Abstract/Messaging/NotificationTypes.cs).
|
||||
Les messages `notifyUser` et `notifyRoom` ne sont pas enregistrés en base :
|
||||
ils décrivent l'état temps réel de connexion, de salon ou les erreurs de
|
||||
conversation.
|
||||
|
||||
Le [`ChatViewModel`](../../src/PostIt/PostIt/ViewModels/Chat/ChatViewModel.cs)
|
||||
ouvre le hub avec le jeton d'accès PostIt, tente un renouvellement silencieux
|
||||
du jeton, et active la reconnexion automatique. Après reconnexion, il rejoint
|
||||
à nouveau le salon sélectionné, car la connexion SignalR précédente et ses
|
||||
groupes ne sont plus actifs. Les callbacks mettent à jour les collections sur
|
||||
le thread UI d'Avalonia.
|
||||
|
||||
### Événement métier `push`
|
||||
|
||||
En plus des événements du chat, `YavscMessageSender` utilise le même contexte
|
||||
SignalR pour émettre `push` avec le topic et une charge utile sérialisée. Ce
|
||||
nom d'événement est distinct de `notifyUser` et `notifyRoom`. Aucun
|
||||
gestionnaire `push` n'est présent dans le client PostIt actuel : les annonces
|
||||
métier persistées sont visibles dans PostIt lors du prochain chargement ou
|
||||
rafraîchissement HTTP.
|
||||
|
||||
## 5. Points d'attention pour les évolutions
|
||||
|
||||
- Conserver les règles d'audience alignées entre l'API et le site Web ; en
|
||||
particulier, appliquer un filtrage `Target` côté Web avant d'exposer les
|
||||
avis dans le layout.
|
||||
- Ne pas confondre masquage utilisateur (`DismissClicked`) et suppression
|
||||
globale de la notification : le masquage API est par utilisateur.
|
||||
- Les sessions anonymes du site Web et PostIt n'ont pas le même comportement :
|
||||
le site Web conserve le masquage en session, tandis que PostIt ne le garde
|
||||
que dans la liste affichée jusqu'au prochain rechargement.
|
||||
- Ajouter un nouveau type de cible ou un nouvel événement temps réel implique
|
||||
d'examiner séparément son filtrage, son transport et les clients qui
|
||||
l'écoutent.
|
||||
- Les références à GCM et le nom historique de `YavscMessageSender` ne
|
||||
signifient pas que PostIt reçoit une notification native hors ligne : le
|
||||
chemin observé ici est l'e-mail, l'événement SignalR temps réel et la
|
||||
notification persistée récupérée par HTTP.
|
||||
|
||||
## Références d'implémentation
|
||||
|
||||
- [`Notification`](../../src/Yavsc.Abstract/Messaging/Notification.cs)
|
||||
- [`NotificationsApiController`](../../src/Yavsc.Api/Controllers/Administration/NotificationsApiController.cs)
|
||||
- [`DismissClicksApiController`](../../src/Yavsc.Api/Controllers/Administration/DismissClicksApiController.cs)
|
||||
- [`NotificationsController`](../../src/Yavsc.Org/Controllers/Communicating/NotificationsController.cs)
|
||||
- [`HomeController`](../../src/Yavsc.Org/Controllers/HomeController.cs)
|
||||
- [`YavscMessageSender`](../../src/Yavsc.Server/Services/YavscMessageSender.cs)
|
||||
- [`ChatHub`](../../src/Yavsc.Server/Hubs/ChatHub.cs)
|
||||
- [`NotificationsApiClient`](../../src/Yavsc.Api.Client/NotificationsApiClient.cs)
|
||||
- [`HomePageViewModel`](../../src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs)
|
||||
- [`ChatViewModel`](../../src/PostIt/PostIt/ViewModels/Chat/ChatViewModel.cs)
|
||||
299
doc/invoicing.md
299
doc/invoicing.md
|
|
@ -1,299 +0,0 @@
|
|||
# Facturation et paiement après devis signé
|
||||
|
||||
## Objectif
|
||||
|
||||
Ce document fixe le plan métier et technique pour le flux qui suit la validation du devis :
|
||||
|
||||
- le devis est signé par les deux parties,
|
||||
- le prestataire déclenche la création d'une facture non acquittée,
|
||||
- la facture contient la ligne associée au mode de paiement choisi par le prestataire,
|
||||
- le client règle le montant partiel ou total,
|
||||
- la facture reste non acquittée tant que le total n'est pas intégralement payé.
|
||||
|
||||
## Règle métier de base
|
||||
|
||||
1. Le devis n'est considéré comme valide que lorsqu'il est signé par le fournisseur et par le client.
|
||||
2. Une facture ne peut être générée qu'après cette double validation.
|
||||
3. Le type de contrat choisi dans les settings du prestataire détermine le mode de règlement :
|
||||
- arrhes,
|
||||
- avance,
|
||||
- ou autre mode de facturation supporté par le système.
|
||||
4. Le montant payé partiellement est enregistré comme paiement partiel, sans transformer la facture en facture entièrement payée.
|
||||
5. La facture est marquée comme acquittée uniquement lorsque le montant total est effectivement réglé.
|
||||
6. L'addition / le relevé de paiement doit mentionner le paiement effectué, sans prétendre que la facture est déjà entièrement acquittée.
|
||||
|
||||
## Flux attendu
|
||||
|
||||
### 1. Devis signé par les deux parties
|
||||
|
||||
Le flux contractuel suit la séquence :
|
||||
|
||||
- commande / demande,
|
||||
- devis préparé,
|
||||
- validation prestataire,
|
||||
- validation client,
|
||||
- double signature persistée.
|
||||
|
||||
Une fois cette étape passée, le devis est un contrat exploitable pour la facture.
|
||||
|
||||
### 2. Génération de la facture non acquittée
|
||||
|
||||
Le prestataire déclenche la création de la facture depuis le contexte du devis validé.
|
||||
|
||||
Le système doit alors :
|
||||
|
||||
- identifier le devis validé,
|
||||
- récupérer le client et le prestataire,
|
||||
- sélectionner le mode de contrat défini dans les settings du prestataire,
|
||||
- ajouter la ligne de frais correspondante à la facture,
|
||||
- créer la facture dans un état "non acquittée".
|
||||
|
||||
### 3. Paiement partiel
|
||||
|
||||
Le client peut payer en premier :
|
||||
|
||||
- l'avance,
|
||||
- les arrhes,
|
||||
- ou une tranche partielle.
|
||||
|
||||
Dans ce cas :
|
||||
|
||||
- le paiement est enregistré,
|
||||
- le montant payé est ajouté au total enregistré,
|
||||
- la facture reste "non acquittée" tant qu'elle n'a pas été réglée intégralement,
|
||||
- l'addition doit refléter la transaction effectuée sans annoncer un paiement total abusif.
|
||||
|
||||
### 4. Acquittement total
|
||||
|
||||
Lorsque le client a payé la somme totale due :
|
||||
|
||||
- le statut de la facture passe à "payée" / "acquittée",
|
||||
- la facture peut être considérée comme totalement soldée,
|
||||
- la génération de documents ou notifications finales peut s'appuyer sur cet état.
|
||||
|
||||
## Règles de codage à respecter
|
||||
|
||||
### Règle 1 — ne pas confondre paiement partiel et paiement total
|
||||
|
||||
Le modèle de paiement ne doit pas se limiter à un booléen "payé / non payé".
|
||||
|
||||
Le bon niveau de modélisation est :
|
||||
|
||||
- montant dû,
|
||||
- montant payé,
|
||||
- montant restant,
|
||||
- statut de paiement partiel / total,
|
||||
- état d'acquittement final.
|
||||
|
||||
### Règle 2 — la facture ne doit pas être "payée" trop tôt
|
||||
|
||||
Le système ne doit pas marquer la facture comme entièrement payée à la première transaction.
|
||||
|
||||
L'état métier doit être calculé de manière explicite :
|
||||
|
||||
- `montantPaye < montantTotal` => facture non acquittée,
|
||||
- `montantPaye >= montantTotal` => facture acquittée (reste à payer borné à zéro).
|
||||
|
||||
### Règle 3 — les arrhes / avances doivent rester cohérents avec le contexte contractuel
|
||||
|
||||
Le mode choisi par le prestataire (arrhes ou avance) doit être représenté de façon explicite dans le flux de génération de facture et dans l'addition.
|
||||
|
||||
Le comportement attendu est :
|
||||
|
||||
- la ligne de frais correspondante est ajoutée à la facture,
|
||||
- le paiement initial est comptabilisé correctement,
|
||||
- le solde restant reste visible et exploitable.
|
||||
|
||||
## Plan d'implémentation proposé
|
||||
|
||||
### Étape 1 — modéliser les règles de paiement
|
||||
|
||||
Implémentée sur le point d'entrée existant `IBillable` /
|
||||
`NominativeServiceCommand`, sans créer encore d'entité Facture distincte :
|
||||
|
||||
- `AmountDue` et `AmountPaid` sont persistés sur la commande ; le montant dû
|
||||
reste `null` tant que le total de facture n'a pas été établi.
|
||||
- `SetPaymentAmounts(amountDue, amountPaid)` définit un instantané validé
|
||||
des montants (décimaux non négatifs), côté métier uniquement. Les setters
|
||||
privés empêchent leur alimentation par les requêtes de modification de commande.
|
||||
- `PaymentSummary` expose les montants dû, payé et restant, ainsi que
|
||||
`Unpaid`, `PartiallyPaid` ou `Paid` ; il est absent si le montant dû est inconnu.
|
||||
- Le restant est borné à zéro en cas de trop-perçu, sans perdre le montant payé.
|
||||
L'acquittement est atteint si `AmountPaid >= AmountDue`. Une facture
|
||||
explicitement établie à zéro est soldée ; un montant inconnu ne l'est pas.
|
||||
- `GetIsAcquitted()` et le suffixe documentaire `-ack` utilisent ce calcul,
|
||||
jamais le seul statut PayPal `SUCCESS`.
|
||||
|
||||
La migration ajoute les montants sans reconstituer de paiements historiques :
|
||||
les anciennes commandes ont un dû inconnu et un payé nul. Un rapprochement
|
||||
explicite est nécessaire avant de les considérer comme acquittées.
|
||||
La génération depuis le devis et l'alimentation du payé sont désormais
|
||||
branchées par le service `InvoicingService` (étapes 2 et 4 ci-dessous).
|
||||
L'appel `SetPaymentAmounts` remplace un total cumulé ; il n'enregistre pas
|
||||
une transaction et ne doit pas être utilisé pour additionner un retour PayPal
|
||||
sans contrôle d'idempotence.
|
||||
|
||||
Objectifs couverts :
|
||||
|
||||
- identifier le point d'entrée métier de la facture,
|
||||
- ajouter un modèle de montant dû / montant payé / montant restant,
|
||||
- distinguer clairement l'état partiel du statut de paiement total,
|
||||
- éviter toute logique qui force un booléen `IsPaid = true` dès le premier paiement.
|
||||
|
||||
### Étape 2 — brancher la génération de facture sur le devis signé
|
||||
|
||||
Implémentée par `POST /api/v1/invoices/from-estimate/{estimateId}` :
|
||||
|
||||
- réservée au prestataire du devis (ou à un administrateur) ;
|
||||
- exige les deux dates de validation **et** les deux signatures persistées,
|
||||
non vides, associées aux bons signataires ; une date seule ne suffit pas ;
|
||||
- exige une commande existante, dont le client et le prestataire correspondent
|
||||
au devis ; les devis sans commande restent des devis, non des factures ;
|
||||
- copie les lignes du devis, sa devise EUR, son total et ses parties dans
|
||||
un instantané de facture sur la commande, daté côté serveur ;
|
||||
- accepte les remises mais refuse un total négatif, les quantités non positives,
|
||||
les prix infra-centime et les devis multidevises ;
|
||||
- initialise le payé à zéro, sans assimiler un ancien checkout à un encaissement ;
|
||||
- renvoie la même facture lors d'un nouvel appel pour le même devis, sans
|
||||
changer le total ou effacer les paiements ; une autre facture ou un solde
|
||||
historique préexistant sur la commande provoque un conflit de rapprochement.
|
||||
|
||||
`GET /api/v1/invoices/{commandId}` expose l'instantané et l'historique aux
|
||||
parties de la facture et aux administrateurs. Les statuts sont des chaînes
|
||||
`Unpaid`, `PartiallyPaid` et `Paid`. Les lignes utilisées par `GetBillItems()`
|
||||
sont celles de la facture figée, même si le devis est modifié ensuite.
|
||||
Les commandes facturées et leurs devis ne sont plus supprimables par les
|
||||
routes de commande concernées. Le changement de prestataire est bloqué sur
|
||||
les routes usuelles de modification ; l'instantané reste la référence des parties.
|
||||
|
||||
Cette création établit la facture métier et ses montants, **pas un PDF** :
|
||||
le moteur historique de rendu documentaire reste distinct. Ses routes de
|
||||
génération exigent désormais une facture établie.
|
||||
|
||||
### Étape 3 — intégrer le mode de contrat du prestataire
|
||||
|
||||
- lire le setting du prestataire qui indique le type de contrat,
|
||||
- associer ce mode à la ligne de frais ajoutée sur la facture,
|
||||
- garantir que la ligne peut être différenciée selon arrhes ou avance.
|
||||
|
||||
### Étape 4 — enregistrer les paiements sans surinterpréter le statut
|
||||
|
||||
Implémentée par deux sources d'encaissement, sans débit déclenché par ces routes :
|
||||
|
||||
| Route POST sous `/api/v1/invoices/{commandId}` | Source de vérité | Accès |
|
||||
| --- | --- | --- |
|
||||
| `/payments/offline` | Attestation du prestataire : référence, montant, devise, date de réception | Prestataire ou administrateur |
|
||||
| `/payments/paypal` | Réponse serveur PayPal `GetTransactionDetails` pour un identifiant de transaction | Parties ou administrateur |
|
||||
|
||||
Le reçu hors ligne doit être strictement positif, en centimes EUR, avec une
|
||||
référence non vide et une date non future. Il est attesté, pas vérifié auprès
|
||||
de la banque. La référence est unique par prestataire ; le client ne peut
|
||||
pas s'auto-déclarer acquitté.
|
||||
|
||||
Pour PayPal, seul l'identifiant est accepté du client. Le serveur vérifie :
|
||||
|
||||
- statut `Completed`, et non un simple `ACK=Success` ou un statut `Pending` ;
|
||||
- identifiant exact, référence de facture `TypeCommande/Id` (`INVNUM`),
|
||||
devise de la facture et compte marchand destinataire (`RECEIVERID`) ;
|
||||
- montant brut reçu strictement positif et date retournés par PayPal.
|
||||
|
||||
Le token de checkout historique n'est **pas** un identifiant de transaction.
|
||||
Le retour historique `ConfirmPayment` ne constitue toujours pas une preuve
|
||||
d'encaissement et n'alimente pas le solde. Cette intégration vérifie des
|
||||
transactions déjà encaissées ; elle n'ajoute ni capture, ni webhook, ni
|
||||
automatisation du retour navigateur. Le protocole NVP reprend le système
|
||||
Classic déjà utilisé par le dépôt ; il est déprécié par PayPal et réservé
|
||||
aux marchands existants compatibles.
|
||||
|
||||
Chaque encaissement conserve sa référence, son origine, son montant, sa
|
||||
devise, ses dates de réception/enregistrement et l'identifiant de l'acteur.
|
||||
La référence PayPal est unique globalement : une même transaction ne peut
|
||||
pas solder deux factures. Rejouer un reçu identique ne l'ajoute pas deux fois ;
|
||||
réutiliser sa référence avec d'autres détails renvoie `409`.
|
||||
|
||||
L'ajout au journal et la mise à jour du total payé sont sauvegardés dans la
|
||||
même transaction EF relationnelle. Un jeton de concurrence sur la commande
|
||||
empêche les pertes de mise à jour. En cas de conflit concurrent, la route
|
||||
renvoie `409` : rejouer **la même référence et le même corps** permet de
|
||||
réessayer sans double comptage. Un solde ne correspondant pas au journal
|
||||
requiert un rapprochement, sans réinitialisation silencieuse.
|
||||
|
||||
Le solde est calculé à partir des reçus cumulés. Un paiement partiel garde
|
||||
la facture non acquittée ; un trop-perçu est conservé avec un restant nul.
|
||||
Le texte de l'addition affiche payé, restant et statut.
|
||||
|
||||
#### Configuration et utilisation
|
||||
|
||||
Appliquer la migration `SignedEstimateInvoicing` avant déploiement.
|
||||
Elle ajoute l'instantané, le jeton de concurrence et le journal `InvoicePayments`,
|
||||
sans créer de facture ni de reçu pour les données historiques.
|
||||
|
||||
La vérification PayPal utilise la section `Authentication:PayPal` :
|
||||
`Mode` (`sandbox` ou `production`), `MerchantAccountId` et
|
||||
`MerchantAccountUserName`. Une entrée de `Accounts` doit correspondre à ce
|
||||
dernier via `ApiUsername`, avec `ApiPassword` et `Signature`.
|
||||
Conserver les identifiants dans les secrets ou l'environnement, jamais dans
|
||||
un fichier versionné. Sans configuration exploitable, la route renvoie `503`
|
||||
sans enregistrer de paiement ; une panne ou une réponse invalide PayPal
|
||||
renvoie `502`/`504`, sans modifier le solde.
|
||||
|
||||
Le client partagé `InvoicesApiClient` expose les quatre opérations.
|
||||
Le document `/openapi/invoicing.json` est réservé aux administrateurs en
|
||||
développement, comme les autres documents OpenAPI du serveur.
|
||||
Des exemples de requêtes sont fournis dans `src/Yavsc.Api/Invoicing.http` ;
|
||||
adapter l'adresse du serveur et les jetons. Aucun écran PostIt n'est ajouté
|
||||
dans ce lot.
|
||||
|
||||
### Étape 5 — finaliser l'état acquitté
|
||||
|
||||
- calculer le total payé,
|
||||
- si `totalPaye >= totalDu`, alors passer la facture en état acquittée,
|
||||
- envoyer les notifications / documents associés au cas échéant.
|
||||
|
||||
Le calcul du statut est branché aux encaissements. Les notifications finales,
|
||||
le rendu documentaire, les remboursements/annulations de reçus et les
|
||||
rapprochements historiques restent hors de ce lot, tout comme l'étape 3.
|
||||
Un remboursement ou litige ultérieur n'est pas synchronisé automatiquement :
|
||||
ne pas utiliser ce journal d'encaissements comme gestion complète des
|
||||
remboursements PayPal.
|
||||
|
||||
## Tests à couvrir
|
||||
|
||||
Les tests implémentés du backend s'exécutent avec le runner MTP du dépôt :
|
||||
|
||||
```bash
|
||||
dotnet test --project src/test/Yavsc.Api.Tests/Yavsc.Api.Tests.csproj \
|
||||
--filter-class '*InvoiceApiTests' --filter-class '*HairCutQueryApiControllerTests'
|
||||
dotnet test --project src/test/Yavsc.Server.Tests/Yavsc.Server.Tests.csproj \
|
||||
--filter-class '*PaymentSummaryTests' --filter-class '*PayPalTransactionVerifierTests'
|
||||
dotnet test --project src/PostIt/PostIt.Tests/PostIt.Tests.csproj \
|
||||
--filter-class '*InvoicesApiClientTests'
|
||||
```
|
||||
|
||||
Les tests HTTP utilisent la base relationnelle isolée de la fixture.
|
||||
Ils vérifient notamment qu'un ajout concurrent perdant est entièrement
|
||||
annulé (journal et total), puis rejouable. Les tests PayPal utilisent des
|
||||
réponses HTTP simulées, sans identifiants réels ni appel au prestataire.
|
||||
Ils ne remplacent pas une recette sandbox sur un compte Classic compatible.
|
||||
|
||||
Le flux doit être validé par des tests ciblés sur :
|
||||
|
||||
- devis signé par les deux parties → génération d'une facture non acquittée,
|
||||
- mode arrhes / avance → ligne de frais correctement ajoutée,
|
||||
- paiement partiel → montant enregistré sans statut payé complet,
|
||||
- paiement total → facture marquée acquittée,
|
||||
- addition / message de paiement → mention du montant réellement versé sans faux état d'acquittement complet.
|
||||
|
||||
## Critère de sortie fonctionnel
|
||||
|
||||
Le comportement attendu est considéré comme atteint si le scénario suivant est vérifié :
|
||||
|
||||
1. le devis est doublé signé,
|
||||
2. le prestataire génère une facture non acquittée,
|
||||
3. le client paye une avance ou des arrhes,
|
||||
4. la facture reste non acquittée tant qu'elle n'est pas totalement soldée,
|
||||
5. la facture devient acquittée uniquement lorsque le total est réglé.
|
||||
|
||||
## Note de contexte
|
||||
|
||||
Ce document consolide la décision métier issue du workflow “Prestation / devis” et est volontairement limité au périmètre de la facturation et du paiement après signature du devis. Il ne remplace pas les règles plus larges de gestion des litiges, workflows d'annulation ou paiements transverses déjà documentés ailleurs.
|
||||
|
|
@ -65,20 +65,6 @@ Rituels recommandes:
|
|||
- Mensuel: mise a jour du present guide et du playbook.
|
||||
- A chaque incident: ajouter un anti-pattern dans le playbook.
|
||||
|
||||
### Reseau de versionnement / git flow pour le CHANGELOG
|
||||
|
||||
Regle obligatoire:
|
||||
- La section courante du CHANGELOG représente la prochaine version a publier, pas un tag deja créé.
|
||||
- Un tag deja publie bloque définitivement la section correspondante du CHANGELOG.
|
||||
- Au commit suivant, si la modification impacte le CHANGELOG, il faut incrémenter la version exposée dans le changelog (version du prochain tag attendu), par exemple: `1.0.8-rc30 -> 1.0.8-rc31`.
|
||||
|
||||
Ordre a respecter a chaque commit qui modifie le produit:
|
||||
1. Verifier si le dernier tag du CHANGELOG existe deja; si oui, incrémenter la version de la section suivante au lieu de re-écrire la dernière section bloquée.
|
||||
2. Ouvrir une nouvelle section du CHANGELOG avec ce numero de version incrémenté.
|
||||
3. Apres seulement, alimenter cette section avec la description du changement.
|
||||
|
||||
En pratique: la version du CHANGELOG est la version "future" a tagger, et elle est incrémentée avant l'écriture de la description; le tag n'est pas créé avant la section, il est seulement établi ensuite lors de la publication effective.
|
||||
|
||||
## Check-list de validation
|
||||
|
||||
- Le changement indique son impact architecture.
|
||||
|
|
|
|||
|
|
@ -97,59 +97,6 @@ decodage authentifie du replay. Aucun FFmpeg n'est requis par ces tests ni
|
|||
par l'application (le fichier d'entree peut provenir de n'importe quelle source).
|
||||
Les tests materiels camera/microphone Windows/Linux restent manuels.
|
||||
|
||||
### Rotation de la capture Android
|
||||
|
||||
Le calcul capteur/ecran/camera avant et les quatre transformations de texture
|
||||
sont couverts sans appareil :
|
||||
|
||||
```bash
|
||||
dotnet test --project src/PostIt/PostIt.Tests/PostIt.Tests.csproj \
|
||||
--filter-class '*CameraFrameOrientationTests' --filter-class '*CameraFrameClockTests'
|
||||
```
|
||||
|
||||
Un test Android supplementaire verifie le chemin OpenGL et l'encodeur reels,
|
||||
sans ouvrir la camera, sans microphone et sans contacter l'API :
|
||||
|
||||
```bash
|
||||
dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj -c Debug \
|
||||
-p:EmbedAssembliesIntoApk=true
|
||||
adb install -r -t src/PostIt/PostIt.Android/bin/Debug/net10.0-android/fr.pschneider.postit-Signed.apk
|
||||
adb shell am start -n fr.pschneider.postit/fr.pschneider.postit.CameraFrameRotationTestActivity
|
||||
adb shell run-as fr.pschneider.postit cat files/camera-rotation-test-result.txt
|
||||
```
|
||||
|
||||
Attendre la fin du test : `RUNNING` doit devenir `PASS`. Il encode quatre
|
||||
quadrants colores en MPEG-TS pour 0, 90, 180 et 270 degres, decode une image et
|
||||
verifie les dimensions (640x480 ou 480x640) et les couleurs aux quatre positions.
|
||||
La tolerance de chaque composante RGB est de 40 pour tenir compte de H.264.
|
||||
Une erreur de rendu, d'encodage, de decodage ou de comparaison produit `FAIL`
|
||||
avec l'exception. Cette activite est exclue des builds Release.
|
||||
|
||||
Le test synthetique ne couvre pas l'horloge Camera2 ni sa synchronisation avec
|
||||
le microphone. Avec l'accord de la personne utilisant le telephone, lancer
|
||||
aussi le test local reel (camera et microphone actifs, aucun envoi a l'API) :
|
||||
|
||||
```bash
|
||||
adb shell am start -n fr.pschneider.postit/fr.pschneider.postit.PodcastCaptureTestActivity --es microphone true
|
||||
adb shell run-as fr.pschneider.postit cat files/podcast-capture-test-result.txt
|
||||
```
|
||||
|
||||
Attendre `PASS` : au moins trois segments, 8 a 16 secondes capturees,
|
||||
pistes H.264 et AAC presentes, et progression des segments en arriere-plan.
|
||||
Ce test detecte notamment les captures de zero seconde dues au decalage entre
|
||||
l'horloge Camera2 et celle de MediaRecorder. Les fichiers restent dans le
|
||||
repertoire prive indique par le resultat pour verification locale.
|
||||
Le resultat inclut les angles capteur/ecran et la premiere matrice
|
||||
SurfaceTexture recue. Les tests unitaires couvrent notamment la matrice
|
||||
reelle `[0,-1,0,0,-1,0,0,0,0,0,1,0,1,1,0,1]` : pour un capteur a 90 degres
|
||||
et un ecran a 0, elle porte deja la rotation et ne doit pas recevoir 90 degres
|
||||
supplementaires. Le test synthetique seul ne detecte pas cette double rotation.
|
||||
|
||||
Verifier aussi manuellement les cameras avant/arriere en portrait et paysage,
|
||||
le son, le direct et le replay, et la poursuite de l'emission en arriere-plan.
|
||||
L'orientation est fixee au demarrage d'une emission ; tourner le telephone
|
||||
pendant l'emission ne reconfigure pas le format encode.
|
||||
|
||||
## Quand ne PAS écrire de test
|
||||
|
||||
Un test qui ne détecte rien n'est pas un test. Si l'invariant
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
|
||||
<PropertyGroup>
|
||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||
<AvaloniaVersionBase>12.1.4</AvaloniaVersionBase>
|
||||
<AvaloniaVersionBase>12.1.3</AvaloniaVersionBase>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersionBase)" />
|
||||
|
|
@ -13,13 +13,11 @@
|
|||
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersionBase)" />
|
||||
<PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersionBase)" />
|
||||
<PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersionBase)" />
|
||||
<PackageVersion Include="Avalonia.Headless" Version="12.1.4" />
|
||||
<PackageVersion Include="Avalonia.Headless" Version="12.1.3" />
|
||||
<PackageVersion Include="Avalonia.Headless.Xunit" Version="$(AvaloniaVersionBase)" />
|
||||
<PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersionBase)" />
|
||||
<PackageVersion Include="DirectShowLib" Version="1.0.0" />
|
||||
<PackageVersion Include="LibVLCSharp.Avalonia" Version="3.10.2" />
|
||||
<PackageVersion Include="LibVLCSharp" Version="3.10.2" />
|
||||
<PackageVersion Include="VideoLAN.LibVLC.Android" Version="3.7.0-beta" />
|
||||
<PackageVersion Include="Live.Avalonia" Version="1.4.2" />
|
||||
<PackageVersion Include="Mapsui" Version="5.1.0" />
|
||||
<PackageVersion Include="Mapsui.Avalonia12" Version="5.1.0" />
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ using Microsoft.Extensions.DependencyInjection;
|
|||
using Avalonia.Controls;
|
||||
using Avalonia.Styling;
|
||||
using Yavsc.Api.Client;
|
||||
using PostIt.Services;
|
||||
|
||||
[assembly: UsesPermission(Manifest.Permission.AccessFineLocation)]
|
||||
[assembly: UsesPermission(Manifest.Permission.AccessCoarseLocation)]
|
||||
|
|
@ -21,7 +20,6 @@ namespace PostIt.Android
|
|||
{
|
||||
protected Application(nint javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
|
||||
{
|
||||
Platform.IsPodcastSupported = true;
|
||||
}
|
||||
|
||||
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ public class MainActivity : AvaloniaMainActivity
|
|||
/// The current MainActivity instance.
|
||||
/// </summary>
|
||||
public static MainActivity? Current { get; private set; }
|
||||
internal static bool IsForeground { get; private set; }
|
||||
|
||||
protected override void OnCreate(global::Android.OS.Bundle? savedInstanceState)
|
||||
{
|
||||
|
|
@ -37,8 +36,8 @@ public class MainActivity : AvaloniaMainActivity
|
|||
EmojiCompat.Config config = new FontRequestEmojiCompatConfig(this, fontRequest);
|
||||
EmojiCompat.Init(config);
|
||||
PlatformBootstrap.InitPlatform();
|
||||
Current = this;
|
||||
base.OnCreate(savedInstanceState);
|
||||
Current = this;
|
||||
}
|
||||
/// <summary>
|
||||
/// Receives the deep-link Intent fired by the system browser after the
|
||||
|
|
@ -61,34 +60,9 @@ public class MainActivity : AvaloniaMainActivity
|
|||
|
||||
}
|
||||
|
||||
protected override void OnStop()
|
||||
public override void OnRequestPermissionsResult(int requestCode, string[]? permissions, Permission[]? grantResults)
|
||||
{
|
||||
PostIt.Services.Platform.SuspendPlayback();
|
||||
base.OnStop();
|
||||
}
|
||||
|
||||
protected override void OnResume()
|
||||
{
|
||||
base.OnResume();
|
||||
IsForeground = true;
|
||||
}
|
||||
|
||||
protected override void OnPause()
|
||||
{
|
||||
IsForeground = false;
|
||||
base.OnPause();
|
||||
}
|
||||
|
||||
protected override void OnRestart()
|
||||
{
|
||||
base.OnRestart();
|
||||
PostIt.Services.Platform.ResumePlayback();
|
||||
}
|
||||
|
||||
public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults)
|
||||
{
|
||||
if (PostIt.Android.Services.PodcastPermissions.HandleResult(requestCode, permissions, grantResults)
|
||||
|| PostIt.Android.Services.AndroidCurrentLocationProvider
|
||||
if (PostIt.Android.Services.AndroidCurrentLocationProvider
|
||||
.HandlePermissionResult(requestCode, grantResults))
|
||||
{
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -21,12 +21,5 @@ internal static class PlatformBootstrap
|
|||
};
|
||||
|
||||
Platform.TryGetCurrentLocationAsync = AndroidCurrentLocationProvider.TryGetCurrentLocationAsync;
|
||||
Platform.CreateVideoSurface = player => new AndroidVideoSurface(player);
|
||||
if (System.OperatingSystem.IsAndroidVersionAtLeast(26))
|
||||
{
|
||||
Platform.GetPodcastCaptureDevices = AndroidPodcastCapture.GetDevices;
|
||||
Platform.RequestPodcastPermissionsAsync = AndroidPodcastCapture.RequestPermissionsAsync;
|
||||
Platform.CreatePodcastCaptureAsync = AndroidPodcastCapture.StartAsync;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
|
||||
<AndroidPackageFormat>apk</AndroidPackageFormat>
|
||||
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
|
||||
<AssemblyVersion>1.0.8.0</AssemblyVersion>
|
||||
<FileVersion>1.0.8.0</FileVersion>
|
||||
<InformationalVersion>1.0.8-458+Branch.main.Sha.ad92744a94c829947994ffef5e8a6598f62868f8</InformationalVersion>
|
||||
<Version>1.0.8-458</Version>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-estimate.1+364.Branch.feature-estimate.Sha.3d6ab6e72f9ba4ccfa250a1cce154b550281405e</InformationalVersion>
|
||||
<Version>1.1.0-estimate.1</Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<AndroidResource Include="Icon.png">
|
||||
|
|
@ -21,25 +21,20 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Avalonia.Android" />
|
||||
<PackageReference Include="LibVLCSharp" />
|
||||
<PackageReference Include="VideoLAN.LibVLC.Android" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Browser" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\PostIt\PostIt.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
|
||||
<Compile Include="..\PostIt.Tests\AndroidPodcastCaptureTestActivity.cs" Link="Tests\AndroidPodcastCaptureTestActivity.cs" />
|
||||
<Compile Include="..\PostIt.Tests\AndroidCameraFrameRotationTestActivity.cs" Link="Tests\AndroidCameraFrameRotationTestActivity.cs" />
|
||||
</ItemGroup>
|
||||
<!-- This is an Avalonia app, not a MAUI app: exclude the .NET MAUI VS Code
|
||||
extension's injected HotReload agent (references Microsoft.Maui.*).
|
||||
The agent file is added via CustomAfterMicrosoftCommonTargets, i.e. after
|
||||
this file's item groups, so the removal must run in a target. -->
|
||||
<Target Name="ExcludeMauiDeployHotReloadAgent" BeforeTargets="CoreCompile" Condition="'$(MauiDeployHotReloadAgentSource)' != ''">
|
||||
<Target Name="ExcludeMauiDeployHotReloadAgent" BeforeTargets="CoreCompile"
|
||||
Condition="'$(MauiDeployHotReloadAgentSource)' != ''">
|
||||
<ItemGroup>
|
||||
<Compile Remove="$(MauiDeployHotReloadAgentSource)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false" />
|
||||
<uses-feature android:name="android.hardware.microphone" android:required="false" />
|
||||
<application
|
||||
android:label="PostIt"
|
||||
android:icon="@drawable/Icon"
|
||||
|
|
|
|||
|
|
@ -1,308 +0,0 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Android.Graphics;
|
||||
using Android.Opengl;
|
||||
using Android.OS;
|
||||
using Android.Views;
|
||||
using Java.Nio;
|
||||
|
||||
namespace PostIt.Android.Services;
|
||||
|
||||
internal sealed class AndroidCameraFrameRotator : IDisposable
|
||||
{
|
||||
private const int ExternalTexture = 0x8D65;
|
||||
private const int RecordableAndroid = 0x3142;
|
||||
private const string VertexShader = """
|
||||
attribute vec2 position;
|
||||
attribute vec2 textureCoordinate;
|
||||
uniform mat4 textureMatrix;
|
||||
varying vec2 uv;
|
||||
void main() {
|
||||
gl_Position = vec4(position, 0.0, 1.0);
|
||||
uv = (textureMatrix * vec4(textureCoordinate, 0.0, 1.0)).xy;
|
||||
}
|
||||
""";
|
||||
private const string FragmentShader = """
|
||||
#extension GL_OES_EGL_image_external : require
|
||||
precision mediump float;
|
||||
uniform samplerExternalOES cameraTexture;
|
||||
varying vec2 uv;
|
||||
void main() {
|
||||
gl_FragColor = texture2D(cameraTexture, uv);
|
||||
}
|
||||
""";
|
||||
|
||||
private readonly HandlerThread _thread = new("PostIt.CameraRotation");
|
||||
private readonly Handler _handler;
|
||||
private readonly Action<Exception> _failed;
|
||||
private readonly float[] _textureMatrix = new float[16];
|
||||
private readonly CameraFrameClock _clock = new();
|
||||
private EGLDisplay? _display;
|
||||
private EGLContext? _context;
|
||||
private EGLSurface? _window;
|
||||
private SurfaceTexture? _texture;
|
||||
private FrameListener? _listener;
|
||||
private Surface? _cameraSurface;
|
||||
private FloatBuffer? _vertices;
|
||||
private FloatBuffer? _coordinates;
|
||||
private int _program;
|
||||
private int _textureId;
|
||||
private int _matrixLocation;
|
||||
private bool _rendering;
|
||||
private bool _disposed;
|
||||
private int _rotation;
|
||||
private int? _remainingRotation;
|
||||
internal string? FirstTextureTransform { get; private set; }
|
||||
|
||||
internal Surface CameraSurface => _cameraSurface
|
||||
?? throw new InvalidOperationException("Surface de rotation camera indisponible.");
|
||||
|
||||
private AndroidCameraFrameRotator(Action<Exception> failed)
|
||||
{
|
||||
_failed = failed;
|
||||
_thread.Start();
|
||||
_handler = new Handler(_thread.Looper!);
|
||||
}
|
||||
|
||||
internal static async Task<AndroidCameraFrameRotator> CreateAsync(
|
||||
Surface encoderSurface, int width, int height, int rotation, Action<Exception> failed)
|
||||
{
|
||||
var rotator = new AndroidCameraFrameRotator(failed);
|
||||
try
|
||||
{
|
||||
await rotator.InvokeAsync(() => rotator.Initialize(encoderSurface, width, height, rotation));
|
||||
return rotator;
|
||||
}
|
||||
catch
|
||||
{
|
||||
rotator.Dispose();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
private void Initialize(Surface encoderSurface, int width, int height, int rotation)
|
||||
{
|
||||
_rotation = rotation;
|
||||
_display = EGL14.EglGetDisplay(EGL14.EglDefaultDisplay);
|
||||
if (_display is null || _display.Equals(EGL14.EglNoDisplay))
|
||||
throw EglError("Obtention de l'affichage EGL");
|
||||
if (!EGL14.EglInitialize(_display, new int[2], 0, new int[2], 0))
|
||||
throw EglError("Initialisation EGL");
|
||||
int[] attributes =
|
||||
[
|
||||
EGL14.EglRedSize, 8, EGL14.EglGreenSize, 8, EGL14.EglBlueSize, 8,
|
||||
EGL14.EglRenderableType, EGL14.EglOpenglEs2Bit,
|
||||
EGL14.EglSurfaceType, EGL14.EglWindowBit, RecordableAndroid, 1, EGL14.EglNone
|
||||
];
|
||||
var configs = new EGLConfig[1];
|
||||
var count = new int[1];
|
||||
if (!EGL14.EglChooseConfig(_display, attributes, 0, configs, 0, 1, count, 0) || count[0] == 0)
|
||||
throw EglError("Configuration EGL pour l'encodeur");
|
||||
_context = EGL14.EglCreateContext(_display, configs[0], EGL14.EglNoContext,
|
||||
[EGL14.EglContextClientVersion, 2, EGL14.EglNone], 0);
|
||||
if (_context is null || _context.Equals(EGL14.EglNoContext))
|
||||
throw EglError("Creation du contexte EGL");
|
||||
_window = EGL14.EglCreateWindowSurface(_display, configs[0], encoderSurface, [EGL14.EglNone], 0);
|
||||
if (_window is null || _window.Equals(EGL14.EglNoSurface))
|
||||
throw EglError("Creation de la surface EGL");
|
||||
if (!EGL14.EglMakeCurrent(_display, _window, _window, _context))
|
||||
throw EglError("Activation du contexte EGL");
|
||||
|
||||
_program = CreateProgram();
|
||||
var ids = new int[1];
|
||||
GLES20.GlGenTextures(1, ids, 0);
|
||||
_textureId = ids[0];
|
||||
GLES20.GlBindTexture(ExternalTexture, _textureId);
|
||||
GLES20.GlTexParameteri(ExternalTexture, GLES20.GlTextureMinFilter, GLES20.GlLinear);
|
||||
GLES20.GlTexParameteri(ExternalTexture, GLES20.GlTextureMagFilter, GLES20.GlLinear);
|
||||
GLES20.GlTexParameteri(ExternalTexture, GLES20.GlTextureWrapS, GLES20.GlClampToEdge);
|
||||
GLES20.GlTexParameteri(ExternalTexture, GLES20.GlTextureWrapT, GLES20.GlClampToEdge);
|
||||
_vertices = CreateBuffer([-1, -1, 1, -1, -1, 1, 1, 1]);
|
||||
_coordinates = CreateBuffer(CameraFrameOrientation.GetTextureCoordinates(0));
|
||||
GLES20.GlUseProgram(_program);
|
||||
BindAttribute("position", _vertices);
|
||||
BindAttribute("textureCoordinate", _coordinates);
|
||||
_matrixLocation = GLES20.GlGetUniformLocation(_program, "textureMatrix");
|
||||
GLES20.GlUniform1i(GLES20.GlGetUniformLocation(_program, "cameraTexture"), 0);
|
||||
GLES20.GlViewport(0, 0, rotation is 90 or 270 ? height : width, rotation is 90 or 270 ? width : height);
|
||||
CheckGl();
|
||||
|
||||
_texture = new SurfaceTexture(_textureId);
|
||||
_texture.SetDefaultBufferSize(width, height);
|
||||
_listener = new FrameListener(this);
|
||||
_texture.SetOnFrameAvailableListener(_listener, _handler);
|
||||
_cameraSurface = new Surface(_texture);
|
||||
}
|
||||
|
||||
internal Task StartAsync() => InvokeAsync(() => _rendering = true);
|
||||
|
||||
private void DrawFrame(SurfaceTexture texture)
|
||||
{
|
||||
if (!_rendering) return;
|
||||
try
|
||||
{
|
||||
texture.UpdateTexImage();
|
||||
var presentationTime = _clock.GetPresentationTime(texture.Timestamp, Java.Lang.JavaSystem.NanoTime());
|
||||
if (presentationTime is null) return;
|
||||
texture.GetTransformMatrix(_textureMatrix);
|
||||
var remainingRotation = CameraFrameOrientation.GetRemainingRotation(_rotation, _textureMatrix);
|
||||
if (_remainingRotation != remainingRotation)
|
||||
{
|
||||
_remainingRotation = remainingRotation;
|
||||
FirstTextureTransform = string.Join(", ", _textureMatrix);
|
||||
_coordinates!.Position(0);
|
||||
_coordinates.Put(CameraFrameOrientation.GetTextureCoordinates(remainingRotation));
|
||||
_coordinates.Position(0);
|
||||
global::Android.Util.Log.Info("PostIt.Podcast",
|
||||
$"Camera texture transform: [{FirstTextureTransform}], remaining rotation={remainingRotation}");
|
||||
}
|
||||
GLES20.GlUniformMatrix4fv(_matrixLocation, 1, false, _textureMatrix, 0);
|
||||
GLES20.GlDrawArrays(GLES20.GlTriangleStrip, 0, 4);
|
||||
CheckGl();
|
||||
if (!EGLExt.EglPresentationTimeANDROID(_display, _window, presentationTime.Value))
|
||||
throw EglError("Horodatage de l'image camera");
|
||||
if (!EGL14.EglSwapBuffers(_display, _window))
|
||||
throw EglError("Envoi de l'image a l'encodeur");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_rendering = false;
|
||||
_failed(new InvalidOperationException("Rotation de la capture Android impossible.", ex));
|
||||
}
|
||||
}
|
||||
|
||||
private Task InvokeAsync(Action action)
|
||||
{
|
||||
var completion = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
if (!_handler.Post(() =>
|
||||
{
|
||||
try { action(); completion.SetResult(); }
|
||||
catch (Exception ex) { completion.SetException(ex); }
|
||||
}))
|
||||
completion.SetException(new InvalidOperationException("Le thread de rotation camera est arrete."));
|
||||
return completion.Task;
|
||||
}
|
||||
|
||||
private static FloatBuffer CreateBuffer(float[] values)
|
||||
{
|
||||
using var bytes = ByteBuffer.AllocateDirect(values.Length * sizeof(float))
|
||||
?? throw new InvalidOperationException("Allocation du tampon OpenGL impossible.");
|
||||
bytes.Order(ByteOrder.NativeOrder()!);
|
||||
var buffer = bytes.AsFloatBuffer()
|
||||
?? throw new InvalidOperationException("Creation du tampon OpenGL impossible.");
|
||||
buffer.Put(values);
|
||||
buffer.Position(0);
|
||||
return buffer;
|
||||
}
|
||||
|
||||
private void BindAttribute(string name, FloatBuffer buffer)
|
||||
{
|
||||
var location = GLES20.GlGetAttribLocation(_program, name);
|
||||
GLES20.GlEnableVertexAttribArray(location);
|
||||
GLES20.GlVertexAttribPointer(location, 2, GLES20.GlFloat, false, 0, buffer);
|
||||
}
|
||||
|
||||
private static int CreateShader(int type, string source)
|
||||
{
|
||||
var shader = GLES20.GlCreateShader(type);
|
||||
GLES20.GlShaderSource(shader, source);
|
||||
GLES20.GlCompileShader(shader);
|
||||
var status = new int[1];
|
||||
GLES20.GlGetShaderiv(shader, GLES20.GlCompileStatus, status, 0);
|
||||
if (status[0] != 0) return shader;
|
||||
var error = GLES20.GlGetShaderInfoLog(shader);
|
||||
GLES20.GlDeleteShader(shader);
|
||||
throw new InvalidOperationException($"Compilation du shader camera impossible : {error}");
|
||||
}
|
||||
|
||||
private static int CreateProgram()
|
||||
{
|
||||
var vertex = CreateShader(GLES20.GlVertexShader, VertexShader);
|
||||
var fragment = 0;
|
||||
var program = 0;
|
||||
try
|
||||
{
|
||||
fragment = CreateShader(GLES20.GlFragmentShader, FragmentShader);
|
||||
program = GLES20.GlCreateProgram();
|
||||
GLES20.GlAttachShader(program, vertex);
|
||||
GLES20.GlAttachShader(program, fragment);
|
||||
GLES20.GlLinkProgram(program);
|
||||
var status = new int[1];
|
||||
GLES20.GlGetProgramiv(program, GLES20.GlLinkStatus, status, 0);
|
||||
if (status[0] == 0)
|
||||
throw new InvalidOperationException($"Edition du programme camera impossible : {GLES20.GlGetProgramInfoLog(program)}");
|
||||
return program;
|
||||
}
|
||||
catch
|
||||
{
|
||||
if (program != 0) GLES20.GlDeleteProgram(program);
|
||||
throw;
|
||||
}
|
||||
finally
|
||||
{
|
||||
GLES20.GlDeleteShader(vertex);
|
||||
if (fragment != 0) GLES20.GlDeleteShader(fragment);
|
||||
}
|
||||
}
|
||||
|
||||
private static void CheckGl()
|
||||
{
|
||||
var error = GLES20.GlGetError();
|
||||
if (error != GLES20.GlNoError)
|
||||
throw new InvalidOperationException($"Erreur OpenGL de capture : 0x{error:X}.");
|
||||
}
|
||||
|
||||
private static InvalidOperationException EglError(string operation)
|
||||
=> new($"{operation} impossible : EGL 0x{EGL14.EglGetError():X}.");
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
if (_disposed) return;
|
||||
_disposed = true;
|
||||
try { InvokeAsync(Release).GetAwaiter().GetResult(); }
|
||||
finally
|
||||
{
|
||||
_thread.QuitSafely();
|
||||
_thread.Join();
|
||||
_handler.Dispose();
|
||||
_thread.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
private void Release()
|
||||
{
|
||||
_rendering = false;
|
||||
_texture?.SetOnFrameAvailableListener(null);
|
||||
_cameraSurface?.Release();
|
||||
_cameraSurface?.Dispose();
|
||||
_texture?.Release();
|
||||
_texture?.Dispose();
|
||||
_listener?.Dispose();
|
||||
if (_program != 0) GLES20.GlDeleteProgram(_program);
|
||||
if (_textureId != 0) GLES20.GlDeleteTextures(1, [_textureId], 0);
|
||||
_vertices?.Dispose();
|
||||
_coordinates?.Dispose();
|
||||
if (_display is not null && !_display.Equals(EGL14.EglNoDisplay))
|
||||
{
|
||||
EGL14.EglMakeCurrent(_display, EGL14.EglNoSurface, EGL14.EglNoSurface, EGL14.EglNoContext);
|
||||
if (_window is not null && !_window.Equals(EGL14.EglNoSurface))
|
||||
EGL14.EglDestroySurface(_display, _window);
|
||||
if (_context is not null && !_context.Equals(EGL14.EglNoContext))
|
||||
EGL14.EglDestroyContext(_display, _context);
|
||||
EGL14.EglReleaseThread();
|
||||
EGL14.EglTerminate(_display);
|
||||
}
|
||||
_window?.Dispose();
|
||||
_context?.Dispose();
|
||||
_display?.Dispose();
|
||||
}
|
||||
|
||||
private sealed class FrameListener(AndroidCameraFrameRotator owner)
|
||||
: Java.Lang.Object, SurfaceTexture.IOnFrameAvailableListener
|
||||
{
|
||||
public void OnFrameAvailable(SurfaceTexture? texture)
|
||||
{
|
||||
if (texture is not null) owner.DrawFrame(texture);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,348 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.Versioning;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Android.Content;
|
||||
using Android.Hardware.Camera2;
|
||||
using Android.Hardware.Camera2.Params;
|
||||
using Android.Media;
|
||||
using Android.OS;
|
||||
using Android.Views;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
using PostIt.Services;
|
||||
|
||||
namespace PostIt.Android.Services;
|
||||
|
||||
[SupportedOSPlatform("android26.0")]
|
||||
internal sealed class AndroidPodcastCapture : IPodcastCapture
|
||||
{
|
||||
private readonly PodcastCaptureService _service;
|
||||
private readonly SemaphoreSlim _stopGate = new(1);
|
||||
private readonly TaskCompletionSource _completion = new(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
private readonly Handler _handler = new(Looper.MainLooper!);
|
||||
private CameraDevice? _camera;
|
||||
private CameraCaptureSession? _session;
|
||||
private MediaRecorder? _recorder;
|
||||
private AndroidCameraFrameRotator? _rotator;
|
||||
private Surface? _surface;
|
||||
private ParcelFileDescriptor? _readPipe;
|
||||
private ParcelFileDescriptor? _writePipe;
|
||||
private Task _pump = Task.CompletedTask;
|
||||
private Exception? _failure;
|
||||
private bool _stopped;
|
||||
private bool _stopRequested;
|
||||
private bool _started;
|
||||
private bool _disposed;
|
||||
public Task Completion => _completion.Task;
|
||||
internal string OrientationDiagnostics { get; private set; } = "";
|
||||
internal string? TextureTransform => _rotator?.FirstTextureTransform;
|
||||
|
||||
private AndroidPodcastCapture(PodcastCaptureService service) => _service = service;
|
||||
|
||||
private static CameraManager GetManager(Context context)
|
||||
=> context.GetSystemService(Context.CameraService) as CameraManager
|
||||
?? throw new InvalidOperationException("Service camera Android indisponible.");
|
||||
|
||||
public static PodcastCaptureDevices GetDevices()
|
||||
{
|
||||
var activity = MainActivity.Current ?? throw new InvalidOperationException("Activite Android indisponible.");
|
||||
var manager = GetManager(activity);
|
||||
var cameras = new List<CaptureDevice>();
|
||||
foreach (var id in manager.GetCameraIdList())
|
||||
{
|
||||
using var characteristics = manager.GetCameraCharacteristics(id);
|
||||
using var facing = characteristics.Get(CameraCharacteristics.LensFacing) as Java.Lang.Integer;
|
||||
cameras.Add(new(facing?.IntValue() == (int)LensFacing.Front ? "Camera avant" : "Camera arriere", id));
|
||||
}
|
||||
return new(cameras, [new("Sans microphone", ""), new("Microphone Android", "microphone")]);
|
||||
}
|
||||
|
||||
public static async Task RequestPermissionsAsync(string? microphone, CancellationToken ct)
|
||||
{
|
||||
var activity = MainActivity.Current ?? throw new InvalidOperationException("Activite Android indisponible.");
|
||||
await PodcastPermissions.EnsureAsync(activity, microphone is not null, ct);
|
||||
if (!MainActivity.IsForeground)
|
||||
throw new InvalidOperationException("Revenez dans PostIt pour demarrer la camera.");
|
||||
}
|
||||
|
||||
public static async Task<IPodcastCapture> StartAsync(string camera, string? microphone, string directory, CancellationToken ct)
|
||||
{
|
||||
await RequestPermissionsAsync(microphone, ct);
|
||||
var activity = MainActivity.Current ?? throw new InvalidOperationException("Activite Android indisponible.");
|
||||
var service = await PodcastCaptureService.StartAsync(activity, microphone is not null, ct);
|
||||
var capture = new AndroidPodcastCapture(service);
|
||||
service.Capture = capture;
|
||||
try
|
||||
{
|
||||
ct.ThrowIfCancellationRequested();
|
||||
await capture.StartNativeAsync(camera, microphone is not null, directory, ct);
|
||||
return capture;
|
||||
}
|
||||
catch
|
||||
{
|
||||
await capture.DisposeAsync();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
private async Task StartNativeAsync(string cameraId, bool microphone, string directory, CancellationToken ct)
|
||||
{
|
||||
await _stopGate.WaitAsync(ct);
|
||||
try { await ConfigureNativeAsync(cameraId, microphone, directory, ct); }
|
||||
finally { _stopGate.Release(); }
|
||||
}
|
||||
|
||||
private async Task ConfigureNativeAsync(string cameraId, bool microphone, string directory, CancellationToken ct)
|
||||
{
|
||||
var manager = GetManager(_service);
|
||||
using var characteristics = manager.GetCameraCharacteristics(cameraId);
|
||||
using var formats = characteristics.Get(CameraCharacteristics.ScalerStreamConfigurationMap) as StreamConfigurationMap
|
||||
?? throw new InvalidOperationException("Formats camera indisponibles.");
|
||||
var sizes = formats.GetOutputSizes(Java.Lang.Class.FromType(typeof(MediaRecorder)))
|
||||
?? throw new InvalidOperationException("Aucun format video disponible.");
|
||||
var size = sizes.Where(s => s.Width <= 640 && s.Height <= 480)
|
||||
.OrderByDescending(s => s.Width * s.Height).FirstOrDefault()
|
||||
?? throw new InvalidOperationException("La camera ne propose aucun format jusqu'a 480p.");
|
||||
using var sensor = characteristics.Get(CameraCharacteristics.SensorOrientation) as Java.Lang.Integer
|
||||
?? throw new InvalidOperationException("Orientation du capteur camera indisponible.");
|
||||
using var facing = characteristics.Get(CameraCharacteristics.LensFacing) as Java.Lang.Integer
|
||||
?? throw new InvalidOperationException("Position du capteur camera indisponible.");
|
||||
var activity = MainActivity.Current ?? throw new InvalidOperationException("Activite Android indisponible.");
|
||||
#pragma warning disable CS0618, CA1422
|
||||
var display = OperatingSystem.IsAndroidVersionAtLeast(30)
|
||||
? activity.Display : activity.WindowManager?.DefaultDisplay;
|
||||
#pragma warning restore CS0618, CA1422
|
||||
var displayRotation = display?.Rotation
|
||||
?? throw new InvalidOperationException("Orientation de l'ecran Android indisponible.");
|
||||
var displayDegrees = displayRotation switch
|
||||
{
|
||||
SurfaceOrientation.Rotation0 => 0,
|
||||
SurfaceOrientation.Rotation90 => 90,
|
||||
SurfaceOrientation.Rotation180 => 180,
|
||||
SurfaceOrientation.Rotation270 => 270,
|
||||
_ => throw new InvalidOperationException($"Rotation d'ecran Android inconnue : {displayRotation}.")
|
||||
};
|
||||
var rotation = CameraFrameOrientation.GetRotation(sensor.IntValue(), displayDegrees,
|
||||
facing.IntValue() == (int)LensFacing.Front);
|
||||
global::Android.Util.Log.Info("PostIt.Podcast",
|
||||
$"Camera orientation: sensor={sensor.IntValue()}, display={displayDegrees}, facing={facing.IntValue()}, rotation={rotation}");
|
||||
OrientationDiagnostics = $"sensor={sensor.IntValue()}, display={displayDegrees}, facing={facing.IntValue()}, rotation={rotation}";
|
||||
#pragma warning disable CS0618
|
||||
_recorder = OperatingSystem.IsAndroidVersionAtLeast(31)
|
||||
? new MediaRecorder(_service) : new MediaRecorder();
|
||||
#pragma warning restore CS0618
|
||||
_recorder.Error += OnRecorderError;
|
||||
if (microphone) _recorder.SetAudioSource(AudioSource.Mic);
|
||||
_recorder.SetVideoSource(VideoSource.Surface);
|
||||
_recorder.SetOutputFormat(OutputFormat.Mpeg2Ts);
|
||||
_recorder.SetVideoSize(rotation is 90 or 270 ? size.Height : size.Width,
|
||||
rotation is 90 or 270 ? size.Width : size.Height);
|
||||
_recorder.SetVideoFrameRate(30);
|
||||
_recorder.SetVideoEncodingBitRate(1200000);
|
||||
_recorder.SetVideoEncoder(VideoEncoder.H264);
|
||||
if (microphone)
|
||||
{
|
||||
_recorder.SetAudioSamplingRate(48000);
|
||||
_recorder.SetAudioChannels(1);
|
||||
_recorder.SetAudioEncodingBitRate(96000);
|
||||
_recorder.SetAudioEncoder(AudioEncoder.Aac);
|
||||
}
|
||||
var pipe = ParcelFileDescriptor.CreatePipe()
|
||||
?? throw new IOException("Creation du canal MPEG-TS impossible.");
|
||||
_readPipe = pipe[0];
|
||||
_writePipe = pipe[1];
|
||||
_recorder.SetOutputFile(_writePipe.FileDescriptor);
|
||||
await Task.Run(_recorder.Prepare, ct);
|
||||
ct.ThrowIfCancellationRequested();
|
||||
if (_stopRequested) throw new System.OperationCanceledException("Demarrage de la capture annule.");
|
||||
_surface = _recorder.Surface ?? throw new InvalidOperationException("Surface encodeur indisponible.");
|
||||
_rotator = await AndroidCameraFrameRotator.CreateAsync(_surface, size.Width, size.Height, rotation, Fail);
|
||||
ct.ThrowIfCancellationRequested();
|
||||
if (_stopRequested) throw new System.OperationCanceledException("Demarrage de la capture annule.");
|
||||
var cameraSurface = _rotator.CameraSurface;
|
||||
var opened = new TaskCompletionSource<CameraDevice>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
manager.OpenCamera(cameraId, new DeviceCallback(this, opened), _handler);
|
||||
_camera = await opened.Task.WaitAsync(TimeSpan.FromSeconds(10), ct);
|
||||
var configured = new TaskCompletionSource<CameraCaptureSession>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
#pragma warning disable CS0618, CA1422
|
||||
_camera.CreateCaptureSession(new List<Surface> { cameraSurface }, new SessionCallback(this, configured), _handler);
|
||||
#pragma warning restore CS0618, CA1422
|
||||
_session = await configured.Task.WaitAsync(TimeSpan.FromSeconds(10), ct);
|
||||
ct.ThrowIfCancellationRequested();
|
||||
if (_stopRequested) throw new System.OperationCanceledException("Demarrage de la capture annule.");
|
||||
using var request = _camera.CreateCaptureRequest(CameraTemplate.Record);
|
||||
request.AddTarget(cameraSurface);
|
||||
using var built = request.Build();
|
||||
var handle = new SafeFileHandle((IntPtr)_readPipe.Fd, ownsHandle: false);
|
||||
var stream = new FileStream(handle, FileAccess.Read);
|
||||
_pump = Task.Run(async () =>
|
||||
{
|
||||
using (handle)
|
||||
using (stream)
|
||||
{
|
||||
try
|
||||
{
|
||||
await new TransportStreamCapture(directory).RunAsync(stream, CancellationToken.None);
|
||||
if (_failure is not null) throw new IOException("Capture Android interrompue.", _failure);
|
||||
if (!_stopped) throw new IOException("Le flux de capture Android s'est ferme prematurement.");
|
||||
_completion.TrySetResult();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_completion.TrySetException(ex);
|
||||
// Drain until MediaRecorder stops, so its writer cannot block Stop().
|
||||
await stream.CopyToAsync(System.IO.Stream.Null);
|
||||
}
|
||||
}
|
||||
});
|
||||
await Task.Run(_recorder.Start, ct);
|
||||
_started = true;
|
||||
await _rotator.StartAsync();
|
||||
_session.SetRepeatingRequest(built, null, _handler);
|
||||
_writePipe.Close();
|
||||
_writePipe.Dispose();
|
||||
_writePipe = null;
|
||||
}
|
||||
|
||||
private sealed class DeviceCallback(AndroidPodcastCapture capture, TaskCompletionSource<CameraDevice> opened)
|
||||
: CameraDevice.StateCallback
|
||||
{
|
||||
public override void OnOpened(CameraDevice camera)
|
||||
{
|
||||
if (capture._stopRequested || opened.Task.IsCompleted)
|
||||
{
|
||||
camera.Close();
|
||||
opened.TrySetException(new IOException("Ouverture camera annulee."));
|
||||
}
|
||||
else
|
||||
{
|
||||
capture._camera = camera;
|
||||
opened.TrySetResult(camera);
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnDisconnected(CameraDevice camera) => Fail(camera, "Camera Android deconnectee.");
|
||||
public override void OnError(CameraDevice camera, CameraError error) => Fail(camera, $"Erreur camera Android : {error}.");
|
||||
private void Fail(CameraDevice camera, string message)
|
||||
{
|
||||
camera.Close();
|
||||
var error = new IOException(message);
|
||||
opened.TrySetException(error);
|
||||
capture.Fail(error);
|
||||
}
|
||||
}
|
||||
|
||||
private sealed class SessionCallback(AndroidPodcastCapture capture, TaskCompletionSource<CameraCaptureSession> configured)
|
||||
: CameraCaptureSession.StateCallback
|
||||
{
|
||||
public override void OnConfigured(CameraCaptureSession session)
|
||||
{
|
||||
if (capture._stopRequested || configured.Task.IsCompleted)
|
||||
{
|
||||
session.Close();
|
||||
configured.TrySetException(new IOException("Configuration camera annulee."));
|
||||
}
|
||||
else
|
||||
{
|
||||
capture._session = session;
|
||||
configured.TrySetResult(session);
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnConfigureFailed(CameraCaptureSession session)
|
||||
{
|
||||
session.Close();
|
||||
var error = new IOException("Configuration de la capture Android impossible.");
|
||||
configured.TrySetException(error);
|
||||
capture.Fail(error);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnRecorderError(object? sender, MediaRecorder.ErrorEventArgs e)
|
||||
=> Fail(new IOException($"Erreur encodeur Android : {e.What}/{e.Extra}."));
|
||||
|
||||
private void Fail(Exception error)
|
||||
{
|
||||
if (_stopped) return;
|
||||
_failure = error;
|
||||
_completion.TrySetException(error);
|
||||
RequestStop();
|
||||
}
|
||||
|
||||
internal async void RequestStop()
|
||||
{
|
||||
try { await StopAsync(); }
|
||||
catch (Exception ex) { global::Android.Util.Log.Error("PostIt.Podcast", ex.ToString()); }
|
||||
}
|
||||
|
||||
public async Task StopAsync()
|
||||
{
|
||||
_stopRequested = true;
|
||||
await _stopGate.WaitAsync();
|
||||
try
|
||||
{
|
||||
if (_stopped) return;
|
||||
_stopped = true;
|
||||
await Task.Run(StopNative);
|
||||
await _pump;
|
||||
}
|
||||
finally { _stopGate.Release(); }
|
||||
}
|
||||
|
||||
private void StopNative()
|
||||
{
|
||||
try
|
||||
{
|
||||
// Keep frames flowing until MediaRecorder has drained its encoder.
|
||||
if (_started) _recorder?.Stop();
|
||||
}
|
||||
catch (Java.Lang.RuntimeException ex)
|
||||
{
|
||||
_failure = ex;
|
||||
_completion.TrySetException(new IOException("L'encodeur Android n'a pas pu finaliser la capture.", ex));
|
||||
}
|
||||
finally
|
||||
{
|
||||
_started = false;
|
||||
_session?.Close();
|
||||
_session?.Dispose();
|
||||
_session = null;
|
||||
_camera?.Close();
|
||||
_camera?.Dispose();
|
||||
_camera = null;
|
||||
_rotator?.Dispose();
|
||||
_rotator = null;
|
||||
if (_recorder is not null)
|
||||
{
|
||||
_recorder.Error -= OnRecorderError;
|
||||
_recorder.Release();
|
||||
_recorder.Dispose();
|
||||
_recorder = null;
|
||||
}
|
||||
_surface?.Dispose();
|
||||
_surface = null;
|
||||
_writePipe?.Close();
|
||||
_writePipe?.Dispose();
|
||||
_writePipe = null;
|
||||
}
|
||||
}
|
||||
|
||||
public async ValueTask DisposeAsync()
|
||||
{
|
||||
if (_disposed) return;
|
||||
_disposed = true;
|
||||
try { await StopAsync(); }
|
||||
finally
|
||||
{
|
||||
_readPipe?.Dispose();
|
||||
_readPipe = null;
|
||||
_service.Capture = null;
|
||||
_service.StopSelf();
|
||||
_handler.Dispose();
|
||||
_stopGate.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
using System;
|
||||
using Avalonia.Android;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Platform;
|
||||
using LibVLCSharp.Shared;
|
||||
using VideoView = LibVLCSharp.Platforms.Android.VideoView;
|
||||
|
||||
namespace PostIt.Android.Services;
|
||||
|
||||
internal sealed class AndroidVideoSurface(MediaPlayer player) : NativeControlHost, IDisposable
|
||||
{
|
||||
private VideoView? _video;
|
||||
private bool _disposed;
|
||||
|
||||
protected override IPlatformHandle CreateNativeControlCore(IPlatformHandle parent)
|
||||
{
|
||||
var activity = MainActivity.Current
|
||||
?? throw new InvalidOperationException("L'activite Android est indisponible.");
|
||||
var video = new VideoView(activity) { MediaPlayer = _disposed ? null : player };
|
||||
_video = video;
|
||||
return new AndroidViewControlHandle(video);
|
||||
}
|
||||
|
||||
protected override void DestroyNativeControlCore(IPlatformHandle control)
|
||||
{
|
||||
if (control is AndroidViewControlHandle { View: VideoView video })
|
||||
video.MediaPlayer = null;
|
||||
_video = null;
|
||||
base.DestroyNativeControlCore(control);
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
_disposed = true;
|
||||
if (_video is not null) _video.MediaPlayer = null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
using System;
|
||||
|
||||
namespace PostIt.Android.Services;
|
||||
|
||||
internal sealed class CameraFrameClock
|
||||
{
|
||||
private long? _offset;
|
||||
private long? _previousTimestamp;
|
||||
|
||||
internal long? GetPresentationTime(long cameraTimestamp, long monotonicNow)
|
||||
{
|
||||
if (_previousTimestamp is { } previous)
|
||||
{
|
||||
if (cameraTimestamp == previous) return null;
|
||||
if (cameraTimestamp < previous)
|
||||
throw new InvalidOperationException("Les horodatages de la camera Android ont recule.");
|
||||
}
|
||||
// Camera2 may use elapsed realtime (including suspend), whereas MediaRecorder
|
||||
// and its microphone use monotonic time. Preserve frame intervals, not that epoch.
|
||||
_offset ??= monotonicNow - cameraTimestamp;
|
||||
_previousTimestamp = cameraTimestamp;
|
||||
return checked(cameraTimestamp + _offset.Value);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
using System;
|
||||
|
||||
namespace PostIt.Android.Services;
|
||||
|
||||
internal static class CameraFrameOrientation
|
||||
{
|
||||
internal static int GetRotation(int sensorDegrees, int displayDegrees, bool frontFacing)
|
||||
{
|
||||
Validate(sensorDegrees);
|
||||
Validate(displayDegrees);
|
||||
return (sensorDegrees + (frontFacing ? displayDegrees : -displayDegrees) + 360) % 360;
|
||||
}
|
||||
|
||||
internal static float[] GetTextureCoordinates(int clockwiseDegrees)
|
||||
{
|
||||
Validate(clockwiseDegrees);
|
||||
float[] corners = [0, 0, 1, 0, 0, 1, 1, 1];
|
||||
for (var i = 0; i < corners.Length; i += 2)
|
||||
{
|
||||
var x = corners[i];
|
||||
var y = corners[i + 1];
|
||||
(corners[i], corners[i + 1]) = clockwiseDegrees switch
|
||||
{
|
||||
90 => (1 - y, x),
|
||||
180 => (1 - x, 1 - y),
|
||||
270 => (y, 1 - x),
|
||||
_ => (x, y)
|
||||
};
|
||||
}
|
||||
return corners;
|
||||
}
|
||||
|
||||
internal static int GetRemainingRotation(int clockwiseDegrees, float[] textureMatrix)
|
||||
{
|
||||
Validate(clockwiseDegrees);
|
||||
if (textureMatrix.Length != 16)
|
||||
throw new ArgumentException("A SurfaceTexture transform must contain 16 elements.", nameof(textureMatrix));
|
||||
// SurfaceTexture's usual Y flip changes the sign of the first column's Y.
|
||||
// Camera2 can also put the sensor rotation in this matrix; don't apply it twice.
|
||||
var angle = Math.Atan2(-textureMatrix[1], textureMatrix[0]) * 180 / Math.PI;
|
||||
if (!double.IsFinite(angle) || (textureMatrix[0] == 0 && textureMatrix[1] == 0))
|
||||
throw new ArgumentException("Invalid SurfaceTexture orientation.", nameof(textureMatrix));
|
||||
var quarterTurns = (int)Math.Round(angle / 90);
|
||||
if (Math.Abs(angle - quarterTurns * 90) > 0.01)
|
||||
throw new ArgumentException("SurfaceTexture orientation is not a quarter turn.", nameof(textureMatrix));
|
||||
var producerRotation = (quarterTurns * 90 + 360) % 360;
|
||||
return (clockwiseDegrees - producerRotation + 360) % 360;
|
||||
}
|
||||
|
||||
private static void Validate(int degrees)
|
||||
{
|
||||
if (degrees is not (0 or 90 or 180 or 270))
|
||||
throw new ArgumentOutOfRangeException(nameof(degrees), degrees, "Rotation must be 0, 90, 180 or 270 degrees.");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
using System;
|
||||
using System.Runtime.Versioning;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Android.App;
|
||||
using Android.Content;
|
||||
using Android.Content.PM;
|
||||
using Android.OS;
|
||||
using AndroidX.Core.App;
|
||||
|
||||
namespace PostIt.Android.Services;
|
||||
|
||||
[Service(Exported = false, ForegroundServiceType = ForegroundService.TypeCamera | ForegroundService.TypeMicrophone)]
|
||||
[SupportedOSPlatform("android26.0")]
|
||||
public sealed class PodcastCaptureService : Service
|
||||
{
|
||||
private const string Channel = "podcast-broadcast";
|
||||
internal const string StopAction = "fr.pschneider.postit.STOP_PODCAST";
|
||||
private const int NotificationId = 4044;
|
||||
private static TaskCompletionSource<PodcastCaptureService>? _pending;
|
||||
private PowerManager.WakeLock? _wakeLock;
|
||||
internal AndroidPodcastCapture? Capture { get; set; }
|
||||
|
||||
public static async Task<PodcastCaptureService> StartAsync(Activity activity, bool microphone, CancellationToken ct)
|
||||
{
|
||||
if (_pending is not null) throw new InvalidOperationException("Un direct Android est deja en cours.");
|
||||
var pending = new TaskCompletionSource<PodcastCaptureService>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
_pending = pending;
|
||||
try
|
||||
{
|
||||
var intent = new Intent(activity, typeof(PodcastCaptureService)).PutExtra("microphone", microphone);
|
||||
activity.StartForegroundService(intent);
|
||||
return await pending.Task.WaitAsync(TimeSpan.FromSeconds(10), ct);
|
||||
}
|
||||
catch
|
||||
{
|
||||
activity.StopService(new Intent(activity, typeof(PodcastCaptureService)));
|
||||
_pending = null;
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
public override StartCommandResult OnStartCommand(Intent? intent, StartCommandFlags flags, int startId)
|
||||
{
|
||||
if (intent?.Action == StopAction)
|
||||
{
|
||||
if (Capture is { } capture) capture.RequestStop();
|
||||
else
|
||||
{
|
||||
_pending?.TrySetException(new System.OperationCanceledException("Demarrage du direct annule depuis la notification."));
|
||||
StopSelf();
|
||||
}
|
||||
return StartCommandResult.NotSticky;
|
||||
}
|
||||
try
|
||||
{
|
||||
var manager = GetSystemService(NotificationService) as NotificationManager
|
||||
?? throw new InvalidOperationException("Notifications Android indisponibles.");
|
||||
manager.CreateNotificationChannel(new NotificationChannel(Channel, "Diffusion podcast", NotificationImportance.Low));
|
||||
var launch = PackageManager?.GetLaunchIntentForPackage(PackageName!)
|
||||
?? throw new InvalidOperationException("Application Android indisponible.");
|
||||
var open = PendingIntent.GetActivity(this, 0, launch, PendingIntentFlags.UpdateCurrent | PendingIntentFlags.Immutable);
|
||||
var stop = PendingIntent.GetService(this, 1,
|
||||
new Intent(this, typeof(PodcastCaptureService)).SetAction(StopAction),
|
||||
PendingIntentFlags.UpdateCurrent | PendingIntentFlags.Immutable);
|
||||
var builder = new NotificationCompat.Builder(this, Channel);
|
||||
builder.SetSmallIcon(global::Android.Resource.Drawable.IcMenuCamera);
|
||||
builder.SetContentTitle("Podcast en direct");
|
||||
builder.SetContentText("Camera active. Toucher pour revenir au direct.");
|
||||
builder.SetContentIntent(open);
|
||||
builder.SetOngoing(true);
|
||||
builder.AddAction(global::Android.Resource.Drawable.IcMediaPause, "Arreter et publier", stop);
|
||||
var notification = builder.Build();
|
||||
var type = (ForegroundService)0;
|
||||
if (OperatingSystem.IsAndroidVersionAtLeast(30))
|
||||
{
|
||||
type = ForegroundService.TypeCamera;
|
||||
if (intent?.GetBooleanExtra("microphone", false) == true) type |= ForegroundService.TypeMicrophone;
|
||||
}
|
||||
ServiceCompat.StartForeground(this, NotificationId, notification, (int)type);
|
||||
var power = GetSystemService(PowerService) as PowerManager
|
||||
?? throw new InvalidOperationException("Gestion d'alimentation Android indisponible.");
|
||||
_wakeLock = power.NewWakeLock(WakeLockFlags.Partial, "PostIt:Podcast")
|
||||
?? throw new InvalidOperationException("Le verrou d'alimentation Android est indisponible.");
|
||||
_wakeLock.Acquire();
|
||||
_pending?.TrySetResult(this);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_pending?.TrySetException(ex);
|
||||
StopSelf();
|
||||
}
|
||||
return StartCommandResult.NotSticky;
|
||||
}
|
||||
|
||||
public override IBinder? OnBind(Intent? intent) => null;
|
||||
|
||||
public override void OnDestroy()
|
||||
{
|
||||
_pending?.TrySetException(new InvalidOperationException("Le service de diffusion Android a ete arrete."));
|
||||
Capture?.RequestStop();
|
||||
Capture = null;
|
||||
if (_wakeLock?.IsHeld == true) _wakeLock.Release();
|
||||
_wakeLock?.Dispose();
|
||||
_wakeLock = null;
|
||||
_pending = null;
|
||||
base.OnDestroy();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
using System;
|
||||
using System.Linq;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Android;
|
||||
using Android.App;
|
||||
using Android.Content.PM;
|
||||
using AndroidX.Core.App;
|
||||
using AndroidX.Core.Content;
|
||||
|
||||
namespace PostIt.Android.Services;
|
||||
|
||||
internal static class PodcastPermissions
|
||||
{
|
||||
private const int RequestCode = 4043;
|
||||
private static TaskCompletionSource<bool>? _pending;
|
||||
private static string[] _requested = [];
|
||||
|
||||
public static async Task EnsureAsync(Activity activity, bool microphone, CancellationToken ct)
|
||||
{
|
||||
var requested = new List<string> { Manifest.Permission.Camera };
|
||||
if (microphone) requested.Add(Manifest.Permission.RecordAudio);
|
||||
if (OperatingSystem.IsAndroidVersionAtLeast(33)) requested.Add(Manifest.Permission.PostNotifications);
|
||||
var permissions = requested.ToArray();
|
||||
if (permissions.All(p => ContextCompat.CheckSelfPermission(activity, p) == Permission.Granted)) return;
|
||||
if (_pending is not null) throw new InvalidOperationException("Une demande de permissions est deja en cours.");
|
||||
_requested = permissions;
|
||||
var pending = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
_pending = pending;
|
||||
ActivityCompat.RequestPermissions(activity, permissions, RequestCode);
|
||||
if (!await pending.Task.WaitAsync(ct))
|
||||
throw new UnauthorizedAccessException("Autorisez la camera, les notifications et, si selectionne, le microphone pour diffuser.");
|
||||
}
|
||||
|
||||
public static bool HandleResult(int requestCode, string[]? permissions, Permission[]? results)
|
||||
{
|
||||
if (requestCode != RequestCode) return false;
|
||||
var granted = permissions is not null && results is not null && permissions.Length == results.Length
|
||||
&& _requested.All(p => Array.IndexOf(permissions, p) is var index && index >= 0
|
||||
&& results[index] == Permission.Granted);
|
||||
var pending = _pending;
|
||||
_pending = null;
|
||||
pending?.TrySetResult(granted);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
9
src/PostIt/PostIt.Android/proguard-rules.pro
vendored
9
src/PostIt/PostIt.Android/proguard-rules.pro
vendored
|
|
@ -1,9 +0,0 @@
|
|||
# Keep the LibVLC Android classes and JNI/native bindings intact in Release builds.
|
||||
# R8/ProGuard otherwise can strip or rename the Java-side entry points that load
|
||||
# the native libvlc and libc++_shared libraries bundled by VideoLAN.LibVLC.Android.
|
||||
-keep class org.videolan.libvlc.** { *; }
|
||||
-keep class org.videolan.libvlc.** { native *; }
|
||||
-keep class org.videolan.medialibrary.** { *; }
|
||||
-keepattributes *Annotation*
|
||||
-dontwarn org.videolan.libvlc.**
|
||||
-dontwarn org.videolan.medialibrary.**
|
||||
|
|
@ -4,10 +4,10 @@
|
|||
<OutputType>Exe</OutputType>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<Nullable>enable</Nullable>
|
||||
<AssemblyVersion>1.0.8.0</AssemblyVersion>
|
||||
<FileVersion>1.0.8.0</FileVersion>
|
||||
<InformationalVersion>1.0.8-458+Branch.main.Sha.ad92744a94c829947994ffef5e8a6598f62868f8</InformationalVersion>
|
||||
<Version>1.0.8-458</Version>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-estimate.1+364.Branch.feature-estimate.Sha.3d6ab6e72f9ba4ccfa250a1cce154b550281405e</InformationalVersion>
|
||||
<Version>1.1.0-estimate.1</Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Avalonia.Browser" />
|
||||
|
|
|
|||
|
|
@ -2,21 +2,15 @@
|
|||
using Avalonia;
|
||||
using Avalonia.Browser;
|
||||
using PostIt;
|
||||
using PostIt.Services;
|
||||
|
||||
internal sealed partial class Program
|
||||
{
|
||||
private static Task Main(string[] args)
|
||||
{
|
||||
Platform.IsPodcastSupported = false;
|
||||
|
||||
return BuildAvaloniaApp()
|
||||
private static Task Main(string[] args) => BuildAvaloniaApp()
|
||||
.WithInterFont()
|
||||
#if DEBUG
|
||||
.WithDeveloperTools()
|
||||
#endif
|
||||
.StartBrowserAppAsync("out");
|
||||
}
|
||||
|
||||
public static AppBuilder BuildAvaloniaApp()
|
||||
=> AppBuilder.Configure<App>();
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
See https://docs.avaloniaui.net/docs/guides/platforms/platform-specific-code/dotnet for more details.-->
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<AssemblyVersion>1.0.8.0</AssemblyVersion>
|
||||
<FileVersion>1.0.8.0</FileVersion>
|
||||
<InformationalVersion>1.0.8-458+Branch.main.Sha.ad92744a94c829947994ffef5e8a6598f62868f8</InformationalVersion>
|
||||
<Version>1.0.8-458</Version>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-estimate.1+364.Branch.feature-estimate.Sha.3d6ab6e72f9ba4ccfa250a1cce154b550281405e</InformationalVersion>
|
||||
<Version>1.1.0-estimate.1</Version>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
|
|
@ -24,4 +24,4 @@
|
|||
<ItemGroup>
|
||||
<ProjectReference Include="..\PostIt\PostIt.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ sealed class Program
|
|||
[STAThread]
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
Platform.IsPodcastSupported = true;
|
||||
CLIOptionHandler.HandleArgs(args);
|
||||
|
||||
// Short-circuit 2nd-instance launches (OS handing us the
|
||||
|
|
|
|||
|
|
@ -28,12 +28,6 @@ public class AndroidAppLaunchTests
|
|||
[Fact]
|
||||
public void PostIt_starts_and_draws_a_first_frame_on_the_emulator()
|
||||
{
|
||||
if (IsRunningInCi())
|
||||
{
|
||||
_output.WriteLine("[skip] Android instrumentation smoke test disabled in CI because the emulator/test APK signature must match the target package exactly and is not reliable on hosted runners");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!IsPackageInstalledOnAnyDevice())
|
||||
{
|
||||
_output.WriteLine($"[skip] {PackageName} not installed on any device");
|
||||
|
|
@ -52,14 +46,6 @@ public class AndroidAppLaunchTests
|
|||
_output.WriteLine("[step] first frame observed");
|
||||
}
|
||||
|
||||
private static bool IsRunningInCi()
|
||||
{
|
||||
return Environment.GetEnvironmentVariable("CI") is { Length: > 0 }
|
||||
|| Environment.GetEnvironmentVariable("GITHUB_ACTIONS") is { Length: > 0 }
|
||||
|| Environment.GetEnvironmentVariable("FORGEJO_CI") is { Length: > 0 }
|
||||
|| Environment.GetEnvironmentVariable("CI_NAME") is { Length: > 0 };
|
||||
}
|
||||
|
||||
private static bool IsPackageInstalledOnAnyDevice()
|
||||
{
|
||||
try
|
||||
|
|
|
|||
|
|
@ -1,147 +0,0 @@
|
|||
#if ANDROID
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Runtime.Versioning;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Android.App;
|
||||
using Android.Graphics;
|
||||
using Android.Media;
|
||||
using Android.OS;
|
||||
using PostIt.Android.Services;
|
||||
using Path = System.IO.Path;
|
||||
|
||||
namespace PostIt.Tests;
|
||||
|
||||
/// <summary>Debug-only synthetic encoder test; never opens the camera or contacts the API.</summary>
|
||||
[Activity(Name = "fr.pschneider.postit.CameraFrameRotationTestActivity", Exported = true)]
|
||||
[SupportedOSPlatform("android26.0")]
|
||||
public sealed class AndroidCameraFrameRotationTestActivity : Activity
|
||||
{
|
||||
protected override async void OnCreate(Bundle? state)
|
||||
{
|
||||
base.OnCreate(state);
|
||||
var resultPath = Path.Combine(FilesDir!.AbsolutePath, "camera-rotation-test-result.txt");
|
||||
File.WriteAllText(resultPath, "RUNNING");
|
||||
try
|
||||
{
|
||||
foreach (var rotation in new[] { 0, 90, 180, 270 })
|
||||
await VerifyRotationAsync(rotation);
|
||||
File.WriteAllText(resultPath, "PASS\nrotations=0,90,180,270\nformat=MPEG-TS\nsource=synthetic");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
File.WriteAllText(resultPath, $"FAIL\n{ex}");
|
||||
}
|
||||
finally { Finish(); }
|
||||
}
|
||||
|
||||
private async Task VerifyRotationAsync(int rotation)
|
||||
{
|
||||
const int width = 640;
|
||||
const int height = 480;
|
||||
var outputWidth = rotation is 90 or 270 ? height : width;
|
||||
var outputHeight = rotation is 90 or 270 ? width : height;
|
||||
var path = Path.Combine(FilesDir!.AbsolutePath, $"camera-rotation-{rotation}.ts");
|
||||
void Stage(string stage) => File.WriteAllText(
|
||||
Path.Combine(FilesDir.AbsolutePath, "camera-rotation-test-result.txt"), $"RUNNING\nrotation={rotation}\nstage={stage}");
|
||||
Stage("prepare");
|
||||
#pragma warning disable CS0618
|
||||
using var recorder = OperatingSystem.IsAndroidVersionAtLeast(31)
|
||||
? new MediaRecorder(this) : new MediaRecorder();
|
||||
#pragma warning restore CS0618
|
||||
recorder.SetVideoSource(VideoSource.Surface);
|
||||
recorder.SetOutputFormat(OutputFormat.Mpeg2Ts);
|
||||
recorder.SetVideoSize(outputWidth, outputHeight);
|
||||
recorder.SetVideoFrameRate(30);
|
||||
recorder.SetVideoEncodingBitRate(1200000);
|
||||
recorder.SetVideoEncoder(VideoEncoder.H264);
|
||||
recorder.SetOutputFile(path);
|
||||
recorder.Prepare();
|
||||
using var encoderSurface = recorder.Surface
|
||||
?? throw new InvalidOperationException("Encoder surface unavailable.");
|
||||
Exception? failure = null;
|
||||
var stopping = 0;
|
||||
Stage("initialize EGL");
|
||||
using (var rotator = await AndroidCameraFrameRotator.CreateAsync(
|
||||
encoderSurface, width, height, rotation, error =>
|
||||
{
|
||||
if (Volatile.Read(ref stopping) != 0) return;
|
||||
failure = error;
|
||||
File.WriteAllText(Path.Combine(FilesDir.AbsolutePath, "camera-rotation-test-result.txt"), $"FAIL\n{error}");
|
||||
}))
|
||||
{
|
||||
Stage("start recorder");
|
||||
recorder.Start();
|
||||
Task? stop = null;
|
||||
try
|
||||
{
|
||||
await rotator.StartAsync();
|
||||
using var paint = new Paint();
|
||||
Color[] colors = [Color.Red, Color.Green, Color.Blue, Color.Yellow];
|
||||
Stage("draw frames");
|
||||
for (var frame = 0; frame < 90; frame++)
|
||||
{
|
||||
if (failure is not null) throw failure;
|
||||
if (frame == 45)
|
||||
{
|
||||
Volatile.Write(ref stopping, 1);
|
||||
stop = Task.Run(recorder.Stop);
|
||||
}
|
||||
if (stop?.IsCompleted == true) break;
|
||||
var canvas = rotator.CameraSurface.LockCanvas(null)
|
||||
?? throw new InvalidOperationException("Synthetic camera canvas unavailable.");
|
||||
try
|
||||
{
|
||||
for (var i = 0; i < colors.Length; i++)
|
||||
{
|
||||
paint.Color = colors[i];
|
||||
var x = i % 2 * width / 2;
|
||||
var y = i / 2 * height / 2;
|
||||
canvas.DrawRect(x, y, x + width / 2, y + height / 2, paint);
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
rotator.CameraSurface.UnlockCanvasAndPost(canvas);
|
||||
canvas.Dispose();
|
||||
}
|
||||
await Task.Delay(34);
|
||||
}
|
||||
if (failure is not null) throw failure;
|
||||
Stage("wait for recorder stop");
|
||||
await (stop ?? throw new InvalidOperationException("Recorder stop was not requested."))
|
||||
.WaitAsync(TimeSpan.FromSeconds(10));
|
||||
}
|
||||
finally
|
||||
{
|
||||
Stage("dispose EGL");
|
||||
rotator.Dispose();
|
||||
}
|
||||
}
|
||||
Stage("decode");
|
||||
using var retriever = new MediaMetadataRetriever();
|
||||
retriever.SetDataSource(path);
|
||||
using var bitmap = retriever.GetFrameAtTime(0, Option.ClosestSync)
|
||||
?? throw new InvalidOperationException($"Cannot decode rotation {rotation}.");
|
||||
if (bitmap.Width != outputWidth || bitmap.Height != outputHeight)
|
||||
throw new InvalidOperationException($"Rotation {rotation}: dimensions {bitmap.Width}x{bitmap.Height}, expected {outputWidth}x{outputHeight}.");
|
||||
Color[] expected = rotation switch
|
||||
{
|
||||
90 => [Color.Blue, Color.Red, Color.Yellow, Color.Green],
|
||||
180 => [Color.Yellow, Color.Blue, Color.Green, Color.Red],
|
||||
270 => [Color.Green, Color.Yellow, Color.Red, Color.Blue],
|
||||
_ => [Color.Red, Color.Green, Color.Blue, Color.Yellow]
|
||||
};
|
||||
for (var i = 0; i < expected.Length; i++)
|
||||
{
|
||||
var actual = new Color(bitmap.GetPixel((i % 2 * 2 + 1) * outputWidth / 4,
|
||||
(i / 2 * 2 + 1) * outputHeight / 4));
|
||||
var target = expected[i];
|
||||
if (Math.Abs(actual.R - target.R) > 40 || Math.Abs(actual.G - target.G) > 40 || Math.Abs(actual.B - target.B) > 40)
|
||||
throw new InvalidOperationException($"Rotation {rotation}, quadrant {i}: {actual}, expected {target}.");
|
||||
}
|
||||
File.Delete(path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,125 +0,0 @@
|
|||
#if ANDROID
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.Versioning;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Android.App;
|
||||
using Android.Content;
|
||||
using Android.Media;
|
||||
using Android.OS;
|
||||
using Avalonia.Threading;
|
||||
using PostIt.Android;
|
||||
using PostIt.Android.Services;
|
||||
using PostIt.Services;
|
||||
|
||||
namespace PostIt.Tests;
|
||||
|
||||
/// <summary>Debug-only local encoder test; never connects to the podcast API.</summary>
|
||||
[Activity(Name = "fr.pschneider.postit.PodcastCaptureTestActivity", Exported = true)]
|
||||
[SupportedOSPlatform("android26.0")]
|
||||
public sealed class AndroidPodcastCaptureTestActivity : Activity
|
||||
{
|
||||
private bool _microphone = true;
|
||||
private bool _notificationStop;
|
||||
private int _cameraIndex;
|
||||
protected override async void OnCreate(Bundle? state)
|
||||
{
|
||||
base.OnCreate(state);
|
||||
_microphone = Intent?.GetStringExtra("microphone") != "false";
|
||||
_notificationStop = Intent?.GetStringExtra("notificationStop") == "true";
|
||||
_cameraIndex = Intent?.GetStringExtra("camera") == "front" ? 1 : 0;
|
||||
var resultPath = Path.Combine(FilesDir!.AbsolutePath, "podcast-capture-test-result.txt");
|
||||
File.WriteAllText(resultPath, "RUNNING");
|
||||
var result = new Bundle();
|
||||
try
|
||||
{
|
||||
await RunAsync(result);
|
||||
File.WriteAllText(resultPath, $"PASS\nsegments={result.GetInt("segments")}\ndurationSeconds={result.GetDouble("durationSeconds")}\naudio={result.GetBoolean("audio")}\ndirectory={result.GetString("directory")}\nbackground={result.GetString("background")}\norientation={result.GetString("orientation")}\ntextureTransform={result.GetString("textureTransform")}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
File.WriteAllText(resultPath, $"FAIL\n{ex}");
|
||||
}
|
||||
finally { Finish(); }
|
||||
}
|
||||
|
||||
private async Task RunAsync(Bundle result)
|
||||
{
|
||||
if (!OperatingSystem.IsAndroidVersionAtLeast(26))
|
||||
throw new PlatformNotSupportedException("Android 8 required.");
|
||||
var context = this;
|
||||
var intent = new Intent(context, typeof(MainActivity)).AddFlags(ActivityFlags.NewTask);
|
||||
StartActivity(intent);
|
||||
for (var i = 0; i < 100 && !MainActivity.IsForeground; i++) await Task.Delay(100);
|
||||
await Task.Delay(1000);
|
||||
var directory = Path.Combine(context.FilesDir!.AbsolutePath, "podcast-capture-tests", Guid.NewGuid().ToString("N"));
|
||||
Directory.CreateDirectory(directory);
|
||||
var devices = AndroidPodcastCapture.GetDevices();
|
||||
if (devices.Cameras.Count == 0) throw new InvalidOperationException("No emulator camera.");
|
||||
IPodcastCapture? capture = null;
|
||||
try
|
||||
{
|
||||
capture = await Dispatcher.UIThread.InvokeAsync(() => AndroidPodcastCapture.StartAsync(
|
||||
devices.Cameras[Math.Min(_cameraIndex, devices.Cameras.Count - 1)].Value,
|
||||
_microphone ? "microphone" : null, directory, CancellationToken.None));
|
||||
await Task.Delay(3000);
|
||||
var before = SegmentCount(directory);
|
||||
context.StartActivity(new Intent(Intent.ActionMain).AddCategory(Intent.CategoryHome).AddFlags(ActivityFlags.NewTask));
|
||||
await Task.Delay(9000);
|
||||
var after = SegmentCount(directory);
|
||||
if (capture.Completion.IsFaulted) await capture.Completion;
|
||||
if (capture is AndroidPodcastCapture androidCapture)
|
||||
{
|
||||
result.PutString("orientation", androidCapture.OrientationDiagnostics);
|
||||
result.PutString("textureTransform", androidCapture.TextureTransform);
|
||||
}
|
||||
if (after <= before) throw new InvalidOperationException($"Capture did not continue in background: {before} -> {after} segments.");
|
||||
if (_notificationStop)
|
||||
{
|
||||
using var stop = PendingIntent.GetService(context, 1,
|
||||
new Intent(context, typeof(PodcastCaptureService)).SetAction(PodcastCaptureService.StopAction),
|
||||
PendingIntentFlags.NoCreate | PendingIntentFlags.Immutable)
|
||||
?? throw new InvalidOperationException("Notification stop action missing.");
|
||||
stop.Send();
|
||||
}
|
||||
else await capture.StopAsync().WaitAsync(TimeSpan.FromSeconds(15));
|
||||
await capture.Completion.WaitAsync(TimeSpan.FromSeconds(15));
|
||||
var segments = HlsCapturePlaylist.Parse(await File.ReadAllTextAsync(Path.Combine(directory, "index.m3u8")));
|
||||
if (segments.Count < 3) throw new InvalidOperationException("Insufficient capture segments.");
|
||||
var duration = segments.Sum(segment => segment.DurationSeconds);
|
||||
if (duration < 8 || duration > 16)
|
||||
throw new InvalidOperationException($"Expected 8-16 seconds of capture, got {duration}.");
|
||||
using var extractor = new MediaExtractor();
|
||||
extractor.SetDataSource(Path.Combine(directory, segments[0].FileName));
|
||||
var video = false;
|
||||
var audio = false;
|
||||
for (var track = 0; track < extractor.TrackCount; track++)
|
||||
{
|
||||
using var format = extractor.GetTrackFormat(track);
|
||||
var mime = format.GetString(MediaFormat.KeyMime);
|
||||
video |= mime == "video/avc";
|
||||
audio |= mime == "audio/mp4a-latm";
|
||||
}
|
||||
if (!video || (_microphone && !audio))
|
||||
throw new InvalidOperationException($"Missing capture tracks: H.264={video}, AAC={audio}.");
|
||||
result.PutInt("segments", segments.Count);
|
||||
result.PutDouble("durationSeconds", duration);
|
||||
result.PutBoolean("audio", audio);
|
||||
result.PutString("directory", directory);
|
||||
result.PutString("background", $"segments {before} -> {after}");
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (capture is not null) await capture.DisposeAsync();
|
||||
}
|
||||
}
|
||||
|
||||
private static int SegmentCount(string directory)
|
||||
{
|
||||
var path = Path.Combine(directory, "index.m3u8");
|
||||
return File.Exists(path) ? HlsCapturePlaylist.Parse(File.ReadAllText(path)).Count : 0;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -464,31 +464,11 @@ public class BlogReaderTests
|
|||
}
|
||||
|
||||
[AvaloniaFact]
|
||||
public void Video_viewmodel_resolves_to_the_shared_page_with_a_platform_video_surface_slot()
|
||||
public void Video_viewmodel_resolves_to_a_page_with_a_vlc_control()
|
||||
{
|
||||
var vm = new VideoPageViewModel(new Uri("https://org.example.test/files/paul/clip.mp4"), "video/mp4");
|
||||
var page = Assert.IsType<VideoPage>(new ViewLocator().Build(vm));
|
||||
Assert.NotNull(page.FindControl<ContentControl>("VideoSurface"));
|
||||
Assert.NotNull(page.FindControl<Button>("PlayButton"));
|
||||
}
|
||||
|
||||
[AvaloniaFact]
|
||||
public async Task Video_page_observes_platform_lifecycle_only_while_navigated()
|
||||
{
|
||||
var nav = new NavigationPage();
|
||||
await nav.PushAsync(new ContentPage());
|
||||
var page = new VideoPage();
|
||||
await nav.PushAsync(page);
|
||||
var status = page.FindControl<TextBlock>("PlaybackStatus")!;
|
||||
Platform.SuspendPlayback();
|
||||
Assert.Equal("Lecture suspendue.", status.Text);
|
||||
Assert.False(page.FindControl<Button>("PlayButton")!.IsEnabled);
|
||||
Platform.ResumePlayback();
|
||||
Assert.Null(page.FindControl<ContentControl>("VideoSurface")!.Content);
|
||||
await nav.PopAsync();
|
||||
status.Text = "No longer active";
|
||||
Platform.SuspendPlayback();
|
||||
Assert.Equal("No longer active", status.Text);
|
||||
Assert.NotNull(page.FindControl<LibVLCSharp.Avalonia.VideoView>("Video"));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
using PostIt.Android.Services;
|
||||
|
||||
namespace PostIt.Tests;
|
||||
|
||||
public sealed class CameraFrameClockTests
|
||||
{
|
||||
[Theory]
|
||||
[InlineData(4_213_000_000_000L)]
|
||||
[InlineData(0L)]
|
||||
[InlineData(-1_000_000_000L)]
|
||||
public void Aligns_camera_epoch_to_encoder_and_preserves_frame_intervals(long cameraOffset)
|
||||
{
|
||||
var clock = new CameraFrameClock();
|
||||
const long now = 20_000_000_000_000L;
|
||||
var camera = now + cameraOffset;
|
||||
Assert.Equal(now, clock.GetPresentationTime(camera, now));
|
||||
Assert.Equal(now + 33_333_333, clock.GetPresentationTime(camera + 33_333_333, now + 40_000_000));
|
||||
Assert.Equal(now + 100_000_000, clock.GetPresentationTime(camera + 100_000_000, now + 110_000_000));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Does_not_submit_the_same_camera_image_twice()
|
||||
{
|
||||
var clock = new CameraFrameClock();
|
||||
Assert.Equal(100, clock.GetPresentationTime(1000, 100));
|
||||
Assert.Null(clock.GetPresentationTime(1000, 110));
|
||||
Assert.Equal(120, clock.GetPresentationTime(1020, 130));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Reports_a_camera_clock_that_goes_backwards()
|
||||
{
|
||||
var clock = new CameraFrameClock();
|
||||
clock.GetPresentationTime(1000, 100);
|
||||
Assert.Throws<InvalidOperationException>(() => clock.GetPresentationTime(999, 110));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
using PostIt.Android.Services;
|
||||
|
||||
namespace PostIt.Tests;
|
||||
|
||||
public sealed class CameraFrameOrientationTests
|
||||
{
|
||||
[Theory]
|
||||
[InlineData(90, 0, false, 90)]
|
||||
[InlineData(90, 90, false, 0)]
|
||||
[InlineData(90, 180, false, 270)]
|
||||
[InlineData(90, 270, false, 180)]
|
||||
[InlineData(270, 0, true, 270)]
|
||||
[InlineData(270, 90, true, 0)]
|
||||
[InlineData(270, 180, true, 90)]
|
||||
[InlineData(270, 270, true, 180)]
|
||||
[InlineData(0, 90, false, 270)]
|
||||
[InlineData(180, 270, true, 90)]
|
||||
public void Uses_sensor_display_and_lens_facing(int sensor, int display, bool front, int expected)
|
||||
=> Assert.Equal(expected, CameraFrameOrientation.GetRotation(sensor, display, front));
|
||||
|
||||
[Theory]
|
||||
[InlineData(0, new float[] { 0, 0, 1, 0, 0, 1, 1, 1 })]
|
||||
[InlineData(90, new float[] { 1, 0, 1, 1, 0, 0, 0, 1 })]
|
||||
[InlineData(180, new float[] { 1, 1, 0, 1, 1, 0, 0, 0 })]
|
||||
[InlineData(270, new float[] { 0, 1, 0, 0, 1, 1, 1, 0 })]
|
||||
public void Maps_output_corners_to_input_for_clockwise_rotation(int rotation, float[] expected)
|
||||
=> Assert.Equal(expected, CameraFrameOrientation.GetTextureCoordinates(rotation));
|
||||
|
||||
[Theory]
|
||||
[InlineData(90, 0, -1, 0)]
|
||||
[InlineData(270, 0, 1, 0)]
|
||||
[InlineData(180, -1, 0, 0)]
|
||||
[InlineData(90, 1, 0, 90)]
|
||||
[InlineData(270, 1, 0, 270)]
|
||||
[InlineData(0, 0, -1, 270)]
|
||||
[InlineData(180, 0, -1, 90)]
|
||||
public void Does_not_repeat_rotation_already_in_surface_texture(
|
||||
int desired, float x, float y, int expected)
|
||||
{
|
||||
float[] matrix = [x, y, 0, 0, y, -x, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1];
|
||||
Assert.Equal(expected, CameraFrameOrientation.GetRemainingRotation(desired, matrix));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Recognizes_the_measured_rear_camera_transform_even_with_cropping()
|
||||
{
|
||||
float[] matrix = [0, -0.9f, 0, 0, -0.8f, 0, 0, 0, 0, 0, 1, 0, 0.9f, 0.95f, 0, 1];
|
||||
Assert.Equal(0, CameraFrameOrientation.GetRemainingRotation(90, matrix));
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(-90)]
|
||||
[InlineData(45)]
|
||||
[InlineData(360)]
|
||||
public void Rejects_invalid_angles(int rotation)
|
||||
{
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => CameraFrameOrientation.GetRotation(rotation, 0, false));
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => CameraFrameOrientation.GetRotation(90, rotation, false));
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => CameraFrameOrientation.GetTextureCoordinates(rotation));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
using System.Net.Http;
|
||||
using Yavsc.Api.Client;
|
||||
using Yavsc.Billing;
|
||||
|
||||
namespace PostIt.Tests;
|
||||
|
||||
public sealed class InvoicesApiClientTests
|
||||
{
|
||||
[Fact]
|
||||
public async Task Client_maps_invoice_operations_and_forwards_cancellation()
|
||||
{
|
||||
var api = new RecordingApi();
|
||||
var client = new InvoicesApiClient(api, () => "https://business.example/api/v1/");
|
||||
var ct = TestContext.Current.CancellationToken;
|
||||
|
||||
await client.GenerateAsync(7, ct);
|
||||
Assert.Equal(HttpMethod.Post, api.Method);
|
||||
Assert.Equal("https://business.example/api/v1/invoices/from-estimate/7", api.Path);
|
||||
Assert.Null(api.Body);
|
||||
Assert.Equal(ct, api.Cancellation);
|
||||
|
||||
await client.GetAsync(42, ct);
|
||||
Assert.Equal(HttpMethod.Get, api.Method);
|
||||
Assert.Equal("https://business.example/api/v1/invoices/42", api.Path);
|
||||
|
||||
var receipt = new RecordInvoicePaymentRequest
|
||||
{
|
||||
Reference = "bank-1", Amount = 30m, Currency = "EUR",
|
||||
ReceivedAtUtc = DateTimeOffset.UtcNow.AddDays(-1)
|
||||
};
|
||||
await client.RecordOfflineAsync(42, receipt, ct);
|
||||
Assert.Equal(HttpMethod.Post, api.Method);
|
||||
Assert.Equal("https://business.example/api/v1/invoices/42/payments/offline", api.Path);
|
||||
Assert.Same(receipt, api.Body);
|
||||
|
||||
await client.VerifyPayPalAsync(42, "TX-1", ct);
|
||||
Assert.Equal(HttpMethod.Post, api.Method);
|
||||
Assert.Equal("https://business.example/api/v1/invoices/42/payments/paypal", api.Path);
|
||||
Assert.Equal("TX-1", Assert.IsType<VerifyInvoicePayPalRequest>(api.Body).TransactionId);
|
||||
Assert.Equal(ct, api.Cancellation);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Invalid_arguments_fail_before_transport()
|
||||
{
|
||||
var api = new RecordingApi();
|
||||
var client = new InvoicesApiClient(api, () => "https://business.example/api/v1/");
|
||||
var ct = TestContext.Current.CancellationToken;
|
||||
await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() => client.GenerateAsync(0, ct));
|
||||
await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() => client.GetAsync(-1, ct));
|
||||
await Assert.ThrowsAsync<ArgumentNullException>(() => client.RecordOfflineAsync(42, null!, ct));
|
||||
await Assert.ThrowsAsync<ArgumentException>(() => client.VerifyPayPalAsync(42, "", ct));
|
||||
Assert.Null(api.Path);
|
||||
}
|
||||
|
||||
private sealed class RecordingApi : IYavscApiClient
|
||||
{
|
||||
public HttpClient Http { get; } = new();
|
||||
public HttpMethod? Method { get; private set; }
|
||||
public string? Path { get; private set; }
|
||||
public object? Body { get; private set; }
|
||||
public CancellationToken Cancellation { get; private set; }
|
||||
|
||||
public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
{
|
||||
Method = method;
|
||||
Path = path;
|
||||
Body = body;
|
||||
Cancellation = ct;
|
||||
return Task.FromResult(default(T)!);
|
||||
}
|
||||
|
||||
public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
=> throw new NotSupportedException();
|
||||
|
||||
public Task<T> CallAsync<T>(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
|
||||
=> throw new NotSupportedException();
|
||||
|
||||
public Task CallAsync(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
|
||||
=> throw new NotSupportedException();
|
||||
|
||||
public ValueTask DisposeAsync() => ValueTask.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,175 +0,0 @@
|
|||
using System.Net;
|
||||
using Avalonia.Headless.XUnit;
|
||||
using PostIt.Services;
|
||||
using PostIt.ViewModels;
|
||||
using Yavsc.Abstract.Streaming;
|
||||
using Yavsc.Api.Client;
|
||||
|
||||
namespace PostIt.Tests;
|
||||
|
||||
public sealed class PodcastBroadcasterTests
|
||||
{
|
||||
[AvaloniaFact]
|
||||
public async Task Shared_page_uses_platform_devices_and_requests_permissions_before_creating_server_broadcast()
|
||||
{
|
||||
var tokenPath = Path.Combine(Path.GetTempPath(), $"postit-podcast-{Guid.NewGuid():N}.json");
|
||||
var devices = Platform.GetPodcastCaptureDevices;
|
||||
var permissions = Platform.RequestPodcastPermissionsAsync;
|
||||
var factory = Platform.CreatePodcastCaptureAsync;
|
||||
var store = new TokenStore(tokenPath);
|
||||
store.Save(new RefreshTokenRecord("test-access-token", "test-refresh-token", DateTimeOffset.UtcNow.AddHours(1), null));
|
||||
await using var api = new YavscApiClient(new Settings(), store);
|
||||
await using var transport = new Transport();
|
||||
try
|
||||
{
|
||||
Platform.GetPodcastCaptureDevices = () => new(
|
||||
[new("Front", "front"), new("Rear", "rear")],
|
||||
[new("None", ""), new("Android microphone", "microphone")]);
|
||||
Platform.RequestPodcastPermissionsAsync = (_, _) =>
|
||||
Task.FromException(new UnauthorizedAccessException("Camera denied"));
|
||||
Platform.CreatePodcastCaptureAsync = (_, _, _, _) =>
|
||||
throw new InvalidOperationException("Capture must not start after permission denial.");
|
||||
var session = new SessionStatusViewModel { Api = api };
|
||||
session.Refresh();
|
||||
var vm = new PodcastsPageViewModel(new PodcastApiClient(transport, () => "https://api.example/"), api, session)
|
||||
{
|
||||
Title = "Android live"
|
||||
};
|
||||
Assert.True(vm.CanBroadcast);
|
||||
vm.DetectDevicesCommand.Execute(null);
|
||||
Assert.Equal(2, vm.Cameras.Count);
|
||||
Assert.Equal("front", vm.SelectedCamera?.Value);
|
||||
Assert.Equal("microphone", vm.SelectedMicrophone?.Value);
|
||||
Assert.True(vm.StartCommand.CanExecute(null));
|
||||
await vm.StartCommand.ExecuteAsync(null);
|
||||
Assert.Contains("Camera denied", vm.Status);
|
||||
Assert.Equal(0, transport.CreateCount);
|
||||
Assert.False(vm.IsBusy);
|
||||
Assert.False(vm.IsBroadcasting);
|
||||
}
|
||||
finally
|
||||
{
|
||||
Platform.GetPodcastCaptureDevices = devices;
|
||||
Platform.RequestPodcastPermissionsAsync = permissions;
|
||||
Platform.CreatePodcastCaptureAsync = factory;
|
||||
File.Delete(tokenPath);
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Native_stop_flushes_final_segment_before_completing_server_replay()
|
||||
{
|
||||
await using var transport = new Transport();
|
||||
var client = new PodcastApiClient(transport, () => "https://api.example/");
|
||||
FakeCapture? capture = null;
|
||||
await using var broadcaster = await PodcastBroadcaster.StartAsync(client, "Android",
|
||||
(directory, _) =>
|
||||
{
|
||||
capture = new FakeCapture(directory);
|
||||
return Task.FromResult<IPodcastCapture>(capture);
|
||||
}, TestContext.Current.CancellationToken);
|
||||
await transport.FirstUpload.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken);
|
||||
await capture!.StopAsync();
|
||||
await broadcaster.Completion.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken);
|
||||
Assert.Equal(new[] { 0, 1 }, transport.Uploads);
|
||||
Assert.Equal(new[] { "upload:0", "upload:1", "complete" }, transport.Events);
|
||||
Assert.True(capture.Stopped);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Native_failure_stops_capture_and_preserves_unacknowledged_segments()
|
||||
{
|
||||
await using var transport = new Transport { FailUpload = true };
|
||||
var client = new PodcastApiClient(transport, () => "https://api.example/");
|
||||
FakeCapture? capture = null;
|
||||
var broadcaster = await PodcastBroadcaster.StartAsync(client, "Android",
|
||||
(directory, _) =>
|
||||
{
|
||||
capture = new FakeCapture(directory);
|
||||
return Task.FromResult<IPodcastCapture>(capture);
|
||||
}, TestContext.Current.CancellationToken);
|
||||
try
|
||||
{
|
||||
await Assert.ThrowsAsync<HttpRequestException>(() => broadcaster.Completion);
|
||||
Assert.True(capture!.Stopped);
|
||||
Assert.True(File.Exists(Path.Combine(capture.Directory, "segment-00000000.ts")));
|
||||
Assert.DoesNotContain("complete", transport.Events);
|
||||
await Assert.ThrowsAsync<HttpRequestException>(() => broadcaster.DisposeAsync().AsTask());
|
||||
Assert.True(capture.Disposed);
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (capture is not null) Directory.Delete(capture.Directory, recursive: true);
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Startup_failure_finalizes_empty_server_broadcast()
|
||||
{
|
||||
await using var transport = new Transport();
|
||||
var client = new PodcastApiClient(transport, () => "https://api.example/");
|
||||
await Assert.ThrowsAsync<UnauthorizedAccessException>(() => PodcastBroadcaster.StartAsync(client, "Denied",
|
||||
(_, _) => Task.FromException<IPodcastCapture>(new UnauthorizedAccessException("Camera denied")),
|
||||
TestContext.Current.CancellationToken));
|
||||
Assert.Equal(new[] { "complete" }, transport.Events);
|
||||
}
|
||||
|
||||
private sealed class FakeCapture : IPodcastCapture
|
||||
{
|
||||
private readonly TaskCompletionSource _completion = new(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
public string Directory { get; }
|
||||
public bool Stopped { get; private set; }
|
||||
public bool Disposed { get; private set; }
|
||||
public Task Completion => _completion.Task;
|
||||
public FakeCapture(string directory)
|
||||
{
|
||||
Directory = directory;
|
||||
File.WriteAllBytes(Path.Combine(directory, "segment-00000000.ts"), [0x47, 1]);
|
||||
File.WriteAllText(Path.Combine(directory, "index.m3u8"), "#EXTM3U\n#EXTINF:2,\nsegment-00000000.ts\n");
|
||||
}
|
||||
public Task StopAsync()
|
||||
{
|
||||
if (Stopped) return Task.CompletedTask;
|
||||
File.WriteAllBytes(Path.Combine(Directory, "segment-00000001.ts"), [0x47, 2]);
|
||||
File.AppendAllText(Path.Combine(Directory, "index.m3u8"), "#EXTINF:0.5,\nsegment-00000001.ts\n");
|
||||
Stopped = true;
|
||||
_completion.TrySetResult();
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
public ValueTask DisposeAsync() { Disposed = true; return ValueTask.CompletedTask; }
|
||||
}
|
||||
|
||||
private sealed class Transport : IYavscApiClient
|
||||
{
|
||||
private readonly PodcastResponse _podcast = new(Guid.NewGuid(), "Test", "alice", "Alice",
|
||||
DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, PodcastState.Live, 0, 0, 0);
|
||||
public HttpClient Http { get; } = new();
|
||||
public List<int> Uploads { get; } = [];
|
||||
public List<string> Events { get; } = [];
|
||||
public bool FailUpload { get; init; }
|
||||
public int CreateCount { get; private set; }
|
||||
public TaskCompletionSource FirstUpload { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
{
|
||||
if (path.EndsWith("/complete", StringComparison.Ordinal)) Events.Add("complete");
|
||||
else CreateCount++;
|
||||
return Task.FromResult((T)(object)_podcast);
|
||||
}
|
||||
public Task<T> CallAsync<T>(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
|
||||
{
|
||||
if (FailUpload) throw new HttpRequestException("Denied", null, HttpStatusCode.Forbidden);
|
||||
var sequence = int.Parse(new Uri(path).Segments[^1], System.Globalization.CultureInfo.InvariantCulture);
|
||||
Uploads.Add(sequence);
|
||||
Events.Add($"upload:{sequence}");
|
||||
FirstUpload.TrySetResult();
|
||||
return Task.FromResult((T)(object)_podcast);
|
||||
}
|
||||
public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
=> CallAsync<PodcastResponse>(method, path, body, ct);
|
||||
public Task CallAsync(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
|
||||
=> CallAsync<PodcastResponse>(method, path, contentFactory, ct);
|
||||
public Task<byte[]> DownloadAsync(HttpMethod method, string path, CancellationToken ct = default)
|
||||
=> throw new NotSupportedException();
|
||||
public ValueTask DisposeAsync() { Http.Dispose(); return ValueTask.CompletedTask; }
|
||||
}
|
||||
}
|
||||
|
|
@ -6,10 +6,10 @@
|
|||
<IsPackable>false</IsPackable>
|
||||
<RootNamespace>PostIt.Tests</RootNamespace>
|
||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||
<AssemblyVersion>1.0.8.0</AssemblyVersion>
|
||||
<FileVersion>1.0.8.0</FileVersion>
|
||||
<InformationalVersion>1.0.8-458+Branch.main.Sha.ad92744a94c829947994ffef5e8a6598f62868f8</InformationalVersion>
|
||||
<Version>1.0.8-458</Version>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-estimate.1+364.Branch.feature-estimate.Sha.3d6ab6e72f9ba4ccfa250a1cce154b550281405e</InformationalVersion>
|
||||
<Version>1.1.0-estimate.1</Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" />
|
||||
|
|
@ -25,8 +25,5 @@
|
|||
<ItemGroup>
|
||||
<Using Include="Xunit" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\PostIt.Android\Services\CameraFrameOrientation.cs" Link="Android\CameraFrameOrientation.cs" />
|
||||
<Compile Include="..\PostIt.Android\Services\CameraFrameClock.cs" Link="Android\CameraFrameClock.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup></ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,146 +0,0 @@
|
|||
using PostIt.Services;
|
||||
|
||||
namespace PostIt.Tests;
|
||||
|
||||
public sealed class TransportStreamCaptureTests
|
||||
{
|
||||
[Fact]
|
||||
public async Task Segments_on_IDR_and_flushes_final_segment_with_real_PTS_durations()
|
||||
{
|
||||
var directory = Path.Combine(Path.GetTempPath(), $"postit-ts-{Guid.NewGuid():N}");
|
||||
Directory.CreateDirectory(directory);
|
||||
try
|
||||
{
|
||||
using var input = new MemoryStream();
|
||||
input.Write(Pat());
|
||||
input.Write(Pmt());
|
||||
for (var i = 0; i <= 120; i++) input.Write(Video(i * 3000L, i % 60 == 0));
|
||||
input.Position = 0;
|
||||
await new TransportStreamCapture(directory).RunAsync(input, TestContext.Current.CancellationToken);
|
||||
var segments = HlsCapturePlaylist.Parse(await File.ReadAllTextAsync(Path.Combine(directory, "index.m3u8"), TestContext.Current.CancellationToken));
|
||||
Assert.Equal(3, segments.Count);
|
||||
Assert.Equal(2, segments[0].DurationSeconds);
|
||||
Assert.Equal(2, segments[1].DurationSeconds);
|
||||
Assert.InRange(segments[2].DurationSeconds, 0.033, 0.034);
|
||||
foreach (var segment in segments)
|
||||
{
|
||||
var bytes = await File.ReadAllBytesAsync(Path.Combine(directory, segment.FileName), TestContext.Current.CancellationToken);
|
||||
Assert.Equal(0, bytes.Length % 188);
|
||||
Assert.Equal(Pat(), bytes[..188]);
|
||||
Assert.Equal(Pmt(), bytes[188..376]);
|
||||
Assert.Contains((byte)0x65, bytes[376..]);
|
||||
}
|
||||
}
|
||||
finally { Directory.Delete(directory, recursive: true); }
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(true)]
|
||||
[InlineData(false)]
|
||||
public async Task Rejects_corrupt_or_truncated_transport_without_publishing_a_segment(bool truncated)
|
||||
{
|
||||
var directory = Path.Combine(Path.GetTempPath(), $"postit-ts-{Guid.NewGuid():N}");
|
||||
Directory.CreateDirectory(directory);
|
||||
try
|
||||
{
|
||||
using var input = new MemoryStream(new byte[truncated ? 187 : 188]);
|
||||
await Assert.ThrowsAsync<InvalidDataException>(() =>
|
||||
new TransportStreamCapture(directory).RunAsync(input, TestContext.Current.CancellationToken));
|
||||
Assert.False(File.Exists(Path.Combine(directory, "index.m3u8")));
|
||||
}
|
||||
finally { Directory.Delete(directory, recursive: true); }
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Preserves_out_of_band_H264_configuration_at_every_segment_start()
|
||||
{
|
||||
var directory = Path.Combine(Path.GetTempPath(), $"postit-ts-{Guid.NewGuid():N}");
|
||||
Directory.CreateDirectory(directory);
|
||||
try
|
||||
{
|
||||
using var input = new MemoryStream();
|
||||
input.Write(Pat());
|
||||
input.Write(Pmt());
|
||||
var configuration = Video(0, false);
|
||||
configuration[22] = 0x67;
|
||||
new byte[] { 0, 0, 0, 1, 0x68, 0x80 }.CopyTo(configuration, 25);
|
||||
input.Write(configuration);
|
||||
for (var i = 0; i <= 120; i++) input.Write(Video(90000 + i * 3000L, i % 60 == 0));
|
||||
input.Position = 0;
|
||||
await new TransportStreamCapture(directory).RunAsync(input, TestContext.Current.CancellationToken);
|
||||
var segments = HlsCapturePlaylist.Parse(await File.ReadAllTextAsync(Path.Combine(directory, "index.m3u8"), TestContext.Current.CancellationToken));
|
||||
Assert.Equal(3, segments.Count);
|
||||
foreach (var segment in segments)
|
||||
{
|
||||
var bytes = await File.ReadAllBytesAsync(Path.Combine(directory, segment.FileName), TestContext.Current.CancellationToken);
|
||||
Assert.Equal(0x67, bytes[376 + 22]);
|
||||
Assert.Equal(0x68, bytes[376 + 29]);
|
||||
Assert.Equal(0x65, bytes[564 + 22]);
|
||||
Assert.Equal((bytes[564 + 3] - 1) & 0x0f, bytes[376 + 3] & 0x0f);
|
||||
Assert.Equal(bytes[(564 + 13)..(564 + 18)], bytes[(376 + 13)..(376 + 18)]);
|
||||
}
|
||||
}
|
||||
finally { Directory.Delete(directory, recursive: true); }
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Handles_33_bit_PTS_wrap_without_negative_duration()
|
||||
{
|
||||
var directory = Path.Combine(Path.GetTempPath(), $"postit-ts-{Guid.NewGuid():N}");
|
||||
Directory.CreateDirectory(directory);
|
||||
try
|
||||
{
|
||||
using var input = new MemoryStream();
|
||||
input.Write(Pat());
|
||||
input.Write(Pmt());
|
||||
for (var i = 0; i <= 120; i++)
|
||||
input.Write(Video(((1L << 33) - 90000 + i * 3000L) & ((1L << 33) - 1), i % 60 == 0));
|
||||
input.Position = 0;
|
||||
await new TransportStreamCapture(directory).RunAsync(input, TestContext.Current.CancellationToken);
|
||||
var segments = HlsCapturePlaylist.Parse(await File.ReadAllTextAsync(Path.Combine(directory, "index.m3u8"), TestContext.Current.CancellationToken));
|
||||
Assert.Equal(3, segments.Count);
|
||||
Assert.Equal(2, segments[0].DurationSeconds);
|
||||
}
|
||||
finally { Directory.Delete(directory, recursive: true); }
|
||||
}
|
||||
|
||||
private static byte[] Packet(int pid)
|
||||
{
|
||||
var packet = Enumerable.Repeat((byte)0xff, 188).ToArray();
|
||||
packet[0] = 0x47;
|
||||
packet[1] = (byte)(0x40 | (pid >> 8));
|
||||
packet[2] = (byte)pid;
|
||||
packet[3] = 0x10;
|
||||
return packet;
|
||||
}
|
||||
|
||||
private static byte[] Pat()
|
||||
{
|
||||
var packet = Packet(0);
|
||||
packet[4] = 0;
|
||||
new byte[] { 0, 0xb0, 13, 0, 1, 0xc1, 0, 0, 0, 1, 0xe1, 0 }.CopyTo(packet, 5);
|
||||
return packet;
|
||||
}
|
||||
|
||||
private static byte[] Pmt()
|
||||
{
|
||||
var packet = Packet(256);
|
||||
packet[4] = 0;
|
||||
new byte[] { 2, 0xb0, 18, 0, 1, 0xc1, 0, 0, 0xe1, 1, 0xf0, 0,
|
||||
0x1b, 0xe1, 1, 0xf0, 0 }.CopyTo(packet, 5);
|
||||
return packet;
|
||||
}
|
||||
|
||||
private static byte[] Video(long pts, bool idr)
|
||||
{
|
||||
var packet = Packet(257);
|
||||
new byte[] { 0, 0, 1, 0xe0, 0, 0, 0x84, 0x80, 5 }.CopyTo(packet, 4);
|
||||
packet[13] = (byte)(0x21 | ((pts >> 29) & 0xe));
|
||||
packet[14] = (byte)(pts >> 22);
|
||||
packet[15] = (byte)(1 | ((pts >> 14) & 0xfe));
|
||||
packet[16] = (byte)(pts >> 7);
|
||||
packet[17] = (byte)(1 | ((pts << 1) & 0xfe));
|
||||
new byte[] { 0, 0, 0, 1, idr ? (byte)0x65 : (byte)0x41, 0x88 }.CopyTo(packet, 18);
|
||||
return packet;
|
||||
}
|
||||
}
|
||||
|
|
@ -34,7 +34,6 @@ public static class ServiceCollectionHelpers
|
|||
() => settings.Authentication?.Authority);
|
||||
var billingClient = new BillingApiClient(api, () => settings.ApiUrl);
|
||||
var estimateClient = new EstimateApiClient(api, () => settings.ApiUrl);
|
||||
var invoicesClient = new InvoicesApiClient(api, () => settings.ApiUrl);
|
||||
var frontClient = new FrontOfficeApiClient(api, () => settings.ApiUrl);
|
||||
var resourceUsageClient = new ResourceUsageApiClient(api, () => settings.ApiUrl);
|
||||
var administrationClient = new AdministrationApiClient(api, () => settings.ApiUrl);
|
||||
|
|
@ -105,7 +104,6 @@ public static class ServiceCollectionHelpers
|
|||
services.AddSingleton(activityClient);
|
||||
services.AddSingleton(billingClient);
|
||||
services.AddSingleton(estimateClient);
|
||||
services.AddSingleton(invoicesClient);
|
||||
services.AddSingleton(frontClient);
|
||||
services.AddSingleton(resourceUsageClient);
|
||||
services.AddSingleton(administrationClient);
|
||||
|
|
|
|||
|
|
@ -3,11 +3,12 @@
|
|||
<TargetFramework>net10.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<AssemblyVersion>1.0.8.0</AssemblyVersion>
|
||||
<FileVersion>1.0.8.0</FileVersion>
|
||||
<InformationalVersion>1.0.8-458+Branch.main.Sha.ad92744a94c829947994ffef5e8a6598f62868f8</InformationalVersion>
|
||||
<Version>1.0.8-458</Version>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-estimate.1+364.Branch.feature-estimate.Sha.3d6ab6e72f9ba4ccfa250a1cce154b550281405e</InformationalVersion>
|
||||
<Version>1.1.0-estimate.1</Version>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<AvaloniaResource Include="Assets\**" />
|
||||
|
|
@ -52,11 +53,12 @@
|
|||
<ProjectReference Include="../../Yavsc.Api.Client/Yavsc.Api.Client.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="Lang/Resources.resx">
|
||||
<EmbeddedResource Update="Lang/Resources.resx">
|
||||
<Generator>PublicResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="Lang/Resources.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
|
|
@ -65,4 +67,4 @@
|
|||
</Compile>
|
||||
<Watch Include="**\*.xaml" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace PostIt.Services;
|
||||
|
||||
public sealed record CaptureDevice(string Name, string Value);
|
||||
public sealed record PodcastCaptureDevices(
|
||||
IReadOnlyList<CaptureDevice> Cameras, IReadOnlyList<CaptureDevice> Microphones);
|
||||
|
||||
/// <summary>A running encoder publishing closed segments and an atomic index.m3u8.</summary>
|
||||
public interface IPodcastCapture : IAsyncDisposable
|
||||
{
|
||||
Task Completion { get; }
|
||||
Task StopAsync();
|
||||
}
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using LibVLCSharp.Shared;
|
||||
|
||||
namespace PostIt.Services;
|
||||
|
||||
internal sealed class LibVlcPodcastCapture : IPodcastCapture
|
||||
{
|
||||
private readonly LibVLC _vlc;
|
||||
private readonly Media _media;
|
||||
private readonly MediaPlayer _player;
|
||||
private readonly TaskCompletionSource _completion = new(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
private bool _stopped;
|
||||
|
||||
public Task Completion => _completion.Task;
|
||||
|
||||
public LibVlcPodcastCapture(Func<LibVLC, Media> createMedia, string directory)
|
||||
{
|
||||
Core.Initialize();
|
||||
_vlc = CameraStreamer.CreatePreferredLibVlc();
|
||||
try
|
||||
{
|
||||
_media = createMedia(_vlc);
|
||||
PodcastBroadcaster.ConfigureOutput(_media, directory);
|
||||
_player = new MediaPlayer(_vlc);
|
||||
_player.EncounteredError += OnError;
|
||||
if (!_player.Play(_media))
|
||||
throw new InvalidOperationException("LibVLC ne peut pas demarrer la capture. Verifiez la camera et les encodeurs H.264/AAC.");
|
||||
}
|
||||
catch
|
||||
{
|
||||
_player?.Dispose();
|
||||
_media?.Dispose();
|
||||
_vlc.Dispose();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnError(object? sender, EventArgs e)
|
||||
=> _completion.TrySetException(new InvalidOperationException(
|
||||
"La capture LibVLC a echoue. Verifiez camera, microphone et encodeurs H.264/AAC."));
|
||||
|
||||
public async Task StopAsync()
|
||||
{
|
||||
if (_stopped) return;
|
||||
_stopped = true;
|
||||
await Task.Run(_player.Stop);
|
||||
_completion.TrySetResult();
|
||||
}
|
||||
|
||||
public async ValueTask DisposeAsync()
|
||||
{
|
||||
try { await StopAsync(); }
|
||||
finally
|
||||
{
|
||||
_player.EncounteredError -= OnError;
|
||||
_player.Dispose();
|
||||
_media.Dispose();
|
||||
_vlc.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,28 +2,19 @@ using System;
|
|||
using IdentityModel.OidcClient.Browser;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia.Controls;
|
||||
using LibVLCSharp.Shared;
|
||||
|
||||
namespace PostIt.Services;
|
||||
|
||||
/// <summary>
|
||||
/// Native integration points populated by platform projects at startup.
|
||||
/// Per-platform access to native integration points used by the OIDC
|
||||
/// Authorization Code + PKCE flow. The shared <c>PostIt</c> library does
|
||||
/// not reference any UI framework; platform projects (PostIt.Android,
|
||||
/// PostIt.Desktop, PostIt.Browser) populate this class once at startup so
|
||||
/// the shared OIDC login path can drive a native browser without taking
|
||||
/// a hard dependency on any specific UI toolkit.
|
||||
/// </summary>
|
||||
public static class Platform
|
||||
{
|
||||
public static Func<PodcastCaptureDevices>? GetPodcastCaptureDevices { get; set; }
|
||||
public static Func<string?, CancellationToken, Task>? RequestPodcastPermissionsAsync { get; set; }
|
||||
public static Func<string, string?, string, CancellationToken, Task<IPodcastCapture>>? CreatePodcastCaptureAsync { get; set; }
|
||||
|
||||
/// <summary>Platform-specific video surface inside the shared video page.</summary>
|
||||
public static Func<MediaPlayer, Control>? CreateVideoSurface { get; set; }
|
||||
|
||||
public static event Action? PlaybackSuspending;
|
||||
public static event Action? PlaybackResuming;
|
||||
public static void SuspendPlayback() => PlaybackSuspending?.Invoke();
|
||||
public static void ResumePlayback() => PlaybackResuming?.Invoke();
|
||||
|
||||
/// <summary>
|
||||
/// Default redirect URI for the running platform. The shared
|
||||
/// default uses a custom URI scheme (<c>postit://callback</c>)
|
||||
|
|
@ -57,6 +48,4 @@ public static class Platform
|
|||
/// </summary>
|
||||
public static Func<CancellationToken, Task<CurrentLocationResult>> TryGetCurrentLocationAsync { get; set; } =
|
||||
_ => Task.FromResult(CurrentLocationResult.Unavailable());
|
||||
|
||||
public static bool IsPodcastSupported { get; set; } = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,11 +16,14 @@ namespace PostIt.Services;
|
|||
public sealed class PodcastBroadcaster : IAsyncDisposable
|
||||
{
|
||||
private readonly PodcastApiClient _api;
|
||||
private readonly IPodcastCapture _capture;
|
||||
private readonly LibVLC _vlc;
|
||||
private readonly MediaPlayer _player;
|
||||
private readonly Media _media;
|
||||
private readonly string _directory;
|
||||
private readonly CancellationTokenSource _cancellation = new();
|
||||
private readonly SemaphoreSlim _stopGate = new(1);
|
||||
private volatile bool _stopped;
|
||||
private volatile bool _encoderFailed;
|
||||
private bool _disposed;
|
||||
|
||||
public PodcastResponse Podcast { get; private set; }
|
||||
|
|
@ -28,12 +31,15 @@ public sealed class PodcastBroadcaster : IAsyncDisposable
|
|||
public event Action<PodcastResponse>? Progress;
|
||||
|
||||
private PodcastBroadcaster(PodcastApiClient api, PodcastResponse podcast,
|
||||
IPodcastCapture capture, string directory)
|
||||
LibVLC vlc, MediaPlayer player, Media media, string directory)
|
||||
{
|
||||
_api = api;
|
||||
Podcast = podcast;
|
||||
_capture = capture;
|
||||
_vlc = vlc;
|
||||
_player = player;
|
||||
_media = media;
|
||||
_directory = directory;
|
||||
_player.EncounteredError += OnEncoderError;
|
||||
}
|
||||
|
||||
public static void ConfigureOutput(Media media, string directory)
|
||||
|
|
@ -51,13 +57,11 @@ public sealed class PodcastBroadcaster : IAsyncDisposable
|
|||
|
||||
internal static async Task<PodcastBroadcaster> StartAsync(PodcastApiClient api, string title,
|
||||
Func<LibVLC, Media> createMedia, CancellationToken ct)
|
||||
=> await StartAsync(api, title,
|
||||
(directory, _) => Task.FromResult<IPodcastCapture>(new LibVlcPodcastCapture(createMedia, directory)), ct);
|
||||
|
||||
public static async Task<PodcastBroadcaster> StartAsync(PodcastApiClient api, string title,
|
||||
Func<string, CancellationToken, Task<IPodcastCapture>> createCapture, CancellationToken ct)
|
||||
{
|
||||
IPodcastCapture? capture = null;
|
||||
Core.Initialize();
|
||||
var vlc = CameraStreamer.CreatePreferredLibVlc();
|
||||
Media? media = null;
|
||||
MediaPlayer? player = null;
|
||||
PodcastBroadcaster? broadcaster = null;
|
||||
var directory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||
"PostIt", "podcast-capture", Guid.NewGuid().ToString("N"));
|
||||
|
|
@ -65,12 +69,15 @@ public sealed class PodcastBroadcaster : IAsyncDisposable
|
|||
try
|
||||
{
|
||||
Directory.CreateDirectory(directory);
|
||||
media = createMedia(vlc);
|
||||
ConfigureOutput(media, directory);
|
||||
player = new MediaPlayer(vlc);
|
||||
podcast = await api.CreateAsync(title, ct);
|
||||
await File.WriteAllTextAsync(Path.Combine(directory, "podcast.json"), JsonSerializer.Serialize(podcast), ct);
|
||||
ct.ThrowIfCancellationRequested();
|
||||
capture = await createCapture(directory, ct);
|
||||
ct.ThrowIfCancellationRequested();
|
||||
broadcaster = new PodcastBroadcaster(api, podcast, capture, directory);
|
||||
broadcaster = new PodcastBroadcaster(api, podcast, vlc, player, media, directory);
|
||||
if (!player.Play(media))
|
||||
throw new InvalidOperationException("LibVLC ne peut pas demarrer la capture. Verifiez la camera et les encodeurs H.264/AAC.");
|
||||
broadcaster.Completion = broadcaster.UploadAsync(broadcaster._cancellation.Token);
|
||||
return broadcaster;
|
||||
}
|
||||
|
|
@ -78,10 +85,13 @@ public sealed class PodcastBroadcaster : IAsyncDisposable
|
|||
{
|
||||
if (broadcaster is not null)
|
||||
{
|
||||
broadcaster._player.EncounteredError -= broadcaster.OnEncoderError;
|
||||
broadcaster._cancellation.Dispose();
|
||||
broadcaster._stopGate.Dispose();
|
||||
}
|
||||
if (capture is not null) await capture.DisposeAsync();
|
||||
player?.Dispose();
|
||||
media?.Dispose();
|
||||
vlc.Dispose();
|
||||
if (Directory.Exists(directory)) Directory.Delete(directory, recursive: true);
|
||||
if (podcast is not null)
|
||||
{
|
||||
|
|
@ -112,7 +122,7 @@ public sealed class PodcastBroadcaster : IAsyncDisposable
|
|||
{
|
||||
if (!_stopped)
|
||||
{
|
||||
await _capture.StopAsync();
|
||||
await Task.Run(_player.Stop);
|
||||
_stopped = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -128,9 +138,9 @@ public sealed class PodcastBroadcaster : IAsyncDisposable
|
|||
while (true)
|
||||
{
|
||||
ct.ThrowIfCancellationRequested();
|
||||
var finalPass = _stopped || _capture.Completion.IsCompleted;
|
||||
if (_capture.Completion.IsCompleted)
|
||||
await _capture.Completion;
|
||||
var finalPass = _stopped;
|
||||
if (_encoderFailed)
|
||||
throw new InvalidOperationException("La capture LibVLC a echoue. Verifiez camera, microphone et encodeurs H.264/AAC.");
|
||||
var pendingBytes = Directory.EnumerateFiles(_directory, "*.ts").Sum(path => new FileInfo(path).Length);
|
||||
if (pendingBytes > 64L * 1024 * 1024)
|
||||
throw new IOException("Le reseau est trop lent : la capture depasse 64 Mio de segments en attente.");
|
||||
|
|
@ -164,7 +174,7 @@ public sealed class PodcastBroadcaster : IAsyncDisposable
|
|||
return;
|
||||
}
|
||||
if (lastSegment.Elapsed > TimeSpan.FromSeconds(25))
|
||||
throw new IOException("Aucun segment produit depuis 25 secondes. Verifiez la camera et les encodeurs H.264/AAC.");
|
||||
throw new IOException("Aucun segment produit depuis 25 secondes. Verifiez la capture et les encodeurs LibVLC.");
|
||||
await Task.Delay(400, ct);
|
||||
}
|
||||
}
|
||||
|
|
@ -197,6 +207,8 @@ public sealed class PodcastBroadcaster : IAsyncDisposable
|
|||
}
|
||||
}
|
||||
|
||||
private void OnEncoderError(object? sender, EventArgs e) => _encoderFailed = true;
|
||||
|
||||
public async ValueTask DisposeAsync()
|
||||
{
|
||||
if (_disposed) return;
|
||||
|
|
@ -205,7 +217,10 @@ public sealed class PodcastBroadcaster : IAsyncDisposable
|
|||
try { await Completion; }
|
||||
finally
|
||||
{
|
||||
await _capture.DisposeAsync();
|
||||
_player.EncounteredError -= OnEncoderError;
|
||||
_player.Dispose();
|
||||
_media.Dispose();
|
||||
_vlc.Dispose();
|
||||
_cancellation.Dispose();
|
||||
_stopGate.Dispose();
|
||||
// Keep failed, unacknowledged segments for manual recovery.
|
||||
|
|
|
|||
|
|
@ -1,222 +0,0 @@
|
|||
using System;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace PostIt.Services;
|
||||
|
||||
/// <summary>Segments a single-program H.264 MPEG-TS encoder output at IDR frames.</summary>
|
||||
public sealed class TransportStreamCapture(string directory)
|
||||
{
|
||||
private const int PacketSize = 188;
|
||||
private const int MaxSegmentBytes = 8 * 1024 * 1024;
|
||||
private readonly MemoryStream _frame = new();
|
||||
private readonly MemoryStream _video = new();
|
||||
private readonly StringBuilder _playlist = new("#EXTM3U\n");
|
||||
private byte[]? _pat;
|
||||
private byte[]? _pmt;
|
||||
private byte[]? _configuration;
|
||||
private int _pmtPid = -1;
|
||||
private int _videoPid = -1;
|
||||
private FileStream? _segment;
|
||||
private int _sequence;
|
||||
private long? _framePts;
|
||||
private long _startPts;
|
||||
private long _lastPts;
|
||||
private long _frameDuration = 3000;
|
||||
private long? _previousPts;
|
||||
private long _ptsEpoch;
|
||||
|
||||
public async Task RunAsync(Stream input, CancellationToken ct)
|
||||
{
|
||||
var packet = new byte[PacketSize];
|
||||
try
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
var read = 0;
|
||||
while (read < PacketSize)
|
||||
{
|
||||
var count = await input.ReadAsync(packet.AsMemory(read), ct);
|
||||
if (count == 0)
|
||||
{
|
||||
if (read != 0) throw new InvalidDataException("Paquet MPEG-TS tronque.");
|
||||
FlushFrame();
|
||||
CloseSegment(_lastPts + _frameDuration);
|
||||
return;
|
||||
}
|
||||
read += count;
|
||||
}
|
||||
Consume(packet);
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
_segment?.Dispose();
|
||||
_frame.Dispose();
|
||||
_video.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
private void Consume(byte[] packet)
|
||||
{
|
||||
if (packet[0] != 0x47 || (packet[1] & 0x80) != 0 || (packet[3] & 0xc0) != 0)
|
||||
throw new InvalidDataException("Flux MPEG-TS invalide.");
|
||||
var pid = ((packet[1] & 0x1f) << 8) | packet[2];
|
||||
var hasPayload = (packet[3] & 0x10) != 0;
|
||||
if (!hasPayload) return;
|
||||
var offset = 4;
|
||||
if ((packet[3] & 0x20) != 0) offset += 1 + packet[4];
|
||||
if (offset >= PacketSize) throw new InvalidDataException("Adaptation MPEG-TS invalide.");
|
||||
var start = (packet[1] & 0x40) != 0;
|
||||
if (pid == 0 || pid == _pmtPid)
|
||||
{
|
||||
if (!start) throw new InvalidDataException("Table MPEG-TS multi-paquets non prise en charge.");
|
||||
var section = offset + 1 + packet[offset];
|
||||
if (section + 3 > PacketSize) throw new InvalidDataException("Table MPEG-TS tronquee.");
|
||||
var end = section + 3 + (((packet[section + 1] & 0x0f) << 8) | packet[section + 2]);
|
||||
if (end > PacketSize) throw new InvalidDataException("Table MPEG-TS trop grande.");
|
||||
if (pid == 0)
|
||||
{
|
||||
if (packet[section] != 0 || end - section < 16)
|
||||
throw new InvalidDataException("PAT MPEG-TS invalide.");
|
||||
_pmtPid = ((packet[section + 10] & 0x1f) << 8) | packet[section + 11];
|
||||
_pat = (byte[])packet.Clone();
|
||||
}
|
||||
else
|
||||
{
|
||||
if (packet[section] != 2 || end - section < 16)
|
||||
throw new InvalidDataException("PMT MPEG-TS invalide.");
|
||||
var entry = section + 12 + (((packet[section + 10] & 0x0f) << 8) | packet[section + 11]);
|
||||
while (entry + 5 <= end - 4)
|
||||
{
|
||||
if (packet[entry] == 0x1b)
|
||||
_videoPid = ((packet[entry + 1] & 0x1f) << 8) | packet[entry + 2];
|
||||
entry += 5 + (((packet[entry + 3] & 0x0f) << 8) | packet[entry + 4]);
|
||||
}
|
||||
_pmt = (byte[])packet.Clone();
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (pid == _videoPid && start)
|
||||
{
|
||||
FlushFrame();
|
||||
if (offset + 14 > PacketSize || packet[offset] != 0 || packet[offset + 1] != 0
|
||||
|| packet[offset + 2] != 1 || (packet[offset + 7] & 0x80) == 0)
|
||||
throw new InvalidDataException("Horodatage video MPEG-TS absent.");
|
||||
var ptsOffset = offset + 9;
|
||||
var pts = ((long)(packet[ptsOffset] & 0x0e) << 29)
|
||||
| ((long)packet[ptsOffset + 1] << 22) | ((long)(packet[ptsOffset + 2] & 0xfe) << 14)
|
||||
| ((long)packet[ptsOffset + 3] << 7) | (uint)(packet[ptsOffset + 4] >> 1);
|
||||
if (_previousPts is { } previous && pts < previous)
|
||||
{
|
||||
if (previous - pts < (1L << 32))
|
||||
throw new InvalidDataException("Horodatages video non croissants.");
|
||||
_ptsEpoch += 1L << 33;
|
||||
}
|
||||
_previousPts = pts;
|
||||
_framePts = pts + _ptsEpoch;
|
||||
offset += 9 + packet[offset + 8];
|
||||
if (offset > PacketSize) throw new InvalidDataException("En-tete PES invalide.");
|
||||
}
|
||||
if (_framePts is null) return;
|
||||
_frame.Write(packet);
|
||||
if (pid == _videoPid) _video.Write(packet, offset, PacketSize - offset);
|
||||
if (_frame.Length > MaxSegmentBytes)
|
||||
throw new IOException("Une image de capture depasse 8 Mio.");
|
||||
}
|
||||
|
||||
private void FlushFrame()
|
||||
{
|
||||
if (_framePts is not { } pts) return;
|
||||
var video = _video.GetBuffer().AsSpan(0, (int)_video.Length);
|
||||
var idr = false;
|
||||
var hasConfiguration = false;
|
||||
var hasSlice = false;
|
||||
for (var i = 0; i + 3 < video.Length; i++)
|
||||
if (video[i] == 0 && video[i + 1] == 0 && video[i + 2] == 1)
|
||||
{
|
||||
var type = video[i + 3] & 0x1f;
|
||||
if (type == 5) idr = true;
|
||||
if (type is 7 or 8) hasConfiguration = true;
|
||||
if (type is 1 or 5) hasSlice = true;
|
||||
}
|
||||
if (hasConfiguration && !hasSlice)
|
||||
{
|
||||
using var packets = new MemoryStream();
|
||||
for (var i = 0; i < _frame.Length; i += PacketSize)
|
||||
{
|
||||
var packet = _frame.GetBuffer().AsSpan(i, PacketSize);
|
||||
if ((((packet[1] & 0x1f) << 8) | packet[2]) == _videoPid)
|
||||
packets.Write(packet);
|
||||
}
|
||||
_configuration = packets.ToArray();
|
||||
}
|
||||
if (_segment is not null && idr && pts - _startPts >= 180000)
|
||||
CloseSegment(pts);
|
||||
if (_segment is null && idr)
|
||||
{
|
||||
if (_pat is null || _pmt is null)
|
||||
throw new InvalidDataException("Tables MPEG-TS manquantes.");
|
||||
_startPts = pts;
|
||||
_segment = File.Create(Path.Combine(directory, SegmentName()));
|
||||
_segment.Write(_pat);
|
||||
_segment.Write(_pmt);
|
||||
if (!hasConfiguration && _configuration is not null) WriteConfiguration(pts);
|
||||
}
|
||||
if (_segment is not null)
|
||||
{
|
||||
if (_segment.Length + _frame.Length > MaxSegmentBytes || pts - _startPts > 14 * 90000)
|
||||
throw new IOException("Segment trop grand ou absence d'image cle depuis 14 secondes.");
|
||||
_segment.Write(_frame.GetBuffer(), 0, (int)_frame.Length);
|
||||
if (pts > _lastPts && _lastPts >= _startPts)
|
||||
_frameDuration = Math.Min(pts - _lastPts, 9000);
|
||||
_lastPts = pts;
|
||||
}
|
||||
_frame.SetLength(0);
|
||||
_video.SetLength(0);
|
||||
_framePts = null;
|
||||
}
|
||||
|
||||
private string SegmentName() => $"segment-{_sequence:D8}.ts";
|
||||
|
||||
private void WriteConfiguration(long pts)
|
||||
{
|
||||
var packets = (byte[])_configuration!.Clone();
|
||||
var first = _frame.GetBuffer()[3] & 0x0f;
|
||||
var counter = (first - packets.Length / PacketSize) & 0x0f;
|
||||
for (var i = 0; i < packets.Length; i += PacketSize)
|
||||
{
|
||||
packets[i + 3] = (byte)((packets[i + 3] & 0xf0) | counter);
|
||||
counter = (counter + 1) & 0x0f;
|
||||
if ((packets[i + 1] & 0x40) == 0) continue;
|
||||
var offset = i + 4;
|
||||
if ((packets[i + 3] & 0x20) != 0) offset += packets[offset] + 1;
|
||||
offset += 9;
|
||||
if (offset + 5 > i + PacketSize) throw new InvalidDataException("Configuration H.264 invalide.");
|
||||
packets[offset] = (byte)(0x21 | ((pts >> 29) & 0x0e));
|
||||
packets[offset + 1] = (byte)(pts >> 22);
|
||||
packets[offset + 2] = (byte)(1 | ((pts >> 14) & 0xfe));
|
||||
packets[offset + 3] = (byte)(pts >> 7);
|
||||
packets[offset + 4] = (byte)(1 | ((pts << 1) & 0xfe));
|
||||
}
|
||||
_segment!.Write(packets);
|
||||
}
|
||||
|
||||
private void CloseSegment(long endPts)
|
||||
{
|
||||
if (_segment is null) return;
|
||||
_segment.Dispose();
|
||||
_segment = null;
|
||||
var duration = (endPts - _startPts) / 90000d;
|
||||
if (duration <= 0 || duration > 15) throw new InvalidDataException("Duree MPEG-TS invalide.");
|
||||
_playlist.Append("#EXTINF:").Append(duration.ToString("0.######", CultureInfo.InvariantCulture))
|
||||
.Append(",\n").Append(SegmentName()).Append('\n');
|
||||
var index = Path.Combine(directory, "index.m3u8");
|
||||
File.WriteAllText(index + ".tmp", _playlist.ToString());
|
||||
File.Move(index + ".tmp", index, overwrite: true);
|
||||
_sequence++;
|
||||
}
|
||||
}
|
||||
|
|
@ -12,7 +12,6 @@ using PostIt.ViewModels.Chat;
|
|||
using Yavsc.Abstract.Models.Messaging;
|
||||
using Yavsc.Api.Client;
|
||||
|
||||
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
public class HomePageViewModel : ViewModelBase
|
||||
|
|
@ -87,7 +86,7 @@ public class HomePageViewModel : ViewModelBase
|
|||
|
||||
public IAsyncRelayCommand OpenChat { get; }
|
||||
public IAsyncRelayCommand OpenPodcasts { get; }
|
||||
public bool SupportsPodcasts => Platform.IsPodcastSupported;
|
||||
public bool SupportsPodcasts => OperatingSystem.IsWindows() || OperatingSystem.IsLinux();
|
||||
public IAsyncRelayCommand OpenBlogs { get; }
|
||||
public IAsyncRelayCommand OpenProfile { get; }
|
||||
public IAsyncRelayCommand OpenPerformerConfiguration { get; }
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ public partial class SessionStatusViewModel : ViewModelBase
|
|||
if (profile is null)
|
||||
throw new InvalidOperationException("Le serveur a renvoyé un profil vide.");
|
||||
if (version == _accessVersion)
|
||||
IsAdministrator = profile.Roles.Contains(Yavsc.Constants.AdminName, StringComparer.Ordinal);
|
||||
IsAdministrator = profile.Roles.Contains(Yavsc.Constants.AdminGroupName, StringComparer.Ordinal);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ using Yavsc.Api.Client;
|
|||
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
public sealed record CaptureDevice(string Name, string Value);
|
||||
|
||||
public partial class PodcastsPageViewModel : ViewModelBase
|
||||
{
|
||||
private readonly PodcastApiClient _client;
|
||||
|
|
@ -34,8 +36,7 @@ public partial class PodcastsPageViewModel : ViewModelBase
|
|||
public ObservableCollection<PodcastResponse> Podcasts { get; } = new();
|
||||
public ObservableCollection<CaptureDevice> Cameras { get; } = new();
|
||||
public ObservableCollection<CaptureDevice> Microphones { get; } = new();
|
||||
public bool CanBroadcast => Platform.CreatePodcastCaptureAsync is not null
|
||||
|| (!OperatingSystem.IsAndroid() && (OperatingSystem.IsWindows() || OperatingSystem.IsLinux()));
|
||||
public bool IsDesktop => OperatingSystem.IsWindows() || OperatingSystem.IsLinux();
|
||||
|
||||
|
||||
public string Title { get => _title; set { if (SetProperty(ref _title, value)) UpdateCommands(); } }
|
||||
|
|
@ -88,9 +89,9 @@ public partial class PodcastsPageViewModel : ViewModelBase
|
|||
_api = api;
|
||||
_session = session;
|
||||
RefreshCommand = new AsyncRelayCommand(RefreshAsync, () => !IsBusy);
|
||||
DetectDevicesCommand = new RelayCommand(DetectDevices, () => CanBroadcast && !IsBroadcasting && !IsBusy);
|
||||
DetectDevicesCommand = new RelayCommand(DetectDevices, () => IsDesktop && !IsBroadcasting && !IsBusy);
|
||||
StartCommand = new AsyncRelayCommand(StartAsync,
|
||||
() => CanBroadcast && !IsBroadcasting && !IsBusy && _session.IsLoggedIn
|
||||
() => IsDesktop && !IsBroadcasting && !IsBusy && _session.IsLoggedIn
|
||||
&& SelectedCamera is not null && !string.IsNullOrWhiteSpace(Title));
|
||||
StopCommand = new AsyncRelayCommand(StopAsync, () => IsBroadcasting && !IsBusy);
|
||||
PlayCommand = new AsyncRelayCommand(PlayAsync, () => SelectedPodcast is { SegmentCount: > 0 } && !IsBroadcasting && !IsBusy);
|
||||
|
|
@ -150,23 +151,14 @@ public partial class PodcastsPageViewModel : ViewModelBase
|
|||
{
|
||||
try
|
||||
{
|
||||
Core.Initialize();
|
||||
using var vlc = CameraStreamer.CreatePreferredLibVlc();
|
||||
var capture = new CameraStreamer(vlc);
|
||||
Cameras.Clear();
|
||||
foreach (var item in capture.GetCaptureDevices()) Cameras.Add(new(item.Key, item.Value));
|
||||
Microphones.Clear();
|
||||
if (Platform.GetPodcastCaptureDevices is { } getDevices)
|
||||
{
|
||||
var devices = getDevices();
|
||||
foreach (var item in devices.Cameras) Cameras.Add(item);
|
||||
foreach (var item in devices.Microphones) Microphones.Add(item);
|
||||
}
|
||||
else
|
||||
{
|
||||
Core.Initialize();
|
||||
using var vlc = CameraStreamer.CreatePreferredLibVlc();
|
||||
var capture = new CameraStreamer(vlc);
|
||||
foreach (var item in capture.GetCaptureDevices()) Cameras.Add(new(item.Key, item.Value));
|
||||
Microphones.Add(new("Sans microphone", ""));
|
||||
foreach (var item in capture.GetAudioCaptureDevices()) Microphones.Add(new(item.Key, item.Value));
|
||||
}
|
||||
Microphones.Add(new("Sans microphone", ""));
|
||||
foreach (var item in capture.GetAudioCaptureDevices()) Microphones.Add(new(item.Key, item.Value));
|
||||
SelectedCamera = Cameras.Count == 0 ? null : Cameras[0];
|
||||
SelectedMicrophone = Microphones.Count > 1 ? Microphones[1] : Microphones[0];
|
||||
Status = Cameras.Count == 0 ? "Aucune camera detectee." : "Choisissez camera et microphone avant de demarrer.";
|
||||
|
|
@ -180,14 +172,8 @@ public partial class PodcastsPageViewModel : ViewModelBase
|
|||
try
|
||||
{
|
||||
if (SelectedCamera is null) throw new InvalidOperationException("Choisissez une camera.");
|
||||
var camera = SelectedCamera.Value;
|
||||
var microphone = string.IsNullOrWhiteSpace(SelectedMicrophone?.Value) ? null : SelectedMicrophone.Value;
|
||||
if (Platform.RequestPodcastPermissionsAsync is { } requestPermissions)
|
||||
await requestPermissions(microphone, _pageCancellation.Token);
|
||||
_broadcaster = Platform.CreatePodcastCaptureAsync is { } createCapture
|
||||
? await PodcastBroadcaster.StartAsync(_client, Title,
|
||||
(directory, ct) => createCapture(camera, microphone, directory, ct), _pageCancellation.Token)
|
||||
: await PodcastBroadcaster.StartAsync(_client, Title, camera, microphone, _pageCancellation.Token);
|
||||
_broadcaster = await PodcastBroadcaster.StartAsync(_client, Title, SelectedCamera.Value,
|
||||
string.IsNullOrWhiteSpace(SelectedMicrophone?.Value) ? null : SelectedMicrophone.Value, _pageCancellation.Token);
|
||||
_broadcaster.Progress += OnProgress;
|
||||
_session.LogoutCompleted += OnLogout;
|
||||
IsBroadcasting = true;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@
|
|||
x:Class="PostIt.Views.Blogs.VideoPage"
|
||||
xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:vlc="clr-namespace:LibVLCSharp.Avalonia;assembly=LibVLCSharp.Avalonia"
|
||||
xmlns:vm="using:PostIt.ViewModels"
|
||||
x:DataType="vm:VideoPageViewModel">
|
||||
<Grid RowDefinitions="Auto,*,Auto,Auto" Margin="16" RowSpacing="12">
|
||||
<TextBlock Text="{Binding Title}" FontSize="22" TextWrapping="Wrap" />
|
||||
<Border Grid.Row="1" Background="Black" BorderThickness="1" BorderBrush="Green">
|
||||
<ContentControl x:Name="VideoSurface" />
|
||||
<vlc:VideoView x:Name="Video" />
|
||||
</Border>
|
||||
<StackPanel Grid.Row="2" Orientation="Horizontal" Spacing="12">
|
||||
<Button x:Name="PlayButton" Content="Lire / Pause" Click="PlayPause_Click" />
|
||||
|
|
|
|||
|
|
@ -21,13 +21,6 @@ public partial class VideoPage : ContentPage
|
|||
protected override void OnNavigatedTo(NavigatedToEventArgs e)
|
||||
{
|
||||
base.OnNavigatedTo(e);
|
||||
Platform.PlaybackSuspending += SuspendPlayback;
|
||||
Platform.PlaybackResuming += ResumePlayback;
|
||||
InitializePlayer();
|
||||
}
|
||||
|
||||
private void InitializePlayer()
|
||||
{
|
||||
ReleasePlayer();
|
||||
if (Design.IsDesignMode || DataContext is not VideoPageViewModel vm)
|
||||
return;
|
||||
|
|
@ -46,15 +39,13 @@ public partial class VideoPage : ContentPage
|
|||
: new Media(_libVlc, _podcastInput);
|
||||
if (_podcastInput is not null)
|
||||
media.AddOption(":demux=ts");
|
||||
var surface = Platform.CreateVideoSurface?.Invoke(_player)
|
||||
?? new LibVLCSharp.Avalonia.VideoView { MediaPlayer = _player };
|
||||
VideoSurface.Content = surface;
|
||||
Video.MediaPlayer = _player;
|
||||
var player = _player;
|
||||
// Navigation transforms do not change Bounds, so refresh the native surface after layout.
|
||||
Dispatcher.UIThread.Post(() =>
|
||||
{
|
||||
if (ReferenceEquals(_player, player) && surface is LibVLCSharp.Avalonia.VideoView desktopVideo)
|
||||
desktopVideo.TryUpdateNativeControlPosition();
|
||||
if (ReferenceEquals(_player, player))
|
||||
Video.TryUpdateNativeControlPosition();
|
||||
}, DispatcherPriority.Loaded);
|
||||
PlayButton.IsEnabled = true;
|
||||
PlaybackStatus.Text = vm.MimeType;
|
||||
|
|
@ -72,16 +63,12 @@ public partial class VideoPage : ContentPage
|
|||
|
||||
protected override void OnNavigatedFrom(NavigatedFromEventArgs e)
|
||||
{
|
||||
Platform.PlaybackSuspending -= SuspendPlayback;
|
||||
Platform.PlaybackResuming -= ResumePlayback;
|
||||
ReleasePlayer();
|
||||
base.OnNavigatedFrom(e);
|
||||
}
|
||||
|
||||
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
|
||||
{
|
||||
Platform.PlaybackSuspending -= SuspendPlayback;
|
||||
Platform.PlaybackResuming -= ResumePlayback;
|
||||
ReleasePlayer();
|
||||
base.OnDetachedFromVisualTree(e);
|
||||
}
|
||||
|
|
@ -89,12 +76,8 @@ public partial class VideoPage : ContentPage
|
|||
private void ReleasePlayer()
|
||||
{
|
||||
PlayButton.IsEnabled = false;
|
||||
Video.MediaPlayer = null;
|
||||
_podcastInput?.Cancel();
|
||||
if (VideoSurface.Content is LibVLCSharp.Avalonia.VideoView desktopVideo)
|
||||
desktopVideo.MediaPlayer = null;
|
||||
if (VideoSurface.Content is IDisposable nativeSurface)
|
||||
nativeSurface.Dispose();
|
||||
VideoSurface.Content = null;
|
||||
if (_player is not null)
|
||||
{
|
||||
_player.EncounteredError -= Player_EncounteredError;
|
||||
|
|
@ -112,14 +95,6 @@ public partial class VideoPage : ContentPage
|
|||
_libVlc = null;
|
||||
}
|
||||
|
||||
private void SuspendPlayback()
|
||||
{
|
||||
ReleasePlayer();
|
||||
PlaybackStatus.Text = "Lecture suspendue.";
|
||||
}
|
||||
|
||||
private void ResumePlayback() => InitializePlayer();
|
||||
|
||||
private void PodcastFailed(string message) => Dispatcher.UIThread.Post(() => PlaybackStatus.Text = message);
|
||||
|
||||
private static bool CanLaunchExternally(Uri source)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<ContentPage xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:vm="using:PostIt.ViewModels"
|
||||
xmlns:services="using:PostIt.Services"
|
||||
xmlns:streaming="clr-namespace:Yavsc.Abstract.Streaming;assembly=Yavsc.Abstract"
|
||||
x:Class="PostIt.Views.PodcastsPage"
|
||||
x:DataType="vm:PodcastsPageViewModel"
|
||||
|
|
@ -10,17 +9,17 @@
|
|||
<StackPanel Margin="16" Spacing="12" MaxWidth="900">
|
||||
<TextBlock Text="Podcasts : directs et replays" FontSize="22" />
|
||||
<TextBlock Text="Lecture et emission reservees aux utilisateurs connectes. Quitter cette page arrete la capture." TextWrapping="Wrap" />
|
||||
<StackPanel Spacing="8" IsVisible="{Binding CanBroadcast}" IsEnabled="{Binding !IsBroadcasting}">
|
||||
<StackPanel Spacing="8" IsVisible="{Binding IsDesktop}" IsEnabled="{Binding !IsBroadcasting}">
|
||||
<TextBox Text="{Binding Title}" PlaceholderText="Titre du direct" MaxLength="160" />
|
||||
<Button Content="Detecter cameras et microphones" Command="{Binding DetectDevicesCommand}" />
|
||||
<ComboBox ItemsSource="{Binding Cameras}" SelectedItem="{Binding SelectedCamera}" PlaceholderText="Camera">
|
||||
<ComboBox.ItemTemplate>
|
||||
<DataTemplate x:DataType="services:CaptureDevice"><TextBlock Text="{Binding Name}" /></DataTemplate>
|
||||
<DataTemplate x:DataType="vm:CaptureDevice"><TextBlock Text="{Binding Name}" /></DataTemplate>
|
||||
</ComboBox.ItemTemplate>
|
||||
</ComboBox>
|
||||
<ComboBox ItemsSource="{Binding Microphones}" SelectedItem="{Binding SelectedMicrophone}" PlaceholderText="Microphone">
|
||||
<ComboBox.ItemTemplate>
|
||||
<DataTemplate x:DataType="services:CaptureDevice"><TextBlock Text="{Binding Name}" /></DataTemplate>
|
||||
<DataTemplate x:DataType="vm:CaptureDevice"><TextBlock Text="{Binding Name}" /></DataTemplate>
|
||||
</ComboBox.ItemTemplate>
|
||||
</ComboBox>
|
||||
<Button Content="Demarrer le direct" Command="{Binding StartCommand}" />
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@ namespace Yavsc.Billing
|
|||
|
||||
DateTime? ValidationDate { get; }
|
||||
|
||||
PaymentSummary? PaymentSummary { get; }
|
||||
|
||||
bool GetIsAcquitted ();
|
||||
|
||||
string GetFileBaseName (IBillingService service);
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
#nullable enable
|
||||
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace Yavsc.Billing;
|
||||
|
||||
/// <summary>A frozen invoice line copied from the signed estimate.</summary>
|
||||
public sealed record InvoiceLineResponse(string Name, string Description, int Count, decimal UnitaryCost);
|
||||
|
||||
/// <summary>An invoice and its cumulative settlement balance.</summary>
|
||||
public sealed record InvoiceResponse(
|
||||
long CommandId, long EstimateId, string Reference, string ClientId, string PerformerId,
|
||||
DateTimeOffset CreatedAtUtc, string Currency, decimal AmountDue, decimal AmountPaid,
|
||||
decimal AmountRemaining, string PaymentStatus, bool IsAcquitted,
|
||||
IReadOnlyList<InvoiceLineResponse> Lines, IReadOnlyList<InvoicePaymentResponse> Payments);
|
||||
|
||||
/// <summary>An immutable recorded receipt, not an instruction to debit the client.</summary>
|
||||
public sealed record InvoicePaymentResponse(
|
||||
long Id, string Source, string Reference, decimal Amount, string Currency,
|
||||
DateTimeOffset ReceivedAtUtc, DateTimeOffset RecordedAtUtc, string RecordedBy);
|
||||
|
||||
/// <summary>A receipt attested by the invoice's performer.</summary>
|
||||
public sealed record RecordInvoicePaymentRequest
|
||||
{
|
||||
[Required, MaxLength(128)]
|
||||
public required string Reference { get; init; }
|
||||
public required decimal Amount { get; init; }
|
||||
[Required, StringLength(3, MinimumLength = 3)]
|
||||
public required string Currency { get; init; }
|
||||
public required DateTimeOffset ReceivedAtUtc { get; init; }
|
||||
}
|
||||
|
||||
/// <summary>A PayPal transaction identifier to verify on the server; no client amount is trusted.</summary>
|
||||
public sealed record VerifyInvoicePayPalRequest
|
||||
{
|
||||
[Required, MaxLength(128)]
|
||||
public required string TransactionId { get; init; }
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
namespace Yavsc.Billing;
|
||||
|
||||
public enum PaymentStatus
|
||||
{
|
||||
Unpaid,
|
||||
PartiallyPaid,
|
||||
Paid
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
namespace Yavsc.Billing;
|
||||
|
||||
public sealed class PaymentSummary
|
||||
{
|
||||
public PaymentSummary(decimal amountDue, decimal amountPaid)
|
||||
{
|
||||
ArgumentOutOfRangeException.ThrowIfNegative(amountDue);
|
||||
ArgumentOutOfRangeException.ThrowIfNegative(amountPaid);
|
||||
|
||||
AmountDue = amountDue;
|
||||
AmountPaid = amountPaid;
|
||||
}
|
||||
|
||||
public decimal AmountDue { get; }
|
||||
public decimal AmountPaid { get; }
|
||||
public decimal AmountRemaining => Math.Max(0m, AmountDue - AmountPaid);
|
||||
public bool IsAcquitted => AmountPaid >= AmountDue;
|
||||
public PaymentStatus Status => IsAcquitted
|
||||
? PaymentStatus.Paid
|
||||
: AmountPaid > 0m ? PaymentStatus.PartiallyPaid : PaymentStatus.Unpaid;
|
||||
}
|
||||
|
|
@ -14,7 +14,6 @@ namespace Yavsc
|
|||
public const string CirclePath = "circle";
|
||||
public const string CommentsPath = "blogcomments";
|
||||
public const string ChatHubPath = "chathub";
|
||||
public const string Administration = "administration";
|
||||
|
||||
public static readonly Scope[] SiteScopes = {
|
||||
new Scope { Id = "profile", Description = "Your profile informations" },
|
||||
|
|
@ -53,7 +52,7 @@ namespace Yavsc
|
|||
public const string DefaultFactor = "Default";
|
||||
public const string MobileAppFactor = "Mobile Application";
|
||||
public const string SMSFactor = "SMS";
|
||||
public const string AdminName = "Administrator";
|
||||
public const string AdminGroupName = "Administrator";
|
||||
public const string PerformerGroupName = "Performer";
|
||||
public const string StarGroupName = "Star";
|
||||
public const string StarHunterGroupName = "StarHunter";
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@
|
|||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||
<Library>true</Library>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<AssemblyVersion>1.0.8.0</AssemblyVersion>
|
||||
<FileVersion>1.0.8.0</FileVersion>
|
||||
<InformationalVersion>1.0.8-458+Branch.main.Sha.ad92744a94c829947994ffef5e8a6598f62868f8</InformationalVersion>
|
||||
<Version>1.0.8-458</Version>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-estimate.1+364.Branch.feature-estimate.Sha.3d6ab6e72f9ba4ccfa250a1cce154b550281405e</InformationalVersion>
|
||||
<Version>1.1.0-estimate.1</Version>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
using System;
|
||||
using System.Net.Http;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Yavsc.Billing;
|
||||
|
||||
namespace Yavsc.Api.Client;
|
||||
|
||||
public sealed class InvoicesApiClient
|
||||
{
|
||||
private readonly IYavscApiClient _api;
|
||||
private readonly Func<string> _businessBaseAddress;
|
||||
|
||||
public InvoicesApiClient(IYavscApiClient api, Func<string> businessBaseAddress)
|
||||
{
|
||||
_api = api ?? throw new ArgumentNullException(nameof(api));
|
||||
_businessBaseAddress = businessBaseAddress ?? throw new ArgumentNullException(nameof(businessBaseAddress));
|
||||
}
|
||||
|
||||
public Task<InvoiceResponse> GenerateAsync(long estimateId, CancellationToken ct = default)
|
||||
=> CallAsync(HttpMethod.Post, $"from-estimate/{PositiveId(estimateId)}", null, ct);
|
||||
|
||||
public Task<InvoiceResponse> GetAsync(long commandId, CancellationToken ct = default)
|
||||
=> CallAsync(HttpMethod.Get, $"{PositiveId(commandId)}", null, ct);
|
||||
|
||||
public Task<InvoiceResponse> RecordOfflineAsync(long commandId, RecordInvoicePaymentRequest request, CancellationToken ct = default)
|
||||
=> CallAsync(HttpMethod.Post, $"{PositiveId(commandId)}/payments/offline",
|
||||
request ?? throw new ArgumentNullException(nameof(request)), ct);
|
||||
|
||||
public Task<InvoiceResponse> VerifyPayPalAsync(long commandId, string transactionId, CancellationToken ct = default)
|
||||
{
|
||||
ArgumentException.ThrowIfNullOrWhiteSpace(transactionId);
|
||||
return CallAsync(HttpMethod.Post, $"{PositiveId(commandId)}/payments/paypal",
|
||||
new VerifyInvoicePayPalRequest { TransactionId = transactionId }, ct);
|
||||
}
|
||||
|
||||
private Task<InvoiceResponse> CallAsync(HttpMethod method, string path, object? body, CancellationToken ct)
|
||||
{
|
||||
var baseAddress = _businessBaseAddress();
|
||||
ArgumentException.ThrowIfNullOrWhiteSpace(baseAddress);
|
||||
return _api.CallAsync<InvoiceResponse>(method, new Uri(new Uri(baseAddress, UriKind.Absolute), $"invoices/{path}").ToString(),
|
||||
body: body, ct: ct);
|
||||
}
|
||||
|
||||
private static long PositiveId(long id)
|
||||
{
|
||||
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(id);
|
||||
return id;
|
||||
}
|
||||
}
|
||||
|
|
@ -15,10 +15,10 @@
|
|||
</Description>
|
||||
<RepositoryUrl>https://github.com/pazof/yavsc</RepositoryUrl>
|
||||
<Library>true</Library>
|
||||
<AssemblyVersion>1.0.8.0</AssemblyVersion>
|
||||
<FileVersion>1.0.8.0</FileVersion>
|
||||
<InformationalVersion>1.0.8-458+Branch.main.Sha.ad92744a94c829947994ffef5e8a6598f62868f8</InformationalVersion>
|
||||
<Version>1.0.8-458</Version>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-estimate.1+364.Branch.feature-estimate.Sha.3d6ab6e72f9ba4ccfa250a1cce154b550281405e</InformationalVersion>
|
||||
<Version>1.1.0-estimate.1</Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" />
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ public sealed class NotificationsApiController : Controller
|
|||
public async Task<ActionResult<List<Notification>>> GetCurrentUserNotifications()
|
||||
{
|
||||
var currentUserId = User.GetUserId();
|
||||
var isAdmin = User.IsInRole(Constants.AdminName);
|
||||
var isAdmin = User.IsInRole(Constants.AdminGroupName);
|
||||
|
||||
var dismissedIds = string.IsNullOrWhiteSpace(currentUserId)
|
||||
? new HashSet<long>()
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ public sealed class ResourceUsageApiController : Controller
|
|||
[HttpGet(Constants.ResourceUsageAdminRoute)]
|
||||
public async Task<ActionResult<List<ResourceUsageSummary>>> GetAdminOverview()
|
||||
{
|
||||
if (!User.IsInRole(Constants.AdminName))
|
||||
if (!User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
return Forbid();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ using Yavsc.Api.Services;
|
|||
namespace Yavsc.ApiControllers.Administration;
|
||||
|
||||
[ApiController]
|
||||
[ApiExplorerSettings(GroupName = Constants.Administration)]
|
||||
[ApiExplorerSettings(GroupName = "administration")]
|
||||
[Authorize("AdministratorOnly")]
|
||||
[Route(Constants.APIPrefix + "/administration")]
|
||||
[Produces("application/json")]
|
||||
|
|
|
|||
|
|
@ -89,8 +89,6 @@ namespace Yavsc.ApiControllers
|
|||
{
|
||||
return new ChallengeResult();
|
||||
}
|
||||
if (bill is not NominativeServiceCommand { InvoiceEstimateId: not null })
|
||||
return Conflict(new { Error = "Create the invoice from a signed estimate first." });
|
||||
Response.ContentType = "text/x-tex";
|
||||
return ViewComponent("Bill",new object[] { billingCode, bill , OutputFormat.LaTeX, true });
|
||||
}
|
||||
|
|
@ -105,10 +103,6 @@ namespace Yavsc.ApiControllers
|
|||
return this.NotFound();
|
||||
}
|
||||
logger.LogWarning("Got bill ack:"+bill.GetIsAcquitted().ToString());
|
||||
if (bill is not NominativeServiceCommand { InvoiceEstimateId: not null } invoice)
|
||||
return Conflict(new { Error = "Create the invoice from a signed estimate first." });
|
||||
if (User.GetUserId() != invoice.InvoicePerformerId && !User.IsInRole(Constants.AdminName))
|
||||
return Forbid();
|
||||
return ViewComponent("Bill",new object[] { billingCode, bill, OutputFormat.Pdf, true } );
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,12 +24,12 @@ namespace Yavsc.Controllers
|
|||
}
|
||||
bool UserIsAdminOrThis(string uid)
|
||||
{
|
||||
if (User.IsInRole(Constants.AdminName)) return true;
|
||||
if (User.IsInRole(Constants.AdminGroupName)) return true;
|
||||
return uid == User.GetUserId();
|
||||
}
|
||||
bool UserIsAdminOrInThese(string oid, string uid)
|
||||
{
|
||||
if (User.IsInRole(Constants.AdminName)) return true;
|
||||
if (User.IsInRole(Constants.AdminGroupName)) return true;
|
||||
var cuid = User.GetUserId();
|
||||
return cuid == uid || cuid == oid;
|
||||
}
|
||||
|
|
@ -79,7 +79,7 @@ namespace Yavsc.Controllers
|
|||
return BadRequest();
|
||||
}
|
||||
var uid = User.GetUserId();
|
||||
if (!User.IsInRole(Constants.AdminName))
|
||||
if (!User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
if (uid != estimate.OwnerId)
|
||||
{
|
||||
|
|
@ -115,7 +115,7 @@ namespace Yavsc.Controllers
|
|||
var uid = User.GetUserId();
|
||||
if (estimate.OwnerId == null) estimate.OwnerId = uid;
|
||||
|
||||
if (!User.IsInRole(Constants.AdminName))
|
||||
if (!User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
if (uid != estimate.OwnerId)
|
||||
{
|
||||
|
|
@ -185,7 +185,7 @@ namespace Yavsc.Controllers
|
|||
return NotFound();
|
||||
}
|
||||
var uid = User.GetUserId();
|
||||
if (!User.IsInRole(Constants.AdminName))
|
||||
if (!User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
if (uid != estimate.OwnerId)
|
||||
{
|
||||
|
|
@ -193,8 +193,6 @@ namespace Yavsc.Controllers
|
|||
return BadRequest(ModelState);
|
||||
}
|
||||
}
|
||||
if (_context.NominativeServiceCommands.Any(command => command.InvoiceEstimateId == id))
|
||||
return Conflict(new { Error = "An invoiced estimate cannot be deleted." });
|
||||
_context.Estimates.Remove(estimate);
|
||||
_context.SaveChanges(User.GetUserId());
|
||||
|
||||
|
|
@ -285,7 +283,7 @@ namespace Yavsc.Controllers
|
|||
if (estimate == null) return NotFound();
|
||||
|
||||
var uid = User.GetUserId();
|
||||
if (!User.IsInRole(Constants.AdminName) && uid != estimate.OwnerId)
|
||||
if (!User.IsInRole(Constants.AdminGroupName) && uid != estimate.OwnerId)
|
||||
return new StatusCodeResult(StatusCodes.Status403Forbidden);
|
||||
|
||||
if (body == null || body.FileId <= 0)
|
||||
|
|
@ -319,7 +317,7 @@ namespace Yavsc.Controllers
|
|||
if (estimate == null) return NotFound();
|
||||
|
||||
var uid = User.GetUserId();
|
||||
if (!User.IsInRole(Constants.AdminName) && uid != estimate.OwnerId)
|
||||
if (!User.IsInRole(Constants.AdminGroupName) && uid != estimate.OwnerId)
|
||||
return new StatusCodeResult(StatusCodes.Status403Forbidden);
|
||||
|
||||
var link = _context.EstimateAttachedFiles
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ namespace Yavsc.Controllers
|
|||
}
|
||||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
if (estimateTemplate.OwnerId!=uid)
|
||||
if (!User.IsInRole(Constants.AdminName))
|
||||
if (!User.IsInRole(Constants.AdminGroupName))
|
||||
return new StatusCodeResult(StatusCodes.Status403Forbidden);
|
||||
|
||||
_context.Entry(estimateTemplate).State = EntityState.Modified;
|
||||
|
|
@ -133,7 +133,7 @@ namespace Yavsc.Controllers
|
|||
}
|
||||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
if (estimateTemplate.OwnerId!=uid)
|
||||
if (!User.IsInRole(Constants.AdminName))
|
||||
if (!User.IsInRole(Constants.AdminGroupName))
|
||||
return new StatusCodeResult(StatusCodes.Status403Forbidden);
|
||||
|
||||
_context.EstimateTemplates.Remove(estimateTemplate);
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ namespace Yavsc.ApiControllers
|
|||
if (estimate is null) return NotFound(new { Error = "no estimate linked to this query" });
|
||||
|
||||
var uid = User.GetUserId();
|
||||
if (!User.IsInRole(Constants.AdminName)
|
||||
if (!User.IsInRole(Constants.AdminGroupName)
|
||||
&& uid != estimate.ClientId && uid != estimate.OwnerId)
|
||||
return Forbid();
|
||||
|
||||
|
|
@ -117,7 +117,7 @@ namespace Yavsc.ApiControllers
|
|||
if (estimate is null) return NotFound(new { Error = "no estimate linked to this query" });
|
||||
|
||||
var uid = User.GetUserId();
|
||||
if (!User.IsInRole(Constants.AdminName)
|
||||
if (!User.IsInRole(Constants.AdminGroupName)
|
||||
&& uid != estimate.ClientId && uid != estimate.OwnerId)
|
||||
return Forbid();
|
||||
|
||||
|
|
@ -403,7 +403,7 @@ namespace Yavsc.ApiControllers
|
|||
if (isProvider) return (query, ActorRole.Provider, null);
|
||||
if (isClient) return (query, ActorRole.Client, null);
|
||||
|
||||
if (User.IsInRole(Constants.AdminName))
|
||||
if (User.IsInRole(Constants.AdminGroupName))
|
||||
return (query, ActorRole.Admin, null);
|
||||
|
||||
return (null, ActorRole.None, Forbid());
|
||||
|
|
@ -453,7 +453,7 @@ namespace Yavsc.ApiControllers
|
|||
if (error is not null) return error;
|
||||
if (query is null) return BadRequest(new { Error = "query not found" });
|
||||
|
||||
if (role != ActorRole.Client && !User.IsInRole(Constants.AdminName))
|
||||
if (role != ActorRole.Client && !User.IsInRole(Constants.AdminGroupName))
|
||||
return new StatusCodeResult(StatusCodes.Status403Forbidden);
|
||||
|
||||
if (body == null || body.FileId <= 0)
|
||||
|
|
@ -463,7 +463,7 @@ namespace Yavsc.ApiControllers
|
|||
var file = await dbContext.UploadedFiles
|
||||
.FirstOrDefaultAsync(f => f.Id == body.FileId, token);
|
||||
if (file == null) return BadRequest(new { error = "file not found" });
|
||||
if (file.OwnerId != uid && !User.IsInRole(Constants.AdminName))
|
||||
if (file.OwnerId != uid && !User.IsInRole(Constants.AdminGroupName))
|
||||
return new StatusCodeResult(StatusCodes.Status403Forbidden);
|
||||
|
||||
var existing = await dbContext.QueryAttachedFiles
|
||||
|
|
@ -490,7 +490,7 @@ namespace Yavsc.ApiControllers
|
|||
if (error is not null) return error;
|
||||
if (query is null) return BadRequest(new { Error = "query not found" });
|
||||
|
||||
if (role != ActorRole.Client && !User.IsInRole(Constants.AdminName))
|
||||
if (role != ActorRole.Client && !User.IsInRole(Constants.AdminGroupName))
|
||||
return new StatusCodeResult(StatusCodes.Status403Forbidden);
|
||||
|
||||
var link = await dbContext.QueryAttachedFiles
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ public class HairCutQueryApiController : Controller
|
|||
return NotFound();
|
||||
}
|
||||
|
||||
if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminName))
|
||||
if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
return Forbid();
|
||||
}
|
||||
|
|
@ -141,7 +141,7 @@ public class HairCutQueryApiController : Controller
|
|||
}
|
||||
|
||||
var uid = User.GetUserId();
|
||||
if (existing.ClientId != uid && !User.IsInRole(Constants.AdminName))
|
||||
if (existing.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
return Forbid();
|
||||
}
|
||||
|
|
@ -154,9 +154,6 @@ public class HairCutQueryApiController : Controller
|
|||
return BadRequest(ModelState);
|
||||
}
|
||||
|
||||
if (existing.InvoiceEstimateId.HasValue && existing.PerformerId != query.PerformerId)
|
||||
return Conflict(new { Error = "An invoiced command cannot change performer." });
|
||||
|
||||
existing.ActivityCode = query.ActivityCode;
|
||||
existing.PerformerId = query.PerformerId;
|
||||
existing.Consent = query.Consent;
|
||||
|
|
@ -185,13 +182,11 @@ public class HairCutQueryApiController : Controller
|
|||
return NotFound();
|
||||
}
|
||||
|
||||
if (query.ClientId != uid && !User.IsInRole(Constants.AdminName))
|
||||
if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
return Forbid();
|
||||
}
|
||||
|
||||
if (query.InvoiceEstimateId.HasValue)
|
||||
return Conflict(new { Error = "An invoiced command cannot be deleted." });
|
||||
_context.HairCutQueries.Remove(query);
|
||||
await _context.SaveChangesAsync(User.GetUserId(), cancellationToken);
|
||||
|
||||
|
|
@ -234,4 +229,4 @@ public class HairCutQueryApiController : Controller
|
|||
Details = prestation.GetDisplayDetails(),
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -77,7 +77,7 @@ public class HairMultiCutQueryApiController : Controller
|
|||
return NotFound();
|
||||
}
|
||||
|
||||
if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminName))
|
||||
if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
return Forbid();
|
||||
}
|
||||
|
|
@ -152,7 +152,7 @@ public class HairMultiCutQueryApiController : Controller
|
|||
}
|
||||
|
||||
var uid = User.GetUserId();
|
||||
if (existing.ClientId != uid && !User.IsInRole(Constants.AdminName))
|
||||
if (existing.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
return Forbid();
|
||||
}
|
||||
|
|
@ -170,8 +170,6 @@ public class HairMultiCutQueryApiController : Controller
|
|||
return BadRequest(ModelState);
|
||||
}
|
||||
|
||||
if (existing.InvoiceEstimateId.HasValue && existing.PerformerId != query.PerformerId)
|
||||
return Conflict(new { Error = "An invoiced command cannot change performer." });
|
||||
_context.RemoveRange(existing.Prestations);
|
||||
existing.ActivityCode = query.ActivityCode;
|
||||
existing.PerformerId = query.PerformerId;
|
||||
|
|
@ -200,13 +198,11 @@ public class HairMultiCutQueryApiController : Controller
|
|||
return NotFound();
|
||||
}
|
||||
|
||||
if (query.ClientId != uid && !User.IsInRole(Constants.AdminName))
|
||||
if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
return Forbid();
|
||||
}
|
||||
|
||||
if (query.InvoiceEstimateId.HasValue)
|
||||
return Conflict(new { Error = "An invoiced command cannot be deleted." });
|
||||
_context.RemoveRange(query.Prestations);
|
||||
_context.HairMultiCutQueries.Remove(query);
|
||||
await _context.SaveChangesAsync(User.GetUserId(), cancellationToken);
|
||||
|
|
@ -285,4 +281,4 @@ public class HairMultiCutQueryApiController : Controller
|
|||
|
||||
return query;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Yavsc.Billing;
|
||||
using Yavsc.Server.Helpers;
|
||||
using Yavsc.Services;
|
||||
|
||||
namespace Yavsc.ApiControllers;
|
||||
|
||||
[Authorize, ApiController, Route(Constants.APIPrefix + "/invoices")]
|
||||
[Produces("application/json")]
|
||||
[ApiExplorerSettings(GroupName = "invoicing")]
|
||||
public sealed class InvoicesController(IInvoicingService invoices, ILogger<InvoicesController> logger) : ControllerBase
|
||||
{
|
||||
/// <summary>Creates a frozen invoice from an estimate signed by both parties, or returns its existing invoice.</summary>
|
||||
[HttpPost("from-estimate/{estimateId:long}")]
|
||||
[ProducesResponseType<InvoiceResponse>(StatusCodes.Status201Created)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status409Conflict)]
|
||||
public Task<ActionResult<InvoiceResponse>> Generate(long estimateId, CancellationToken ct)
|
||||
=> ExecuteAsync(() => invoices.GenerateAsync(estimateId, User.GetUserId(), IsAdmin, ct), created: true);
|
||||
|
||||
/// <summary>Returns the invoice, balance and receipt history to its parties.</summary>
|
||||
[HttpGet("{commandId:long}")]
|
||||
[ProducesResponseType<InvoiceResponse>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status404NotFound)]
|
||||
public Task<ActionResult<InvoiceResponse>> Get(long commandId, CancellationToken ct)
|
||||
=> ExecuteAsync(() => invoices.GetAsync(commandId, User.GetUserId(), IsAdmin, ct));
|
||||
|
||||
/// <summary>Records an offline receipt attested by the performer, idempotently by reference.</summary>
|
||||
[HttpPost("{commandId:long}/payments/offline")]
|
||||
[ProducesResponseType<InvoiceResponse>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status409Conflict)]
|
||||
public Task<ActionResult<InvoiceResponse>> RecordOffline(long commandId, RecordInvoicePaymentRequest request, CancellationToken ct)
|
||||
=> ExecuteAsync(() => invoices.RecordOfflineAsync(commandId, request, User.GetUserId(), IsAdmin, ct));
|
||||
|
||||
/// <summary>Verifies a completed PayPal transaction server-side before recording its receipt.</summary>
|
||||
[HttpPost("{commandId:long}/payments/paypal")]
|
||||
[ProducesResponseType<InvoiceResponse>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status502BadGateway)]
|
||||
public Task<ActionResult<InvoiceResponse>> VerifyPayPal(long commandId, VerifyInvoicePayPalRequest request, CancellationToken ct)
|
||||
=> ExecuteAsync(() => invoices.VerifyPayPalAsync(commandId, request.TransactionId, User.GetUserId(), IsAdmin, ct));
|
||||
|
||||
private bool IsAdmin => User.IsInRole(Constants.AdminName);
|
||||
|
||||
private async Task<ActionResult<InvoiceResponse>> ExecuteAsync(Func<Task<InvoiceResponse>> action, bool created = false)
|
||||
{
|
||||
try
|
||||
{
|
||||
var invoice = await action();
|
||||
return created
|
||||
? CreatedAtAction(nameof(Get), new { commandId = invoice.CommandId }, invoice)
|
||||
: Ok(invoice);
|
||||
}
|
||||
catch (InvoiceOperationException exception)
|
||||
{
|
||||
logger.LogWarning("Invoice operation rejected ({StatusCode}): {Reason}", exception.StatusCode, exception.Message);
|
||||
return Problem(statusCode: exception.StatusCode, title: exception.Message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -62,7 +62,7 @@ public class RdvQueryApiController : Controller
|
|||
return NotFound();
|
||||
}
|
||||
|
||||
if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminName))
|
||||
if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
return Forbid();
|
||||
}
|
||||
|
|
@ -157,14 +157,11 @@ public class RdvQueryApiController : Controller
|
|||
return NotFound();
|
||||
}
|
||||
|
||||
if (existing.ClientId != uid && !User.IsInRole(Constants.AdminName))
|
||||
if (existing.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
return Forbid();
|
||||
}
|
||||
|
||||
if (existing.InvoiceEstimateId.HasValue && existing.PerformerId != query.PerformerId)
|
||||
return Conflict(new { Error = "An invoiced command cannot change performer." });
|
||||
|
||||
existing.ActivityCode = query.ActivityCode;
|
||||
existing.PerformerId = query.PerformerId;
|
||||
existing.Consent = query.Consent;
|
||||
|
|
@ -222,13 +219,11 @@ public class RdvQueryApiController : Controller
|
|||
return NotFound();
|
||||
}
|
||||
|
||||
if (query.ClientId != uid && !User.IsInRole(Constants.AdminName))
|
||||
if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
|
||||
{
|
||||
return Forbid();
|
||||
}
|
||||
|
||||
if (query.InvoiceEstimateId.HasValue)
|
||||
return Conflict(new { Error = "An invoiced command cannot be deleted." });
|
||||
_context.RdvQueries.Remove(query);
|
||||
await _context.SaveChangesAsync(User.GetUserId(), cancellationToken);
|
||||
|
||||
|
|
|
|||
|
|
@ -88,22 +88,7 @@ namespace Yavsc.ApiControllers
|
|||
return BadRequest();
|
||||
}
|
||||
|
||||
var persisted = await _context.HairCutQueries.AsNoTracking().SingleOrDefaultAsync(q => q.Id == id);
|
||||
if (persisted is null) return NotFound();
|
||||
if (persisted.InvoiceEstimateId.HasValue
|
||||
&& (persisted.ClientId != hairCutQuery.ClientId || persisted.PerformerId != hairCutQuery.PerformerId))
|
||||
return Conflict(new { Error = "An invoiced command cannot change parties." });
|
||||
_context.Entry(hairCutQuery).State = EntityState.Modified;
|
||||
_context.Entry(hairCutQuery).Property(q => q.PaymentRevision).OriginalValue = persisted.PaymentRevision;
|
||||
_context.Entry(hairCutQuery).Property(q => q.AmountDue).IsModified = false;
|
||||
_context.Entry(hairCutQuery).Property(q => q.AmountPaid).IsModified = false;
|
||||
_context.Entry(hairCutQuery).Property(q => q.InvoiceEstimateId).IsModified = false;
|
||||
_context.Entry(hairCutQuery).Property(q => q.InvoicedAtUtc).IsModified = false;
|
||||
_context.Entry(hairCutQuery).Property(q => q.InvoiceCurrency).IsModified = false;
|
||||
_context.Entry(hairCutQuery).Property(q => q.InvoiceClientId).IsModified = false;
|
||||
_context.Entry(hairCutQuery).Property(q => q.InvoicePerformerId).IsModified = false;
|
||||
_context.Entry(hairCutQuery).Property(q => q.InvoiceLinesJson).IsModified = false;
|
||||
_context.Entry(hairCutQuery).Property(q => q.PaymentRevision).IsModified = false;
|
||||
|
||||
try
|
||||
{
|
||||
|
|
@ -219,8 +204,6 @@ namespace Yavsc.ApiControllers
|
|||
return NotFound();
|
||||
}
|
||||
|
||||
if (hairCutQuery.InvoiceEstimateId.HasValue)
|
||||
return Conflict(new { Error = "An invoiced command cannot be deleted." });
|
||||
_context.HairCutQueries.Remove(hairCutQuery);
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ namespace Yavsc.Controllers
|
|||
|
||||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
if (blogpost.AuthorId!=uid)
|
||||
if (!User.IsInRole(Constants.AdminName))
|
||||
if (!User.IsInRole(Constants.AdminGroupName))
|
||||
return BadRequest();
|
||||
|
||||
_context.SaveChanges(User.GetUserId());
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ namespace Yavsc.Controllers
|
|||
{
|
||||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
if (uid != blackListed.OwnerId)
|
||||
if (!User.IsInRole(Constants.AdminName))
|
||||
if (!User.IsInRole(Constants.AdminGroupName))
|
||||
if (!User.IsInRole(Constants.FrontOfficeGroupName))
|
||||
return false;
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ namespace Yavsc.Controllers
|
|||
|
||||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
if (uid != chatRoomAccess.UserId && uid != chatRoomAccess.Room.OwnerId
|
||||
&& ! User.IsInMsRole(Constants.AdminName))
|
||||
&& ! User.IsInMsRole(Constants.AdminGroupName))
|
||||
|
||||
{
|
||||
ModelState.AddModelError("UserId","get refused");
|
||||
|
|
@ -72,7 +72,7 @@ namespace Yavsc.Controllers
|
|||
}
|
||||
var room = _context.ChatRoom.First(channel => channel.Name == chatRoomAccess.ChannelName );
|
||||
|
||||
if (uid != room.OwnerId && ! User.IsInMsRole(Constants.AdminName))
|
||||
if (uid != room.OwnerId && ! User.IsInMsRole(Constants.AdminGroupName))
|
||||
{
|
||||
ModelState.AddModelError("ChannelName", "access put refused");
|
||||
return BadRequest(ModelState);
|
||||
|
|
@ -110,7 +110,7 @@ namespace Yavsc.Controllers
|
|||
|
||||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var room = _context.ChatRoom.First(channel => channel.Name == chatRoomAccess.ChannelName );
|
||||
if (room == null || (uid != room.OwnerId && ! User.IsInMsRole(Constants.AdminName)))
|
||||
if (room == null || (uid != room.OwnerId && ! User.IsInMsRole(Constants.AdminGroupName)))
|
||||
{
|
||||
ModelState.AddModelError("ChannelName", "access post refused");
|
||||
return BadRequest(ModelState);
|
||||
|
|
@ -154,7 +154,7 @@ namespace Yavsc.Controllers
|
|||
|
||||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var room = _context.ChatRoom.First(channel => channel.Name == chatRoomAccess.ChannelName );
|
||||
if (room == null || (uid != room.OwnerId && chatRoomAccess.UserId != uid && ! User.IsInMsRole(Constants.AdminName)))
|
||||
if (room == null || (uid != room.OwnerId && chatRoomAccess.UserId != uid && ! User.IsInMsRole(Constants.AdminGroupName)))
|
||||
{
|
||||
ModelState.AddModelError("UserId", "access drop refused");
|
||||
return BadRequest(ModelState);
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ namespace Yavsc.Controllers
|
|||
|
||||
if (User.GetUserId() != chatRoom.OwnerId )
|
||||
{
|
||||
if (!User.IsInMsRole(Constants.AdminName))
|
||||
if (!User.IsInMsRole(Constants.AdminGroupName))
|
||||
return BadRequest(new {error = "OwnerId"});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
@baseUrl = https://localhost:5001/api/v1
|
||||
@providerToken = replace-with-provider-access-token
|
||||
@clientToken = replace-with-client-access-token
|
||||
@estimateId = 1
|
||||
@commandId = 1
|
||||
@paypalTransactionId = replace-with-completed-paypal-transaction-id
|
||||
|
||||
### Create an invoice from an estimate with both persisted signatures (performer)
|
||||
POST {{baseUrl}}/invoices/from-estimate/{{estimateId}}
|
||||
Authorization: Bearer {{providerToken}}
|
||||
|
||||
### Read its frozen lines, balance and receipt history (either party)
|
||||
GET {{baseUrl}}/invoices/{{commandId}}
|
||||
Authorization: Bearer {{clientToken}}
|
||||
|
||||
### Record an offline receipt (performer); replay the exact body to test idempotence
|
||||
POST {{baseUrl}}/invoices/{{commandId}}/payments/offline
|
||||
Authorization: Bearer {{providerToken}}
|
||||
Content-Type: application/json
|
||||
|
||||
{
|
||||
"reference": "bank-transfer-2026-001",
|
||||
"amount": 30.00,
|
||||
"currency": "EUR",
|
||||
"receivedAtUtc": "2026-10-19T12:00:00Z"
|
||||
}
|
||||
|
||||
### Verify an already captured PayPal transaction (either party); not a checkout token
|
||||
POST {{baseUrl}}/invoices/{{commandId}}/payments/paypal
|
||||
Authorization: Bearer {{clientToken}}
|
||||
Content-Type: application/json
|
||||
|
||||
{
|
||||
"transactionId": "{{paypalTransactionId}}"
|
||||
}
|
||||
|
||||
### Missing invoice -> 404
|
||||
GET {{baseUrl}}/invoices/999999999
|
||||
Authorization: Bearer {{providerToken}}
|
||||
|
||||
### A client cannot attest an offline receipt -> 403
|
||||
POST {{baseUrl}}/invoices/{{commandId}}/payments/offline
|
||||
Authorization: Bearer {{clientToken}}
|
||||
Content-Type: application/json
|
||||
|
||||
{
|
||||
"reference": "not-authorized",
|
||||
"amount": 30.00,
|
||||
"currency": "EUR",
|
||||
"receivedAtUtc": "2026-10-19T12:00:00Z"
|
||||
}
|
||||
|
|
@ -12,7 +12,6 @@ using Yavsc.Models;
|
|||
using Yavsc;
|
||||
using Yavsc.Server.Helpers;
|
||||
using Yavsc.Services;
|
||||
using Yavsc.Settings;
|
||||
using Yavsc.Server.Hubs;
|
||||
using Yavsc.Api.Services;
|
||||
|
||||
|
|
@ -63,7 +62,7 @@ internal class Program
|
|||
{
|
||||
policy
|
||||
.RequireAuthenticatedUser()
|
||||
.RequireClaim(Constants.RoleClaimType, Constants.AdminName);
|
||||
.RequireClaim(Constants.RoleClaimType, Constants.AdminGroupName);
|
||||
});
|
||||
})
|
||||
.AddYavscCors(builder.Configuration)
|
||||
|
|
@ -72,9 +71,7 @@ internal class Program
|
|||
// Binds the "Site" section (Bills, TempDir, Avatars, …) used by
|
||||
// the document-generation flow and BillingController.
|
||||
services.Configure<SiteSettings>(builder.Configuration.GetSection("Site"));
|
||||
services.Configure<SmtpSettings>(builder.Configuration.GetSection("Smtp"));
|
||||
services.AddPodcasts(builder.Configuration);
|
||||
services.AddInvoicing(builder.Configuration);
|
||||
|
||||
// accepts any access token issued by identity server
|
||||
services.AddAuthentication("Bearer")
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public sealed partial class AdministrationService(
|
|||
|
||||
public async Task<AdministrationSummary> GetSummaryAsync(CancellationToken ct)
|
||||
=> new(await db.Users.CountAsync(ct),
|
||||
(await users.GetUsersInRoleAsync(Constants.AdminName)).Count,
|
||||
(await users.GetUsersInRoleAsync(Constants.AdminGroupName)).Count,
|
||||
typeof(AdministrationService).Assembly.GetName().ToString(), System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription);
|
||||
|
||||
public async Task<IReadOnlyList<AdministrationRole>> GetRolesAsync(CancellationToken ct)
|
||||
|
|
@ -46,7 +46,7 @@ public sealed partial class AdministrationService(
|
|||
|
||||
public async Task EnsureRolesAsync(CancellationToken ct)
|
||||
{
|
||||
foreach (var name in new[] { Constants.AdminName, Constants.StarGroupName, Constants.PerformerGroupName,
|
||||
foreach (var name in new[] { Constants.AdminGroupName, Constants.StarGroupName, Constants.PerformerGroupName,
|
||||
Constants.FrontOfficeGroupName, Constants.StarHunterGroupName, Constants.BlogModeratorGroupName })
|
||||
{
|
||||
ct.ThrowIfCancellationRequested();
|
||||
|
|
@ -73,7 +73,7 @@ public sealed partial class AdministrationService(
|
|||
CheckIdentity(await users.AddToRoleAsync(user, role.Name!));
|
||||
else if (!member && alreadyMember)
|
||||
{
|
||||
if (role.Name == Constants.AdminName &&
|
||||
if (role.Name == Constants.AdminGroupName &&
|
||||
(await users.GetUsersInRoleAsync(role.Name)).Count <= 1)
|
||||
throw Conflict("Impossible de retirer le dernier administrateur.");
|
||||
CheckIdentity(await users.RemoveFromRoleAsync(user, role.Name!));
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ public static class AdministrationServiceCollectionExtensions
|
|||
services.AddHttpContextAccessor();
|
||||
services.AddScoped<IAdministrationService, AdministrationService>();
|
||||
services.AddScoped<AdministrationExceptionFilter>();
|
||||
services.AddOpenApi(Constants.Administration, options =>
|
||||
options.ShouldInclude = description => description.GroupName == Constants.Administration);
|
||||
services.AddOpenApi("administration", options =>
|
||||
options.ShouldInclude = description => description.GroupName == "administration");
|
||||
return services;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
using Yavsc.Services;
|
||||
|
||||
namespace Yavsc.Api.Services;
|
||||
|
||||
public static class InvoicingServiceCollectionExtensions
|
||||
{
|
||||
public static IServiceCollection AddInvoicing(this IServiceCollection services, IConfiguration configuration)
|
||||
{
|
||||
services.AddScoped<IInvoicingService, InvoicingService>();
|
||||
services.Configure<PayPalSettings>(configuration.GetSection("Authentication:PayPal"));
|
||||
services.AddHttpClient<IPayPalTransactionVerifier, PayPalTransactionVerifier>(client =>
|
||||
client.Timeout = TimeSpan.FromSeconds(30));
|
||||
services.AddOpenApi("invoicing", options =>
|
||||
options.ShouldInclude = description => description.GroupName == "invoicing");
|
||||
return services;
|
||||
}
|
||||
}
|
||||
|
|
@ -5,10 +5,10 @@
|
|||
<UserSecretsId>1c73094f-959f-4211-b1a1-6a69b236c283</UserSecretsId>
|
||||
<RootNamespace>Yavsc.Api</RootNamespace>
|
||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||
<AssemblyVersion>1.0.8.0</AssemblyVersion>
|
||||
<FileVersion>1.0.8.0</FileVersion>
|
||||
<InformationalVersion>1.0.8-458+Branch.main.Sha.ad92744a94c829947994ffef5e8a6598f62868f8</InformationalVersion>
|
||||
<Version>1.0.8-458</Version>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-estimate.1+364.Branch.feature-estimate.Sha.3d6ab6e72f9ba4ccfa250a1cce154b550281405e</InformationalVersion>
|
||||
<Version>1.1.0-estimate.1</Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ namespace Yavsc.Blogs.Controllers
|
|||
// autorisés comme pour le reste du workflow.
|
||||
bool CanReadFile(UploadedFile file, string uid)
|
||||
{
|
||||
if (User.IsInRole(Constants.AdminName)) return true;
|
||||
if (User.IsInRole(Constants.AdminGroupName)) return true;
|
||||
if (file.OwnerId == uid) return true;
|
||||
|
||||
if (dbContext.EstimateAttachedFiles.Any(a =>
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
<RootNamespace>Yavsc.Blogs</RootNamespace>
|
||||
<RepositoryUrl>https://forgejo.pschneider.fr/notazof/yavsc</RepositoryUrl>
|
||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||
<AssemblyVersion>1.0.8.0</AssemblyVersion>
|
||||
<FileVersion>1.0.8.0</FileVersion>
|
||||
<InformationalVersion>1.0.8-458+Branch.main.Sha.ad92744a94c829947994ffef5e8a6598f62868f8</InformationalVersion>
|
||||
<Version>1.0.8-458</Version>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-estimate.1+364.Branch.feature-estimate.Sha.3d6ab6e72f9ba4ccfa250a1cce154b550281405e</InformationalVersion>
|
||||
<Version>1.1.0-estimate.1</Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ namespace Yavsc.Controllers
|
|||
{
|
||||
// ensure all roles existence
|
||||
foreach (string roleName in new string[] {
|
||||
Constants.AdminName,
|
||||
Constants.AdminGroupName,
|
||||
Constants.StarGroupName,
|
||||
Constants.PerformerGroupName,
|
||||
Constants.FrontOfficeGroupName,
|
||||
|
|
@ -86,12 +86,13 @@ namespace Yavsc.Controllers
|
|||
public async Task<IActionResult> Take()
|
||||
{
|
||||
// If some amdin already exists, make this method disapear
|
||||
var admins = await _userManager.GetUsersInRoleAsync(Constants.AdminName);
|
||||
var admins = await _userManager.GetUsersInRoleAsync(Constants.AdminGroupName);
|
||||
if (admins != null && admins.Count > 0)
|
||||
{
|
||||
// All is ok, nothing to do here.
|
||||
if (User.IsInMsRole(Constants.AdminName))
|
||||
if (User.IsInMsRole(Constants.AdminGroupName))
|
||||
{
|
||||
|
||||
return Ok(new { message = "you already got it." });
|
||||
}
|
||||
return NotFound();
|
||||
|
|
@ -115,7 +116,7 @@ namespace Yavsc.Controllers
|
|||
return new BadRequestObjectResult(ModelState);
|
||||
}
|
||||
|
||||
var addToRoleResult = await _userManager.AddToRoleAsync(user, Constants.AdminName);
|
||||
var addToRoleResult = await _userManager.AddToRoleAsync(user, Constants.AdminGroupName);
|
||||
if (!addToRoleResult.Succeeded)
|
||||
{
|
||||
AddErrors(addToRoleResult);
|
||||
|
|
@ -129,11 +130,11 @@ namespace Yavsc.Controllers
|
|||
public async Task<IActionResult> Index()
|
||||
{
|
||||
var adminCount = await _userManager.GetUsersInRoleAsync(
|
||||
Constants.AdminName);
|
||||
Constants.AdminGroupName);
|
||||
var userCount = await _dbContext.Users.CountAsync();
|
||||
var youAreAdmin = await _userManager.IsInRoleAsync(
|
||||
await _userManager.FindByIdAsync(User.GetUserId()),
|
||||
Constants.AdminName);
|
||||
Constants.AdminGroupName);
|
||||
|
||||
var roles = await _roleManager.Roles.Select(x => new RoleInfo
|
||||
{
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ namespace Yavsc.Controllers
|
|||
}
|
||||
private async Task SetupView(Announce announce)
|
||||
{
|
||||
ViewBag.IsAdmin = User.IsInMsRole(Constants.AdminName);
|
||||
ViewBag.IsAdmin = User.IsInMsRole(Constants.AdminGroupName);
|
||||
ViewBag.IsPerformer = User.IsInMsRole(Constants.PerformerGroupName);
|
||||
ViewBag.AllowEdit = announce==null || announce.Id<=0 || !_authorizationService.AuthorizeAsync(User,announce,new EditPermission()).IsFaulted;
|
||||
List<SelectListItem> dl = new List<SelectListItem>();
|
||||
|
|
@ -80,7 +80,7 @@ namespace Yavsc.Controllers
|
|||
if (ModelState.IsValid)
|
||||
{
|
||||
// Only allow admin to create corporate annonces
|
||||
if (announce.For == Reason.Corporate && ! User.IsInMsRole(Constants.AdminName))
|
||||
if (announce.For == Reason.Corporate && ! User.IsInMsRole(Constants.AdminGroupName))
|
||||
{
|
||||
ModelState.AddModelError("For", _localizer["YourNotAdmin"]);
|
||||
return View(announce);
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
using System.Security.Claims;
|
||||
using System.Text.Json;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.DataProtection;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using System.Security.Claims;
|
||||
|
||||
namespace Yavsc.Controllers
|
||||
{
|
||||
|
|
@ -12,7 +10,6 @@ namespace Yavsc.Controllers
|
|||
using Microsoft.Extensions.Localization;
|
||||
using Models;
|
||||
using ViewModels.FrontOffice;
|
||||
using Yavsc.Abstract.Streaming;
|
||||
using Yavsc.Server.Helpers;
|
||||
using Yavsc.Services;
|
||||
|
||||
|
|
@ -23,24 +20,18 @@ namespace Yavsc.Controllers
|
|||
readonly ILogger _logger;
|
||||
readonly IStringLocalizer _SR;
|
||||
private readonly IBillingService _billing;
|
||||
private readonly IDataProtectionProvider _dataProtectionProvider;
|
||||
private readonly ILiveProcessor _liveProcessor;
|
||||
|
||||
public FrontOfficeController(ApplicationDbContext context,
|
||||
UserManager<ApplicationUser> userManager,
|
||||
IBillingService billing,
|
||||
ILoggerFactory loggerFactory,
|
||||
IDataProtectionProvider dataProtectionProvider,
|
||||
ILiveProcessor liveProcessor,
|
||||
IStringLocalizer<FrontOfficeController> SR)
|
||||
IStringLocalizer<FrontOfficeController> SR)
|
||||
{
|
||||
_context = context;
|
||||
_userManager = userManager;
|
||||
_logger = loggerFactory.CreateLogger<FrontOfficeController>();
|
||||
_SR = SR;
|
||||
_billing = billing;
|
||||
_dataProtectionProvider = dataProtectionProvider;
|
||||
_liveProcessor = liveProcessor;
|
||||
}
|
||||
|
||||
public ActionResult Index()
|
||||
|
|
@ -86,145 +77,5 @@ namespace Yavsc.Controllers
|
|||
return View(result);
|
||||
}
|
||||
|
||||
[AllowAnonymous]
|
||||
public async Task<ActionResult> PerformerPodcasts(string id, string? token)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(id)) return NotFound();
|
||||
|
||||
if (!TryValidateToken(id, token, out var expireAt))
|
||||
return BadRequest("Ce lien public de podcast a expire ou est invalide.");
|
||||
|
||||
var performer = await _context.Performers
|
||||
.Include(p => p.Performer)
|
||||
.FirstOrDefaultAsync(p => p.PerformerId == id);
|
||||
|
||||
if (performer == null) return NotFound();
|
||||
|
||||
var podcasts = (await _liveProcessor.ListAsync(HttpContext.RequestAborted))
|
||||
.Where(p => string.Equals(p.OwnerId, id, StringComparison.Ordinal))
|
||||
.OrderByDescending(p => p.CreatedAt)
|
||||
.ToArray();
|
||||
|
||||
ViewBag.PerformerName = performer.Performer?.UserName ?? performer.PerformerId;
|
||||
ViewBag.PerformerId = id;
|
||||
ViewBag.PermalinkExpiry = expireAt;
|
||||
ViewBag.Permalink = Url.Action(nameof(PerformerPodcasts), "FrontOffice", new { id, token = CreateToken(id) }, Request.Scheme, Request.Host.Value);
|
||||
|
||||
return View(podcasts);
|
||||
}
|
||||
|
||||
[AllowAnonymous]
|
||||
public async Task<ActionResult> PerformerActivity(string id, string activityCode, string? token)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(id) || string.IsNullOrWhiteSpace(activityCode)) return NotFound();
|
||||
|
||||
if (!TryValidateToken(id, activityCode, token, out var expireAt))
|
||||
return BadRequest("Ce lien public pour cette activité a expire ou est invalide.");
|
||||
|
||||
var performer = await _context.Performers
|
||||
.Include(p => p.Performer)
|
||||
.FirstOrDefaultAsync(p => p.PerformerId == id);
|
||||
|
||||
var activity = await _context.Activities
|
||||
.FirstOrDefaultAsync(a => a.Code == activityCode);
|
||||
|
||||
if (performer == null || activity == null) return NotFound();
|
||||
|
||||
var profile = (await _context.ListPerformersAsync(_billing, activityCode))
|
||||
.Where(p => string.Equals(p.PerformerId, id, StringComparison.Ordinal))
|
||||
.ToList();
|
||||
|
||||
ViewBag.Activity = activity;
|
||||
ViewBag.PerformerName = performer.Performer?.UserName ?? performer.PerformerId;
|
||||
ViewBag.PerformerId = id;
|
||||
ViewBag.PermalinkExpiry = expireAt;
|
||||
ViewBag.Permalink = Url.Action(nameof(PerformerActivity), "FrontOffice", new { id, activityCode, token = CreateActivityToken(id, activityCode) }, Request.Scheme, Request.Host.Value);
|
||||
|
||||
return View("Profiles", profile);
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[Authorize]
|
||||
public IActionResult GeneratePerformerPodcastPermalink(string id)
|
||||
{
|
||||
var currentUserId = User.GetUserId();
|
||||
if (string.IsNullOrWhiteSpace(currentUserId) || !string.Equals(currentUserId, id, StringComparison.Ordinal))
|
||||
return Forbid();
|
||||
|
||||
var token = CreateToken(id);
|
||||
return RedirectToAction(nameof(PerformerPodcasts), new { id, token });
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[Authorize]
|
||||
public IActionResult GeneratePerformerActivityPermalink(string id, string activityCode)
|
||||
{
|
||||
var currentUserId = User.GetUserId();
|
||||
if (string.IsNullOrWhiteSpace(currentUserId) || !string.Equals(currentUserId, id, StringComparison.Ordinal))
|
||||
return Forbid();
|
||||
|
||||
var token = CreateActivityToken(id, activityCode);
|
||||
return RedirectToAction(nameof(PerformerActivity), new { id, activityCode, token });
|
||||
}
|
||||
|
||||
private string CreateToken(string performerId)
|
||||
{
|
||||
var expiresAt = DateTimeOffset.UtcNow.AddHours(24);
|
||||
var protector = _dataProtectionProvider.CreateProtector("Yavsc.Org.PerformerPodcastLink");
|
||||
var payload = new
|
||||
{
|
||||
performerId,
|
||||
exp = expiresAt.ToUnixTimeSeconds(),
|
||||
};
|
||||
return protector.Protect(JsonSerializer.Serialize(payload));
|
||||
}
|
||||
|
||||
private string CreateActivityToken(string performerId, string activityCode)
|
||||
{
|
||||
var expiresAt = DateTimeOffset.UtcNow.AddHours(24);
|
||||
var protector = _dataProtectionProvider.CreateProtector("Yavsc.Org.PerformerActivityLink");
|
||||
var payload = new
|
||||
{
|
||||
performerId,
|
||||
activityCode,
|
||||
exp = expiresAt.ToUnixTimeSeconds(),
|
||||
};
|
||||
return protector.Protect(JsonSerializer.Serialize(payload));
|
||||
}
|
||||
|
||||
private bool TryValidateToken(string performerId, string? token, out DateTimeOffset validUntil)
|
||||
=> TryValidateTokenInternal(performerId, null, token, out validUntil, "Yavsc.Org.PerformerPodcastLink");
|
||||
|
||||
private bool TryValidateToken(string performerId, string activityCode, string? token, out DateTimeOffset validUntil)
|
||||
=> TryValidateTokenInternal(performerId, activityCode, token, out validUntil, "Yavsc.Org.PerformerActivityLink");
|
||||
|
||||
private bool TryValidateTokenInternal(string performerId, string? activityCode, string? token, out DateTimeOffset validUntil, string protectorName)
|
||||
{
|
||||
validUntil = DateTimeOffset.MinValue;
|
||||
if (string.IsNullOrWhiteSpace(token)) return false;
|
||||
|
||||
try
|
||||
{
|
||||
var protector = _dataProtectionProvider.CreateProtector(protectorName);
|
||||
var payload = JsonDocument.Parse(protector.Unprotect(token));
|
||||
var ownerId = payload.RootElement.GetProperty("performerId").GetString();
|
||||
var expiry = payload.RootElement.GetProperty("exp").GetInt64();
|
||||
|
||||
if (!string.Equals(ownerId, performerId, StringComparison.Ordinal)) return false;
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(activityCode))
|
||||
{
|
||||
if (!payload.RootElement.TryGetProperty("activityCode", out var activityPayload)) return false;
|
||||
if (!string.Equals(activityPayload.GetString(), activityCode, StringComparison.Ordinal)) return false;
|
||||
}
|
||||
|
||||
validUntil = DateTimeOffset.FromUnixTimeSeconds(expiry);
|
||||
return validUntil > DateTimeOffset.UtcNow;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -147,8 +147,6 @@ namespace Yavsc.Controllers
|
|||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
if (query.ClientId != uid)
|
||||
return new ChallengeResult();
|
||||
if (query.InvoiceEstimateId.HasValue)
|
||||
return Conflict(new { Error = "An invoiced command cannot be deleted." });
|
||||
_context.HairCutQueries.Remove(query);
|
||||
await _context.SaveChangesAsync();
|
||||
return await Index();
|
||||
|
|
|
|||
|
|
@ -50,14 +50,9 @@ namespace Yavsc.Controllers
|
|||
if (clicked == null) clicked = new long[0];
|
||||
}
|
||||
else clicked = _dbContext.DismissClicked.Where(d => d.UserId == uid).Select(d => d.NotificationId).ToArray();
|
||||
var isAdmin = User.IsInRole(Constants.AdminName);
|
||||
var notes = _dbContext.Notification.Where(
|
||||
n => !clicked.Contains(n.Id)
|
||||
).Where(n =>
|
||||
string.IsNullOrWhiteSpace(n.Target)
|
||||
|| (n.Target != null && n.Target.StartsWith("pub/"))
|
||||
|| (!string.IsNullOrWhiteSpace(uid) && n.Target == $"user/{uid}")
|
||||
|| (isAdmin && n.Target == Constants.Administration));
|
||||
);
|
||||
if (notes.Any()) this.Notify(notes);
|
||||
|
||||
var toShow = _dbContext.Activities
|
||||
|
|
|
|||
|
|
@ -158,8 +158,6 @@ namespace Yavsc.Controllers
|
|||
public async Task<IActionResult> DeleteConfirmed(long id)
|
||||
{
|
||||
Project project = await _context.Project.SingleAsync(m => m.Id == id);
|
||||
if (project.InvoiceEstimateId.HasValue)
|
||||
return Conflict(new { Error = "An invoiced command cannot be deleted." });
|
||||
_context.Project.Remove(project);
|
||||
await _context.SaveChangesAsync();
|
||||
return RedirectToAction("Index");
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ namespace Yavsc.Controllers
|
|||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
if (ModelState.IsValid)
|
||||
{
|
||||
if (model.UserId != uid) if (!User.IsInMsRole(Constants.AdminName))
|
||||
if (model.UserId != uid) if (!User.IsInMsRole(Constants.AdminGroupName))
|
||||
return new ChallengeResult();
|
||||
|
||||
_context.Instrumentation.Add(model);
|
||||
|
|
@ -81,7 +81,7 @@ namespace Yavsc.Controllers
|
|||
{
|
||||
return NotFound();
|
||||
}
|
||||
if (id != uid) if (!User.IsInMsRole(Constants.AdminName))
|
||||
if (id != uid) if (!User.IsInMsRole(Constants.AdminGroupName))
|
||||
return new ChallengeResult();
|
||||
Instrumentation musicianSettings = await _context.Instrumentation.SingleAsync(m => m.UserId == id);
|
||||
if (musicianSettings == null)
|
||||
|
|
@ -97,7 +97,7 @@ namespace Yavsc.Controllers
|
|||
public async Task<IActionResult> Edit(Instrumentation musicianSettings)
|
||||
{
|
||||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
if (musicianSettings.UserId != uid) if (!User.IsInMsRole(Constants.AdminName))
|
||||
if (musicianSettings.UserId != uid) if (!User.IsInMsRole(Constants.AdminGroupName))
|
||||
return new ChallengeResult();
|
||||
if (ModelState.IsValid)
|
||||
{
|
||||
|
|
@ -123,7 +123,7 @@ namespace Yavsc.Controllers
|
|||
return NotFound();
|
||||
}
|
||||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
if (musicianSettings.UserId != uid) if (!User.IsInMsRole(Constants.AdminName))
|
||||
if (musicianSettings.UserId != uid) if (!User.IsInMsRole(Constants.AdminGroupName))
|
||||
return new ChallengeResult();
|
||||
return View(musicianSettings);
|
||||
}
|
||||
|
|
@ -136,7 +136,7 @@ namespace Yavsc.Controllers
|
|||
Instrumentation musicianSettings = await _context.Instrumentation.SingleAsync(m => m.UserId == id);
|
||||
|
||||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
if (musicianSettings.UserId != uid) if (!User.IsInMsRole(Constants.AdminName))
|
||||
if (musicianSettings.UserId != uid) if (!User.IsInMsRole(Constants.AdminGroupName))
|
||||
return new ChallengeResult();
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -263,14 +263,14 @@ public static class HostingExtensions
|
|||
policy
|
||||
.RequireAuthenticatedUser()
|
||||
.RequireClaim(Constants.RoleClaimType,
|
||||
new string[] { Constants.PerformerGroupName, Constants.AdminName })
|
||||
new string[] { Constants.PerformerGroupName, Constants.AdminGroupName })
|
||||
;
|
||||
});
|
||||
options.AddPolicy("AdministratorOnly", policy =>
|
||||
{
|
||||
_ = policy
|
||||
.RequireAuthenticatedUser()
|
||||
.RequireClaim(Constants.RoleClaimType, Constants.AdminName);
|
||||
.RequireClaim(Constants.RoleClaimType, Constants.AdminGroupName);
|
||||
});
|
||||
|
||||
options.AddPolicy("FrontOffice", policy => policy.RequireRole(Constants.FrontOfficeGroupName));
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,39 +0,0 @@
|
|||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace Yavsc.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class InvoicePaymentAmounts : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<decimal>(
|
||||
name: "AmountDue",
|
||||
table: "NominativeServiceCommands",
|
||||
type: "numeric",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<decimal>(
|
||||
name: "AmountPaid",
|
||||
table: "NominativeServiceCommands",
|
||||
type: "numeric",
|
||||
nullable: false,
|
||||
defaultValue: 0m);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "AmountDue",
|
||||
table: "NominativeServiceCommands");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "AmountPaid",
|
||||
table: "NominativeServiceCommands");
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,155 +0,0 @@
|
|||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace Yavsc.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class SignedEstimateInvoicing : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "InvoiceClientId",
|
||||
table: "NominativeServiceCommands",
|
||||
type: "text",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "InvoiceCurrency",
|
||||
table: "NominativeServiceCommands",
|
||||
type: "character varying(3)",
|
||||
maxLength: 3,
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<long>(
|
||||
name: "InvoiceEstimateId",
|
||||
table: "NominativeServiceCommands",
|
||||
type: "bigint",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "InvoiceLinesJson",
|
||||
table: "NominativeServiceCommands",
|
||||
type: "text",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "InvoicePerformerId",
|
||||
table: "NominativeServiceCommands",
|
||||
type: "text",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<DateTimeOffset>(
|
||||
name: "InvoicedAtUtc",
|
||||
table: "NominativeServiceCommands",
|
||||
type: "timestamp with time zone",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "PaymentRevision",
|
||||
table: "NominativeServiceCommands",
|
||||
type: "uuid",
|
||||
nullable: false,
|
||||
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "InvoicePayments",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<long>(type: "bigint", nullable: false)
|
||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||
CommandId = table.Column<long>(type: "bigint", nullable: false),
|
||||
Source = table.Column<string>(type: "character varying(16)", maxLength: 16, nullable: false),
|
||||
ReferenceScope = table.Column<string>(type: "character varying(450)", maxLength: 450, nullable: false),
|
||||
Reference = table.Column<string>(type: "character varying(128)", maxLength: 128, nullable: false),
|
||||
Amount = table.Column<decimal>(type: "numeric", nullable: false),
|
||||
Currency = table.Column<string>(type: "character varying(3)", maxLength: 3, nullable: false),
|
||||
ReceivedAtUtc = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
|
||||
RecordedAtUtc = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
|
||||
RecordedBy = table.Column<string>(type: "character varying(450)", maxLength: 450, nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_InvoicePayments", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_InvoicePayments_NominativeServiceCommands_CommandId",
|
||||
column: x => x.CommandId,
|
||||
principalTable: "NominativeServiceCommands",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
});
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_NominativeServiceCommands_InvoiceEstimateId",
|
||||
table: "NominativeServiceCommands",
|
||||
column: "InvoiceEstimateId",
|
||||
unique: true);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_InvoicePayments_CommandId",
|
||||
table: "InvoicePayments",
|
||||
column: "CommandId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_InvoicePayments_Source_ReferenceScope_Reference",
|
||||
table: "InvoicePayments",
|
||||
columns: new[] { "Source", "ReferenceScope", "Reference" },
|
||||
unique: true);
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_NominativeServiceCommands_Estimates_InvoiceEstimateId",
|
||||
table: "NominativeServiceCommands",
|
||||
column: "InvoiceEstimateId",
|
||||
principalTable: "Estimates",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_NominativeServiceCommands_Estimates_InvoiceEstimateId",
|
||||
table: "NominativeServiceCommands");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "InvoicePayments");
|
||||
|
||||
migrationBuilder.DropIndex(
|
||||
name: "IX_NominativeServiceCommands_InvoiceEstimateId",
|
||||
table: "NominativeServiceCommands");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "InvoiceClientId",
|
||||
table: "NominativeServiceCommands");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "InvoiceCurrency",
|
||||
table: "NominativeServiceCommands");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "InvoiceEstimateId",
|
||||
table: "NominativeServiceCommands");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "InvoiceLinesJson",
|
||||
table: "NominativeServiceCommands");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "InvoicePerformerId",
|
||||
table: "NominativeServiceCommands");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "InvoicedAtUtc",
|
||||
table: "NominativeServiceCommands");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "PaymentRevision",
|
||||
table: "NominativeServiceCommands");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@ namespace Yavsc.Migrations
|
|||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "10.0.13")
|
||||
.HasAnnotation("ProductVersion", "10.0.12")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||
|
||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||
|
|
@ -1442,61 +1442,6 @@ namespace Yavsc.Migrations
|
|||
b.ToTable("ExceptionsSIREN");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Yavsc.Models.Billing.InvoicePayment", b =>
|
||||
{
|
||||
b.Property<long>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("bigint");
|
||||
|
||||
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
|
||||
|
||||
b.Property<decimal>("Amount")
|
||||
.HasColumnType("numeric");
|
||||
|
||||
b.Property<long>("CommandId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.Property<string>("Currency")
|
||||
.IsRequired()
|
||||
.HasMaxLength(3)
|
||||
.HasColumnType("character varying(3)");
|
||||
|
||||
b.Property<DateTimeOffset>("ReceivedAtUtc")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<DateTimeOffset>("RecordedAtUtc")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("RecordedBy")
|
||||
.IsRequired()
|
||||
.HasMaxLength(450)
|
||||
.HasColumnType("character varying(450)");
|
||||
|
||||
b.Property<string>("Reference")
|
||||
.IsRequired()
|
||||
.HasMaxLength(128)
|
||||
.HasColumnType("character varying(128)");
|
||||
|
||||
b.Property<string>("ReferenceScope")
|
||||
.IsRequired()
|
||||
.HasMaxLength(450)
|
||||
.HasColumnType("character varying(450)");
|
||||
|
||||
b.Property<string>("Source")
|
||||
.IsRequired()
|
||||
.HasMaxLength(16)
|
||||
.HasColumnType("character varying(16)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("CommandId");
|
||||
|
||||
b.HasIndex("Source", "ReferenceScope", "Reference")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("InvoicePayments");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Yavsc.Models.Billing.NominativeServiceCommand", b =>
|
||||
{
|
||||
b.Property<long>("Id")
|
||||
|
|
@ -1509,14 +1454,6 @@ namespace Yavsc.Migrations
|
|||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<decimal?>("AmountDue")
|
||||
.HasColumnType("numeric");
|
||||
|
||||
b.Property<decimal>("AmountPaid")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("numeric")
|
||||
.HasDefaultValue(0m);
|
||||
|
||||
b.Property<string>("ClientId")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
|
@ -1539,34 +1476,9 @@ namespace Yavsc.Migrations
|
|||
.HasMaxLength(34)
|
||||
.HasColumnType("character varying(34)");
|
||||
|
||||
b.Property<string>("InvoiceClientId")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("InvoiceCurrency")
|
||||
.HasMaxLength(3)
|
||||
.HasColumnType("character varying(3)");
|
||||
|
||||
b.Property<long?>("InvoiceEstimateId")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.Property<string>("InvoiceLinesJson")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("InvoicePerformerId")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<DateTimeOffset?>("InvoicedAtUtc")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("PaymentId")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<Guid>("PaymentRevision")
|
||||
.IsConcurrencyToken()
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid")
|
||||
.HasDefaultValue(new Guid("00000000-0000-0000-0000-000000000000"));
|
||||
|
||||
b.Property<string>("PerformerId")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
|
@ -1594,9 +1506,6 @@ namespace Yavsc.Migrations
|
|||
|
||||
b.HasIndex("ClientId");
|
||||
|
||||
b.HasIndex("InvoiceEstimateId")
|
||||
.IsUnique();
|
||||
|
||||
b.HasIndex("PaymentId");
|
||||
|
||||
b.HasIndex("PerformerId");
|
||||
|
|
@ -4036,17 +3945,6 @@ namespace Yavsc.Migrations
|
|||
b.Navigation("File");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Yavsc.Models.Billing.InvoicePayment", b =>
|
||||
{
|
||||
b.HasOne("Yavsc.Models.Billing.NominativeServiceCommand", "Command")
|
||||
.WithMany()
|
||||
.HasForeignKey("CommandId")
|
||||
.OnDelete(DeleteBehavior.Restrict)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Command");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Yavsc.Models.Billing.NominativeServiceCommand", b =>
|
||||
{
|
||||
b.HasOne("Yavsc.Models.Workflow.Activity", "Context")
|
||||
|
|
@ -4061,11 +3959,6 @@ namespace Yavsc.Migrations
|
|||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.HasOne("Yavsc.Models.Billing.Estimate", null)
|
||||
.WithMany()
|
||||
.HasForeignKey("InvoiceEstimateId")
|
||||
.OnDelete(DeleteBehavior.Restrict);
|
||||
|
||||
b.HasOne("Yavsc.Models.Payment.PayPalPayment", "Regularization")
|
||||
.WithMany()
|
||||
.HasForeignKey("PaymentId");
|
||||
|
|
|
|||
|
|
@ -1,87 +0,0 @@
|
|||
@model IReadOnlyList<Yavsc.Abstract.Streaming.PodcastResponse>
|
||||
@{
|
||||
ViewBag.Title = $"Podcasts de {ViewBag.PerformerName}";
|
||||
var performerName = ViewBag.PerformerName ?? "ce performer";
|
||||
var permalinkExpiry = ViewBag.PermalinkExpiry is DateTimeOffset expiry ? expiry : DateTimeOffset.MinValue;
|
||||
}
|
||||
|
||||
<div class="container py-4">
|
||||
<div class="alert alert-info d-flex flex-column flex-md-row justify-content-between align-items-md-center gap-3" role="alert">
|
||||
<div>
|
||||
<h1 class="h3 mb-1">Découvrez les podcasts de @performerName</h1>
|
||||
<p class="mb-0 text-muted">
|
||||
Ce lien public est valable jusqu'au @permalinkExpiry.ToLocalTime().ToString("g").
|
||||
</p>
|
||||
</div>
|
||||
<div class="d-flex gap-2">
|
||||
<button type="button" class="btn btn-primary" onclick="copyPermalink()">Copier le permalien</button>
|
||||
<a class="btn btn-primary" href="https://www.yavsc.fr/" target="_blank" rel="noreferrer">S'inscrire</a>
|
||||
<a class="btn btn-outline-primary" href="https://postit.yavsc.fr/" target="_blank" rel="noreferrer">Installer PostIt</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if (Model == null || Model.Count == 0)
|
||||
{
|
||||
<div class="alert alert-light border">
|
||||
Aucun podcast public n'est encore disponible pour @performerName.
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="row g-3">
|
||||
@foreach (var podcast in Model)
|
||||
{
|
||||
<div class="col-12 col-lg-6">
|
||||
<div class="card h-100 shadow-sm">
|
||||
<div class="card-body">
|
||||
<div class="d-flex justify-content-between align-items-start gap-3">
|
||||
<div>
|
||||
<h2 class="h5 mb-1">@podcast.Title</h2>
|
||||
<small class="text-muted">
|
||||
@podcast.CreatedAt.ToLocalTime().ToString("g")
|
||||
</small>
|
||||
</div>
|
||||
<span class="badge bg-secondary">@podcast.State</span>
|
||||
</div>
|
||||
|
||||
<p class="mt-3 mb-2 text-muted">
|
||||
@podcast.DurationSeconds.ToString("0.##") s · @podcast.SegmentCount segments · @((podcast.Bytes / 1024.0 / 1024.0).ToString("0.##")) Mo
|
||||
</p>
|
||||
|
||||
<audio controls class="w-100 mt-2" preload="metadata">
|
||||
<source src="@Url.Action("Playlist", "Podcast", new { id = podcast.Id })" type="application/vnd.apple.mpegurl" />
|
||||
Votre navigateur ne prend pas en charge la lecture audio.
|
||||
</audio>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
<script>
|
||||
function copyPermalink() {
|
||||
const url = '@(ViewBag.Permalink ?? string.Empty)';
|
||||
if (!url) return;
|
||||
|
||||
if (navigator.clipboard && navigator.clipboard.writeText) {
|
||||
navigator.clipboard.writeText(url).catch(() => fallbackCopy(url));
|
||||
return;
|
||||
}
|
||||
|
||||
fallbackCopy(url);
|
||||
}
|
||||
|
||||
function fallbackCopy(value) {
|
||||
const temp = document.createElement('textarea');
|
||||
temp.value = value;
|
||||
temp.setAttribute('readonly', '');
|
||||
temp.style.position = 'fixed';
|
||||
temp.style.left = '-9999px';
|
||||
document.body.appendChild(temp);
|
||||
temp.select();
|
||||
document.execCommand('copy');
|
||||
document.body.removeChild(temp);
|
||||
}
|
||||
</script>
|
||||
|
|
@ -2,26 +2,10 @@
|
|||
|
||||
@{
|
||||
ViewBag.Title = (ViewBag.Activity?.Name ?? "Any") ;
|
||||
var activityCode = ViewBag.Activity?.Code as string;
|
||||
var performerId = ViewBag.PerformerId as string;
|
||||
var permalinkExpiry = ViewBag.PermalinkExpiry is DateTimeOffset expiry ? expiry : DateTimeOffset.MinValue;
|
||||
}
|
||||
<h1>@ViewBag.Title</h1>
|
||||
<em>@ViewBag.Activity.Description</em>
|
||||
|
||||
@if (!string.IsNullOrWhiteSpace(performerId) && !string.IsNullOrWhiteSpace(activityCode))
|
||||
{
|
||||
<div class="alert alert-info d-flex flex-column flex-md-row justify-content-between align-items-md-center gap-3 mt-3" role="alert">
|
||||
<div>
|
||||
<div class="fw-semibold">Permalien public</div>
|
||||
<small class="text-muted">Valable jusqu'au @permalinkExpiry.ToLocalTime().ToString("g")</small>
|
||||
</div>
|
||||
<button type="button" class="btn btn-primary" onclick="copyPermalink()">
|
||||
Copier le permalien
|
||||
</button>
|
||||
</div>
|
||||
}
|
||||
|
||||
@foreach (var profile in Model) {
|
||||
<hr/>
|
||||
@Html.DisplayFor(m=>profile)
|
||||
|
|
@ -31,29 +15,3 @@
|
|||
</a>
|
||||
}
|
||||
|
||||
<script>
|
||||
function copyPermalink() {
|
||||
const url = '@(ViewBag.Permalink ?? string.Empty)';
|
||||
if (!url) return;
|
||||
|
||||
if (navigator.clipboard && navigator.clipboard.writeText) {
|
||||
navigator.clipboard.writeText(url).catch(() => fallbackCopy(url));
|
||||
return;
|
||||
}
|
||||
|
||||
fallbackCopy(url);
|
||||
}
|
||||
|
||||
function fallbackCopy(value) {
|
||||
const temp = document.createElement('textarea');
|
||||
temp.value = value;
|
||||
temp.setAttribute('readonly', '');
|
||||
temp.style.position = 'fixed';
|
||||
temp.style.left = '-9999px';
|
||||
document.body.appendChild(temp);
|
||||
temp.select();
|
||||
document.execCommand('copy');
|
||||
document.body.removeChild(temp);
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<li><a class="dropdown-item @PageHelpers.ActivePage(ViewContext, "Feature")" asp-controller="Feature" asp-action="Index">Features</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
@if (User.IsInMsRole(Constants.AdminName)) {
|
||||
@if (User.IsInMsRole(Constants.AdminGroupName)) {
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle @PageHelpers.ActivePageAny(ViewContext, administrationControllers)" href="#" id="dropdown05" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
Administration
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
<RootNamespace>Yavsc</RootNamespace>
|
||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||
<RepositoryUrl>https://github.com/pazof/yavsc</RepositoryUrl>
|
||||
<AssemblyVersion>1.0.8.0</AssemblyVersion>
|
||||
<FileVersion>1.0.8.0</FileVersion>
|
||||
<InformationalVersion>1.0.8-458+Branch.main.Sha.ad92744a94c829947994ffef5e8a6598f62868f8</InformationalVersion>
|
||||
<Version>1.0.8-458</Version>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-estimate.1+364.Branch.feature-estimate.Sha.3d6ab6e72f9ba4ccfa250a1cce154b550281405e</InformationalVersion>
|
||||
<Version>1.1.0-estimate.1</Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DotMarkdown" />
|
||||
|
|
|
|||
|
|
@ -18,12 +18,6 @@ namespace Yavsc.Helpers
|
|||
string total = query.GetBillItems().Addition().ToString("C", CultureInfo.CurrentUICulture);
|
||||
string bill = string.Join("\n", query.GetBillItems().Select(l=> $"{l.Name} {l.Description} : {l.UnitaryCost} € " + ((l.Count != 1) ? "*"+l.Count.ToString() : ""))) +
|
||||
$"\n\nTotal: {total}";
|
||||
if (query.PaymentSummary is { } payment)
|
||||
{
|
||||
bill += $"\nPaid: {payment.AmountPaid.ToString("C", CultureInfo.CurrentUICulture)}"
|
||||
+ $"\nRemaining: {payment.AmountRemaining.ToString("C", CultureInfo.CurrentUICulture)}"
|
||||
+ $"\nStatus: {payment.Status}";
|
||||
}
|
||||
return bill;
|
||||
}
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue