Merge pull request #16 from Thovi98/testing

Update README.md

README.md

@@ -3,36 +3,85 @@
 [![Integration level](https://dash.yunohost.org/integration/streama.svg)](https://dash.yunohost.org/appci/app/streama) ![](https://ci-apps.yunohost.org/ci/badges/streama.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/streama.maintain.svg)  
 [![Install Streama with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=streama)
 
-Streama Server
+
+*[Lire ce readme en français.](./README_fr.md)*
+
+> *This package allows you to install Streama quickly and simply on a YunoHost server.  
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
+
 
 **Shipped version:** 1.9.1
 
 - [Yunohost project](https://yunohost.org)
-- [Streama website](https://github.com/streamaserver/streama/)
+- [Streama website](https://docs.streama-project.com/)
 
-![](https://avatars2.githubusercontent.com/u/38193973?s=280&v=4)
+![](https://raw.githubusercontent.com/streamaserver/streama/master/design/banner2.png)
 
-### Installing guide
+
+
+## Screenshots
+
+![Streama 1](https://user-images.githubusercontent.com/51749973/96721582-9fb9f900-13ac-11eb-89b0-c20a6019c9c6.jpg)
+![Streama 2](https://user-images.githubusercontent.com/51749973/96721578-9f216280-13ac-11eb-9f6c-94b4199f8eaf.jpg)
+![Streama 3](https://user-images.githubusercontent.com/51749973/96721577-9f216280-13ac-11eb-935c-d083f4b010a2.jpg)
+![Streama 4](https://user-images.githubusercontent.com/51749973/96721574-9df03580-13ac-11eb-9031-fb1c2dbfca9a.jpg)
+
+
+
+## Demo
+
+* [Official demo](https://streama.demo-version.net)
+
+**User**: demoUser
+
+**Password**: demoUser
+
+
+## Installation guide
 
  App can be installed by YunoHost **admin web-interface** or by **running following command**:
 
         $ sudo yunohost app install https://github.com/YunoHost-Apps/streama_ynh
         
- Upload directory is : /home/yunohost.app/streama
+ Default upload directory is : /home/yunohost.app/streama (must be mentioned in *Settings* page or can be changed)
- 
- Local video is : /home/yunohost.app/streama/upload
  
+ Default local video directory is : /home/yunohost.app/streama/upload (must be mentioned in *Settings* page or can be changed)
+
+## Documentation
+
+ * Official documentation: https://docs.streama-project.com/ or https://github.com/streamaserver/streama/wiki
+
+#### Multi-user support
+
+* Are LDAP and HTTP auth supported? NO
+* Can the app be used by multiple users? YES
+
+#### Supported architectures
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logsSTREAMA%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/streama/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/STREAMA%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/streama/)
+
+## Limitations
+
+* Installation requires a dedicated domain or subdomain.
+
+## Additional information
+
+* After install:
+
+**Username**: admin
+
+**Password**: admin
+
+This can be changed in settings.
+
 ### Convert video :
  
         $ convert_movies -ffmpeg 
         $ convert_movies -avidemux
         $ convert_movies -mencoder
         $ convert_movies -avconv
- 
+        
-### Upgrade this package:
-
-        $ sudo yunohost app upgrade --verbose example -u https://github.com/YunoHost-Apps/streama_ynh
-       
 ### Avidemux compilation :
 
         $ git clone https://github.com/mean00/avidemux2/
@@ -49,4 +98,38 @@ Streama Server
         $ sudo dpkg -i libaften0_0.0.8svn20100103-dmo2_amd64.deb
         $ sudo dpkg -i libaften-dev_0.0.8svn20100103-dmo2_amd64.deb
         $ bash bootStrap.bash --deb --without-qt --with-cli
+
+## Links
+
+ * Report a bug: https://github.com/YunoHost-Apps/streama_ynh/issues
+ * App website: https://docs.streama-project.com/
+ * Upstream app repository: https://github.com/streamaserver/streama
+ * YunoHost website: https://yunohost.org/
+
+---
+
+Developer info
+----------------
+
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/streama_ynh/tree/testing).
+
+To try the testing branch, please proceed like that.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/streama_ynh/tree/testing --debug
+or
+sudo yunohost app upgrade streama -u https://github.com/YunoHost-Apps/streama_ynh/tree/testing --debug
+```
+
+
+
+
+
+
+
+
+
+
+
+ 
+
         

README_fr.md

@@ -0,0 +1,125 @@
+# Streama pour YunoHost
+[![Integration level](https://dash.yunohost.org/integration/streama.svg)](https://dash.yunohost.org/appci/app/streama) ![](https://ci-apps.yunohost.org/ci/badges/streama.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/streama.maintain.svg)  
+[![Install Streama with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=streama)
+
+*[Read this readme in english.](./README.md)* 
+
+> *Ce package vous permet d'installer Streama rapidement et simplement sur un serveur YunoHost.  
+Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
+
+## Vue d'ensemble
+
+**Version incluse :** 1.9.1
+
+- [Projet Yunohost](https://yunohost.org)
+- [Site web de Streama](https://docs.streama-project.com/)
+
+![](https://raw.githubusercontent.com/streamaserver/streama/master/design/banner2.png)
+
+
+## Captures d'écran
+
+![Streama 1](https://user-images.githubusercontent.com/51749973/96721582-9fb9f900-13ac-11eb-89b0-c20a6019c9c6.jpg)
+![Streama 2](https://user-images.githubusercontent.com/51749973/96721578-9f216280-13ac-11eb-9f6c-94b4199f8eaf.jpg)
+![Streama 3](https://user-images.githubusercontent.com/51749973/96721577-9f216280-13ac-11eb-935c-d083f4b010a2.jpg)
+![Streama 4](https://user-images.githubusercontent.com/51749973/96721574-9df03580-13ac-11eb-9031-fb1c2dbfca9a.jpg)
+
+
+## Démo
+
+
+* [Demo officielle](https://streama.demo-version.net)
+
+**Nom d’utilisateur** : demoUser
+
+**Mot de passe** : demoUser
+
+
+
+## Guide d’installation
+
+  L’application peut être installée par **l’interface web-admin** Yunohost ou en **exécutant la commande suivante** :
+
+        $ sudo yunohost app install https://github.com/YunoHost-Apps/streama_ynh
+        
+ 
+ Le répertoire de téléchargement par défaut est : /home/yunohost.app/streama (doit être mentionné dans la page *Paramètres* ou peut être modifié)
+ 
+ Le répertoire vidéo local par défaut est : /home/yunohost.app/streama/upload (doit être mentionné dans la page *Paramètres* ou peut être modifié)
+ 
+
+## Documentation
+
+ * Documentation officielle : https://docs.streama-project.com/ ou https://github.com/streamaserver/streama/wiki
+
+
+#### Support multi-utilisateur
+
+* L'authentification LDAP et HTTP est-elle prise en charge ? NON
+* L'application peut-elle être utilisée par plusieurs utilisateurs ? OUI
+
+#### Architectures supportées
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logsSTREAMA%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/streama/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/STREAMA%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/streama/)
+
+## Limitations
+
+* L’installation nécessite un domaine ou un sous-domaine dédié.
+
+## Informations additionnelles
+
+* Après l’installation :
+
+**Nom d’utilisateur** : admin
+
+**Mot de passe** : admin
+
+Ceci pourra être changé dans les paramètres.
+
+### Convertir des vidéos :
+ 
+        $ convert_movies -ffmpeg 
+        $ convert_movies -avidemux
+        $ convert_movies -mencoder
+        $ convert_movies -avconv
+        
+### Compilation avidemux :
+
+        $ git clone https://github.com/mean00/avidemux2/
+        $ cd avidemux2
+        $ sudo apt-get install build-essential cmake \
+        pkg-config yasm libsqlite3-dev libfontconfig1-dev \
+        libfribidi-dev libxvdev libvdpau-dev libva-dev \
+        libasound2-dev libpulse-dev libfdk-aac-dev \
+        libpng-dev libmp3lame-dev libx264-dev \
+        libxvidcore-dev libfaad-dev libfaac-dev libopus-dev \
+        libvorbis-dev libogg-dev libdca-dev libx265-dev
+        $ wget https://www.deb-multimedia.org/pool/main/a/aften/libaften0_0.0.8svn20100103-dmo2_amd64.deb
+        $ wget https://www.deb-multimedia.org/pool/main/a/aften/libaften-dev_0.0.8svn20100103-dmo2_amd64.deb
+        $ sudo dpkg -i libaften0_0.0.8svn20100103-dmo2_amd64.deb
+        $ sudo dpkg -i libaften-dev_0.0.8svn20100103-dmo2_amd64.deb
+        $ bash bootStrap.bash --deb --without-qt --with-cli
+
+
+
+## Liens
+
+ * Signaler un bug : https://github.com/YunoHost-Apps/streama_ynh/issues
+ * Site de l'application : https://docs.streama-project.com/
+ * Dépôt de l'application principale : https://github.com/streamaserver/streama
+ * Site web YunoHost : https://yunohost.org/
+
+---
+
+Informations pour les développeurs
+----------------
+
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/streama_ynh/tree/testing).
+
+Pour essayer la branche testing, procédez comme suit.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/streama_ynh/tree/testing --debug
+ou
+sudo yunohost app upgrade streama -u https://github.com/YunoHost-Apps/streama_ynh/tree/testing --debug
+```