free
/
freedombone
Прати 1
Волим 0
Креирај огранак 0
Код Дискусије 0 Захтеви за спајање 0 Издања 0 Вики Activity
Преглед изворни кода

Deprecate menu option to import from youtube to peertube 

It doesn't appear to work reliably
Bob Mottram пре 6 година
родитељ
5440f603ea
комит
adeadb3003
3 измењених фајлова са 4 додато и 24 уклоњено
Подељен поглед Покажи статистику Diff
  1. 0
    5
      doc/EN/app_peertube.org
  2. 2
    4
      src/freedombone-app-peertube
  3. 2
    15
      website/EN/app_peertube.html

+ 0
- 5
doc/EN/app_peertube.org Прегледај датотеку 

@@ -32,11 +32,6 @@ Navigate to your site and select *Signup* to create a new account. By default th
32 32
33 33 
 If you wish it's possible to turn off further signups via the *Administrator control panel* under *App settings* for *peertube*.
34 34
35 
-* Importing videos from YouTube/Vimeo/Dailymotion
36 
-It's possible to import videos from the main proprietary video hosting sites. /Only do this if they're videos which you made, or if the license is Creative Commons/. Hosting arbitrary videos under nonfree licenses is likely to get you into trouble, and we know how that works out from the P2P wars of the 2000s (i.e. badly).
37 
-
38 
-Go to the *Administrator control panel*, select *App settings* then *peertube* then *Import videos from YouTube/Vimeo/Dailymotion*. Enter your PeerTube login details and then you may specify either the individual video URL or the channel URL if you want to import a whole channel.
39 
-
40 35 
 * Importing videos from your desktop
41 36 
 The most convenient way to add new videos to PeerTube is if you have the *syncthing* app installed. Set up [[./app_syncthing.html][syncthing]] with a folder called ~/Sync in your home directory. Create a subdirectory called *~/Sync/peertube_upload*. Within that directory make a text file called *login.txt*. This will contain your PeerTube login details.
42 37

+ 2
- 4
src/freedombone-app-peertube Прегледај датотеку 

@@ -389,8 +389,7 @@ function peertube_import_videos {
389 389 
 function configure_interactive_peertube {
390 390 
     W=(1 $"Set administrator email address"
391 391 
        2 $"Disable or enable signups"
392 
-       3 $"Import videos from YouTube/Vimeo/Dailymotion"
393 
-       4 $"Import video from file")
392 
+       3 $"Import video from file")
394 393
395 394 
     while true
396 395 
     do
 
@@ -404,8 +403,7 @@ function configure_interactive_peertube {
404 403 
         case $selection in
405 404 
             1) peertube_set_admin_email;;
406 405 
             2) peertube_disable_signups;;
407 
-            3) peertube_import_videos;;
408 
-            4) peertube_import_from_file;;
406 
+            3) peertube_import_from_file;;
409 407 
         esac
410 408 
     done
411 409 
 }

+ 2
- 15
website/EN/app_peertube.html Прегледај датотеку 

@@ -4,7 +4,7 @@
4 4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5 
 <head>
6 6 
 <title></title>
7 
-<!-- 2018-06-21 Thu 10:27 -->
7 
+<!-- 2018-06-21 Thu 12:45 -->
8 8 
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
9 9 
 <meta  name="generator" content="Org-mode" />
10 10 
 <meta  name="author" content="Bob Mottram" />
 
@@ -202,22 +202,9 @@ If you wish it's possible to turn off further signups via the <b>Administrator c
202 202 
 </div>
203 203
204 204 
 <div id="outline-container-sec-3" class="outline-2">
205 
-<h2 id="sec-3">Importing videos from YouTube/Vimeo/Dailymotion</h2>
205 
+<h2 id="sec-3">Importing videos from your desktop</h2>
206 206 
 <div class="outline-text-2" id="text-3">
207 207 
 <p>
208 
-It's possible to import videos from the main proprietary video hosting sites. <i>Only do this if they're videos which you made, or if the license is Creative Commons</i>. Hosting arbitrary videos under nonfree licenses is likely to get you into trouble, and we know how that works out from the P2P wars of the 2000s (i.e. badly).
209 
-</p>
210 
-
211 
-<p>
212 
-Go to the <b>Administrator control panel</b>, select <b>App settings</b> then <b>peertube</b> then <b>Import videos from YouTube/Vimeo/Dailymotion</b>. Enter your PeerTube login details and then you may specify either the individual video URL or the channel URL if you want to import a whole channel.
213 
-</p>
214 
-</div>
215 
-</div>
216 
-
217 
-<div id="outline-container-sec-4" class="outline-2">
218 
-<h2 id="sec-4">Importing videos from your desktop</h2>
219 
-<div class="outline-text-2" id="text-4">
220 
-<p>
221 208 
 The most convenient way to add new videos to PeerTube is if you have the <b>syncthing</b> app installed. Set up <a href="./app_syncthing.html">syncthing</a> with a folder called ~/Sync in your home directory. Create a subdirectory called <b>~/Sync/peertube_upload</b>. Within that directory make a text file called <b>login.txt</b>. This will contain your PeerTube login details.
222 209 
 </p>
223 210