diff --git a/Makefile b/Makefile index 92a16efae905ba2bb0f051284ef92dc788d3452a..8fddbc21d8cfe1b9befb2a5f9f36ddf60cca9839 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,6 @@ all: find . -name '*.*un\~' -exec rm '{}' \; #equivs-build eqctl -f equivs-build eqctl - mv *.deb ./site/downloads/files/dontpanic-latest.deb + mv *.deb ./site/downloads/dontpanic-latest.deb # vim:set ft=make: diff --git a/make_source.sh b/make_source.sh new file mode 100755 index 0000000000000000000000000000000000000000..29606c8557ecfde9b02c39e3e480cc632b0dfea6 --- /dev/null +++ b/make_source.sh @@ -0,0 +1,19 @@ +#!/bin/sh +#Auteur : thuban + +REP=~/geek/gitreps/3hg/dontpanic + +if [ -d /tmp/dontpanic ]; then + rm -rf /tmp/dontpanic +fi + +mkdir -p /tmp/dontpanic +cd $REP +cp -r * /tmp/dontpanic +rm -r /tmp/dontpanic/site +cd /tmp +tar cvzf "dontpanic-latest.tgz" "dontpanic" +mv dontpanic-latest.tgz $REP/site/downloads/ + +exit + diff --git a/python2.7.core b/python2.7.core deleted file mode 100644 index 714612d4d1910b709757d8096aa6fc7bad094839..0000000000000000000000000000000000000000 Binary files a/python2.7.core and /dev/null differ diff --git a/site/Images/en.png b/site/Images/en.png deleted file mode 100644 index 5de202b34c784899dcea93667dbb96628017de25..0000000000000000000000000000000000000000 Binary files a/site/Images/en.png and /dev/null differ diff --git a/site/Images/fr.png b/site/Images/fr.png deleted file mode 100644 index aea11511932a5df49a73f580509dd93997af50f2..0000000000000000000000000000000000000000 Binary files a/site/Images/fr.png and /dev/null differ diff --git a/site/MIT b/site/MIT new file mode 100644 index 0000000000000000000000000000000000000000..2a923d7a3aa1ef891f134ea1e902375d42e1baca --- /dev/null +++ b/site/MIT @@ -0,0 +1,9 @@ +Copyright (c) <2016> <3hg team> + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the <3hg team> shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the <3hg team> diff --git a/site/donate-fr.html b/site/donate-fr.html deleted file mode 100644 index fdb998340faa8c707814f75c0a30a77219ab830a..0000000000000000000000000000000000000000 --- a/site/donate-fr.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - Don't panic donation page - - - - - - -
-
- - -
- - -
-
-

Donate

-
-
- -

Si vous appréciez dontpanic, vous pouvez nous encourager à l'améliorer avec un petit don en utilisant les services flattr ou liberapay : -

-

- - - -

Vous pouvez aussi parler de dontpanic autour de vous ou nous envoyer un peti mot.

- - -
- - diff --git a/site/donate.html b/site/donate.html deleted file mode 100644 index 4b5469187dbfe9782c2bca8b4bdc33ad118e95c1..0000000000000000000000000000000000000000 --- a/site/donate.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - Don't panic donation page - - - - - - -
-
- - -
- - -
-
-

Donate

-
-
- -

If you like dontpanic, you can encourage us to improve it with a small donation via flattr or liberapay : -

-

- - - -

You can also spread the word about dontpanic or contact us to say hi.

- - -
- - diff --git a/site/download-fr.html b/site/download-fr.html deleted file mode 100644 index 9ceebc7652e463aa9629858a2a91992d467e8b91..0000000000000000000000000000000000000000 --- a/site/download-fr.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - Don't panic main page - - - - - - -
-
- - -
- - -
-
-

Télécharger dontpanic

-
-
-

Vous pouvez télécharger dontpanic de plusieurs façons :

- - -

Installation avec le paquet debian

- - Avec le dépôt debian : -

Cette méthode est recommandée pour profiter facilement des mises à jour. - Ajoutez la ligne suivante à la liste des paquets, par exemple en éditant le fichier /etc/apt/sources.list

- -
deb http://deb.yeuxdelibad.net/ stable main
- -

Récupérez ensuite la clé gpg afin de vérifier l'authenticité des paquets

- -
wget -O- http://yeuxdelibad.net/Divers/thuban.pub | sudo apt-key add - 
- -

Vous pouvez maitnenant recharger la liste des paquets et installer dontpanic.

- -

-    sudo apt-get update
-    sudo apt-get install dontpanic
-    
- - Installer le paquet à la main : - -

Pour installer dontpanic avec le paquet debian, vous devrez :

- - - -

Installation avec le dépôt git

- -

Pour faire fonctionner dontpanic, vous aurez à installer quelques - dépendances avec la commande suivante :

- -
# apt-get install python3-bottle python3-requests python3-bs4 python3-libtorrent sqlite3
-    
- -

Ensuite, récupérez dontpanic avec git :

- -
git clone https://git.framasoft.org/Thuban/dontpanic.git
-    
- -

Enfin, déplacez-vous dans le dossier dontpanic puis lancez dontpanic ainsi :

- -
dontpanic
-    
- -

ou

- -
python dontpanic.py
-    
- -

Cela va ouvrir votre navigateur à l'adresse - http://localhost:(port aleatoire) et permet d'utiliser - dontpanic en simple utilisateur.

- - - - -
- - diff --git a/site/download.html b/site/download.html index 193cadd7375585c876abc5330781f45029faa3d5..e17c4dea919298c0fea6726f03e97c36e92c0116 100644 --- a/site/download.html +++ b/site/download.html @@ -1,98 +1,98 @@ + - - Don't panic main page - - - - + Don't panic donwload page + + + + -
-
- - -
- - -
-
-

Download dontpanic

-
-
-

You can download don't panic in different ways :

-
diff --git a/site/downloads/config.php b/site/downloads/config.php deleted file mode 100644 index 3184e4733860a28f25669bb4c5a21be17557ac8f..0000000000000000000000000000000000000000 --- a/site/downloads/config.php +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/site/downloads/files/dontpanic-latest-exe.zip b/site/downloads/dontpanic-latest-exe.zip similarity index 100% rename from site/downloads/files/dontpanic-latest-exe.zip rename to site/downloads/dontpanic-latest-exe.zip diff --git a/site/downloads/files/dontpanic-latest.deb b/site/downloads/dontpanic-latest.deb similarity index 100% rename from site/downloads/files/dontpanic-latest.deb rename to site/downloads/dontpanic-latest.deb diff --git a/site/downloads/dontpanic-latest.tgz b/site/downloads/dontpanic-latest.tgz new file mode 100644 index 0000000000000000000000000000000000000000..4f6519e42d5ba1ed1f697eef80e2e5ff116f2b67 Binary files /dev/null and b/site/downloads/dontpanic-latest.tgz differ diff --git a/site/downloads/files/index.html b/site/downloads/files/index.html deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/site/downloads/index.php b/site/downloads/index.php deleted file mode 100644 index 0d5a94f6ed9c96562f6a3da69d6c3dde66b74a7f..0000000000000000000000000000000000000000 --- a/site/downloads/index.php +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/site/downloads/stats/index.php b/site/downloads/stats/index.php deleted file mode 100644 index 40f10ea00a41bf04b650e230c30da53f4da99e9b..0000000000000000000000000000000000000000 --- a/site/downloads/stats/index.php +++ /dev/null @@ -1,22 +0,0 @@ -" . $totalLines . "
"; - } -} -?> \ No newline at end of file diff --git a/site/index-fr.html b/site/index-fr.html deleted file mode 100644 index f7069cffcc39d4005321e5ad8475c318131da918..0000000000000000000000000000000000000000 --- a/site/index-fr.html +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - Don't panic page principale - - - - - - -
-
- - -
- -
-
-

Dontpanic, c'est quoi?

-
-
- -

Don't panic est une application sous licence libre pour trouver et regarder sans prises de - tête un film ou une série. Le principe est un peu le même que feu - popcorn time, mais ne dépend pas d'une api centrale et doit donc - toujours fonctionner.

- -

Tapez juste ce que vous souhaitez voir, dontpanic se charge de - chercher sur - omdb ce qui peut correspondre. Sont affichés en - plus quelques torrents trouvés par btdigg. - Vous avez alors le choix d'en savoir plus sur votre recherche ou - directement lancer un torrent qui vous donnera une vidéo en "streaming".

- -

Voilà quelques fonctionnalités en vrac :

- - - -

Le projet est accessible sur https://git.framasoft.org/Thuban/dontpanic . - N'hésitez pas à contribuer ou à m'encourager.

- - - -

Captures d'écran

- -
-
dontpanic1-thumb.jpg
-
dontpanic2-thumb.jpg
-
dontpanic3-thumb.jpg
-
-
-
dontpanic5-thumb.jpg
-
dontpanic7-thumb.jpg
-
dontpanic6-thumb.jpg
-
- -

Utilisation

- -

Vous pouvez utiliser dontpanic en local avec la commande dontpanic ou python3 dontpanic.py, ou bien en allant le chercher dans la section "Internet" de votre environnement de bureau.
Votre navigateur web ouvrira une nouvelle page vous donnant accès à dontpanic.

- -

Note: Vous pouvez configurer votre navigateur pour ouvrir les liens magnets avec dontpanic. Cela vous permettra de les regarder en streaming directement :

-

-    dontpanic magnet:xt=urn:btih:.....
-    
- -

Utilisation en serveur

- -

Vous pouvez utiliser dontpanic en tant que serveur pour proposer ce - service au monde entier. Pour cela, référez-vous à la documentation de - bottle : bottle deployment.

- -

Pour lancer dontpanic en tant que serveur, il faut utiliser la commande - :

- -
python dontpanic-server.py -adapter administrator password port
-    
- -

Veillez toutefois à ces points :

- - - -

Utiliser une connexion sécurisée (https)

- -

Si vous déployez dontpanic sur votre serveur, il est conseillé de - sécuriser les échanges avec ssl. La façon la plus simple est d'utiliser - un serveur http comme relai proxy vers dontpanic. - Référez-vous à la documentation de cherrypy, paste (ou autre adaptateur) - pour être sûr de vous. - C'est ici pour cherrypy

- -

Ci dessous, vous trouverez une configuration de nginx en https testée - avec cherrypy, paste et tornado:

- -
upstream apps {
-        server 127.0.0.1:8080;
-    }
-
-    gzip_http_version 1.0;
-    gzip_proxied      any;
-    gzip_min_length   500;
-    gzip_disable      "MSIE [1-6]\.";
-    gzip_types        text/plain text/xml text/css
-                    text/javascript
-                    application/javascript;
-
-
-    server {
-        listen 80;
-        server_name my_server_name;
-        return 301 https://$server_name$request_uri;  # enforce https
-    }
-
-    server {
-        listen 443 ssl;
-        server_name  my_server_name;
-
-        ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
-        ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
-
-    location / {
-        proxy_pass         http://apps;
-        proxy_redirect     off;
-        proxy_set_header   Host $host;
-        proxy_set_header   X-Real-IP $remote_addr;
-        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header   X-Forwarded-Host $server_name;
-    }
-    }
-    
- -

Replacez le nom du serveur, le port utilisé et le chemin vers les - certificats ssl selon votre configuration.

- -

Dans ce cas, dontpanic était lancé avec:

- -
python dontpanic-server.py -cherrypy admin password 8080
-    
- -

FAQ

-

Pourquoi ma vidéo ne démarre pas?

- -

Puisque dontpanic ne recense pas les vidéos sur un serveur centralisé ni - n'héberge de fichiers .torrent, toutes informations sur un fichier sont - récupérées à l'aide d'un lien magnet. C'est tout simplement pour des - raisons de légalité et pour que le système perdure. - Cependant, si vous choisissez une vidéo avec peu de pairs, alors elle - peut mettre beaucoup de temps à démarrer.

- -

C'est pourquoi le nombre de pair a un fond coloré. En choisissant les - fichiers avec un fond vert, il ne devrait pas y avoir de problème.

- -

Créer un paquet debian

- -

Utilisez equivs : equivs-build eqctl.

- -

Python2 ou python3?

-

Les deux sont actuellement supportés. Préférez python3 si vous pouvez

- - -
- - diff --git a/site/index.html b/site/index.html index 40ba759585511bd0a09209bc78d869274ed0a545..0eb8352451bf27b33349f033e8fb3827e9450c88 100644 --- a/site/index.html +++ b/site/index.html @@ -3,169 +3,156 @@ - Don't panic main page - - - + + + -
-
- - -
- - -
-
-

What is dontpanic?

-
-
- -

Dontpanic is a free (as in "freedom") python application to look for any movie or serie and watch them - in "streaming". It looks like popcorntime or torrent time, but doesn't depend of a - centralized api.

- -

Screenshots

- -
-
dontpanic1-thumb.jpg
-
dontpanic2-thumb.jpg
-
dontpanic3-thumb.jpg
-
-
-
dontpanic5-thumb.jpg
-
dontpanic7-thumb.jpg
-
dontpanic6-thumb.jpg
-
+ + +

+ + + +

+ +
+

What is dontpanic?

-

Usage

+

Dontpanic is a free (as in "freedom") python application to look for any movie or serie and watch them + in "streaming". It looks like popcorntime or torrent time, but doesn't depend of a + centralized api.

-

You can run dontpanic for a single user with the command dontpanic or python3 dontpanic.py.
It will open your browser to the dontpanic page.

+

Screenshots

-

Note: You can automatically stream and watch a magnet link if you pass it as a parameter :

-

-    dontpanic magnet:xt=urn:btih:.....
-    
+
+ dontpanic1.png + dontpanic2.png + dontpanic3.png + dontpanic5.png + dontpanic7.png + dontpanic6.png +
+

Usage

-

Deploy on a server

+

You can run dontpanic for a single user with the command dontpanic or python3 dontpanic.py.
It will open your browser to the dontpanic page.

-

You can run dontpanic on your server and make it available for world. To - do so, you have to use an adapter like cherrypy.

+

Note: You can automatically stream and watch a magnet link if you pass it as a parameter :

+
dontpanic magnet:xt=urn:btih:.....
+		
-
./dontpanic -adapter administrator admin_password
-    
-

or

+

Deploy on a server

-
python3 dontpanic-server.py -adapter administrator admin_password
-    
+

You can run dontpanic on your server and make it available for world. To + do so, you have to use an adapter like cherrypy.

-

Change -adapter to the one you want to use, i.e. -cherrypy. Below, - you can find some adapters (see - here - for a full list):

+
./dontpanic -adapter administrator admin_password
-
    -
  • -cherrypy is multi-threaded (recommended). Install python-cherrypy3 to use it.
  • -
  • -paste is multi-threaded. Instal python-paste to use it.
  • -
  • -tornado : install python-tornado
  • -
  • ...
  • -
+

or

-

You can use -auto to let dontpanic (bottle) choose the first available - adapter.

+
python3 dontpanic-server.py -adapter administrator admin_password
+		
-

Use SSL (https):

+

Change -adapter to the one you want to use, i.e. -cherrypy. Below, + you can find some adapters (see + here + for a full list):

-

To do it correctly, you might want to read your adapter documentation. An easy way is to use apache or nginx as a reverse proxy. - For cherrypy, it's documented here. Below, find a working nginx configuration using ssl with cherrypy :

+
    +
  • -cherrypy is multi-threaded (recommended). Install python-cherrypy3 to use it.
  • +
  • -paste is multi-threaded. Instal python-paste to use it.
  • +
  • -tornado : install python-tornado
  • +
  • ...
  • +
-
upstream apps {
-        server 127.0.0.1:8080;
-    }
+		

You can use -auto to let dontpanic (bottle) choose the first available + adapter.

- gzip_http_version 1.0; - gzip_proxied any; - gzip_min_length 500; - gzip_disable "MSIE [1-6]\."; - gzip_types text/plain text/xml text/css - text/javascript - application/javascript; +

Use SSL (https):

+

To do it correctly, you might want to read your adapter documentation. An easy way is to use apache or nginx as a reverse proxy. + For cherrypy, it's documented here. Below, find a working nginx configuration using ssl with cherrypy :

- server { - listen 80; - server_name localhost; - return 301 https://$server_name$request_uri; # enforce https - } +
upstream apps {
+			server 127.0.0.1:8080;
+		}
 
-    server {
-        listen 443 ssl;
-        server_name  localhost;
+		gzip_http_version 1.0;
+		gzip_proxied      any;
+		gzip_min_length   500;
+		gzip_disable      "MSIE [1-6]\.";
+		gzip_types        text/plain text/xml text/css
+						text/javascript
+						application/javascript;
 
-        ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
-        ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
 
-    location / {
-        proxy_pass         http://apps;
-        proxy_redirect     off;
-        proxy_set_header   Host $host;
-        proxy_set_header   X-Real-IP $remote_addr;
-        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header   X-Forwarded-Host $server_name;
-    }
-    }
-    
+ server { + listen 80; + server_name localhost; + return 301 https://$server_name$request_uri; # enforce https + } -

Of course, replace localhost, 8080 and ssl variables to fit your - configuration.

+ server { + listen 443 ssl; + server_name localhost; -

In this case, dontpanic was started with :

+ ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; -
python dontpanic-server.py -cherrypy admin password 8080
-    
+ location / { + proxy_pass http://apps; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + } + } +
-

Warning

+

Of course, replace localhost, 8080 and ssl variables to fit your + configuration.

-

If you deploy dontpanic on a server, make sure the database is not - readable by world. The database is by default in - ~/.dontpanic/databaz.db. Follow - bottle instructions.

+

In this case, dontpanic was started with :

-

Remember, the admin page is /_admin

+
python dontpanic-server.py -cherrypy admin password 8080
+		
-

FAQ

-

My download doesn't start

+

Warning

-

Be sure to choose a file with a lot of peers.

+

If you deploy dontpanic on a server, make sure the database is not + readable by world. The database is by default in + ~/.dontpanic/databaz.db. Follow + bottle instructions.

-

Creating debian package

+

Remember, the admin page is /_admin

-

To create the debian package, use equivs : equivs-build eqctl.

+

FAQ

+

My download doesn't start

-

Add -f to sign the package.

+

Be sure to choose a file with a lot of peers.

-

Python2 or python3?

-

Both are supported for now

+

Creating debian package

+

To create the debian package, use equivs : equivs-build eqctl.

- -
+

Add -f to sign the package.

+ +

Python2 or python3?

+

Both are supported for now

+
+ + diff --git a/upload_site.sh b/upload_site.sh deleted file mode 100755 index 10916cc93cac477ddbef3d2a58fe82bca5f10e30..0000000000000000000000000000000000000000 --- a/upload_site.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -#Auteur : thuban -#licence : GNU General Public Licence v3 - -PORT=2222 -REP=./site/ -DISTREP=/var/www/htdocs/dontpanic/ - -rsync -e "ssh -C -p $PORT" -avzc --progress \ - --stats $REP/* pi:$DISTREP - -exit -