diff --git a/src/freedombone-installer b/src/freedombone-installer
index 5bbbcfcb689ea4535f4d6fe054c9a2ba43ae4ef6..9c0f1c97d705738296b1cc683ca34b2bece8d626 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -81,6 +81,7 @@ theme_file="$webadmin_install_dir/.theme.txt"
translations_import_file="$webadmin_install_dir/.translations_import.txt"
icecast_file="$webadmin_install_dir/.icecast.txt"
koel_file="$webadmin_install_dir/.koel.txt"
+dlna_file="$webadmin_install_dir/.dlna.txt"
datlinks_file="$webadmin_install_dir/.datlinks.txt"
settings_updates_file="$webadmin_install_dir/.settingsupdates.txt"
ssh_file="$webadmin_install_dir/.ssh.txt"
@@ -2250,6 +2251,65 @@ function update_koel {
fi
}
+function update_dlna {
+ if [ -f "$dlna_file" ]; then
+ if [ ! -f /etc/minidlna.conf ]; then
+ dlna_usb_drive=$(detect_connected_drives)
+ if [ "$dlna_usb_drive" ]; then
+ backup_mount_drive "$dlna_usb_drive"
+ if [ $backup_drive_mounted ]; then
+
+ # music
+ dlna_import_dir="$USB_MOUNT/Music"
+ if [ ! -d "$dlna_import_dir" ]; then
+ dlna_import_dir="$USB_MOUNT/music"
+ fi
+ if [ -d "$dlna_import_dir" ]; then
+ cp -ru "$dlna_import_dir/"* /music
+ chown -R minidlna:minidlna /music
+ fi
+
+ # pictures
+ dlna_import_dir="$USB_MOUNT/Pictures"
+ if [ ! -d "$dlna_import_dir" ]; then
+ dlna_import_dir="$USB_MOUNT/pictures"
+ fi
+ if [ ! -d "$dlna_import_dir" ]; then
+ dlna_import_dir="$USB_MOUNT/Photos"
+ fi
+ if [ ! -d "$dlna_import_dir" ]; then
+ dlna_import_dir="$USB_MOUNT/photos"
+ fi
+ if [ ! -d "$dlna_import_dir" ]; then
+ dlna_import_dir="$USB_MOUNT/DCIM"
+ fi
+ if [ -d "$dlna_import_dir" ]; then
+ cp -ru "$dlna_import_dir/"* /pictures
+ chown -R minidlna:minidlna /pictures
+ fi
+
+ # videos
+ dlna_import_dir="$USB_MOUNT/Videos"
+ if [ ! -d "$dlna_import_dir" ]; then
+ dlna_import_dir="$USB_MOUNT/videos"
+ fi
+ if [ -d "$dlna_import_dir" ]; then
+ cp -ru "$dlna_import_dir/"* /videos
+ chown -R minidlna:minidlna /videos
+ fi
+
+ backup_unmount_drive
+
+ systemctl restart minidlna
+ minidlnad -R
+ fi
+ fi
+ fi
+
+ rm "$dlna_file"
+ fi
+}
+
function update_smolrss {
if [ -f "$smolrss_file" ]; then
@@ -3239,6 +3299,7 @@ do
update_smolrss
update_icecast
update_koel
+ update_dlna
update_dat_links
update_email_proxy
import_translations
diff --git a/webadmin/EN/dlna_updating.html b/webadmin/EN/dlna_updating.html
new file mode 100644
index 0000000000000000000000000000000000000000..d6e4d4183b4a1a886a23164f1cf797e40b751bc8
--- /dev/null
+++ b/webadmin/EN/dlna_updating.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang="en">
+ <meta charset="utf-8">
+ <head>
+ <style>
+ body {
+ margin: 0;
+ font-family: Arial;
+ background-color: white;
+ color: black;
+ }
+
+ #headerpic {
+ width: 60%;
+ height: auto;
+ margin-right : auto;
+ margin-left : auto;
+ min-width : 220px;
+ }
+
+ .header {
+ text-align: center;
+ padding: 32px;
+ }
+
+ #iconpic {
+ width: 20%;
+ height: auto;
+ margin-right : auto;
+ margin-left : auto;
+ min-width : 120px;
+ }
+
+ .appurl {
+ color: grey;
+ font-size: 100%;
+ }
+
+ .appdesc {
+ font-size: 65%;
+ }
+
+ button {
+ border: none;
+ outline: 0;
+ display: inline-block;
+ padding: 8px;
+ color: white;
+ background-color: #000;
+ text-align: center;
+ cursor: pointer;
+ width: 100%;
+ font-size: 18px;
+ }
+
+ a {
+ text-decoration: none;
+ }
+
+ button:hover, a:hover {
+ opacity: 0.7;
+ }
+
+ </style>
+ </head>
+ <body>
+ <div class="header">
+ <a href="app_dlna.html" title="Go Back"><img id="headerpic" class="img-responsive" src="images/logo.png" alt="Go Back"></a>
+
+ <h3 translate="yes">dlna is updating</h3>
+
+ <p translate="yes">Media will be available on DLNA supporting devices on your local network</p>
+
+ <br>
+
+ <form action="app_dlna.html">
+ <input type="submit" translate="yes" value="Go Back" />
+ </form>
+ </div>
+
+ </body>
+</html>
diff --git a/webadmin/EN/settings_dlna.html b/webadmin/EN/settings_dlna.html
new file mode 100644
index 0000000000000000000000000000000000000000..e067e77101afb2faec63e35e15ce2c4513eb2d55
--- /dev/null
+++ b/webadmin/EN/settings_dlna.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <style>
+ body {
+ margin: 0;
+ font-family: Arial;
+ background-color: white;
+ color: black;
+ }
+
+ * {
+ box-sizing: border-box;
+ }
+
+ a, u {
+ text-decoration: none;
+ color: #72a7cf;
+ font-weight: bold;
+ }
+
+ a:visited{
+ color: #72a7cf;
+ font-weight: bold;
+ }
+
+ #headerpic {
+ width: 60%;
+ height: auto;
+ margin-right : auto;
+ margin-left : auto;
+ min-width : 220px;
+ }
+
+ .header {
+ text-align: center;
+ padding: 32px;
+ }
+
+ .headertext {
+ color: #72a7cf;
+ text-align: center;
+ font-size: 120%;
+ font-weight: bold;
+ }
+ .settingtext {
+ text-align: center;
+ font-size: 100%;
+ }
+
+ .row {
+ display: -ms-flexbox;
+ display: flex;
+ -ms-flex-wrap: wrap;
+ flex-wrap: wrap;
+ padding: 0 4px;
+ }
+
+ .column {
+ -ms-flex: 25%;
+ flex: 15%;
+ max-width: 25%;
+ padding: 0 4px;
+ }
+
+ .column img {
+ margin-top: 8px;
+ vertical-align: middle;
+ }
+
+ .card {
+ box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
+ max-width: 600px;
+ margin: auto;
+ text-align: center;
+ font-family: arial;
+ clear: both;
+ }
+
+ .card input[type=text] {
+ width: 100%;
+ clear: both;
+ text-align: center;
+ color: black;
+ background-color: lightblue;
+ }
+
+ </style>
+ </head>
+ <body>
+
+ <div class="card">
+ <div class="header">
+ <a href="settings_dlna.html" title="Go Back"><img id="headerpic" class="img-responsive" src="images/logo.png" alt="Go Back"></a>
+
+ <p class="headertext" translate="no">dlna</p>
+
+ <p class="settingtext" translate="yes">To add music copy it to a directory called Music on a USB drive then plug it into your server and select Update</p>
+
+ <br>
+
+ <form action="settings_dlna.php" method="post">
+ <input type="submit" name="submitdlnacancel" translate="yes" value="Cancel" />
+ <input type="submit" name="submitdlna" translate="yes" value="Update" />
+ </form>
+
+ </div>
+ </div>
+
+ </body>
+</html>
diff --git a/webadmin/settings_dlna.php b/webadmin/settings_dlna.php
new file mode 100755
index 0000000000000000000000000000000000000000..91203df4f4c33d30cabada1bbab3847e3a5e7122
--- /dev/null
+++ b/webadmin/settings_dlna.php
@@ -0,0 +1,19 @@
+<?php
+
+// Update music for DLNA
+
+$output_filename = "app_dlna.html";
+
+if (isset($_POST['submitdlna'])) {
+ $dlna_file = fopen(".dlna.txt", "w") or die("Unable to write to dlna file");
+ fwrite($dlna_file, ' ');
+ fclose($dlna_file);
+
+ $output_filename = "dlna_updating.html";
+}
+
+$htmlfile = fopen("$output_filename", "r") or die("Unable to open $output_filename");
+echo fread($htmlfile,filesize("$output_filename"));
+fclose($htmlfile);
+
+?>