djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

space to comma separation

Browse Source
This commit is contained in:
Jonathan Baecker 2020-07-06 11:55:30 +02:00
parent 7b10df10fb
commit 9993a1e6d7
6 changed files with 1759 additions and 3530 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/db_data.json
View File

@ -7,7 +7,7 @@
"playout_config": "/etc/ffplayout/ffplayout.yml",
"net_interface": "lo",
"media_disk": "/",
"extra_extensions": ".jpg .jpeg .png"
"extra_extensions": ".jpg,.jpeg,.png"
}
}, {
"model": "api_player.messengepresets",

6
ffplayout/apps/api_player/utils.py
View File

@ -6,14 +6,14 @@ from platform import uname
from subprocess import PIPE, STDOUT, run
from time import sleep
import psutil
from pymediainfo import MediaInfo
import psutil
import yaml
import zmq
from apps.api_player.models import GuiSettings
from django.conf import settings
from natsort import natsorted
from pymediainfo import MediaInfo
def read_yaml():
@ -295,7 +295,7 @@ def get_path(input):
def get_media_path(extensions, _dir=''):
config = read_yaml()
media_folder = config['storage']['path']
extensions = extensions.split(' ')
extensions = extensions.split(',')
playout_extensions = config['storage']['extensions']
gui_extensions = [x for x in extensions if x not in playout_extensions]
media_root, search_dir = get_path(_dir)

5267
ffplayout/frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
ffplayout/frontend/pages/media.vue
View File

@ -171,7 +171,7 @@
:placeholder="inputPlaceholder"
drop-placeholder="Drop files here..."
multiple
:accept="extensions.replace(/ /g, ', ')"
:accept="extensions.replace(/,/g, ', ')"
:file-name-formatter="formatNames"
/>
<b-row>
@ -296,7 +296,7 @@ export default {
},
created () {
this.extensions = [...this.configPlayout.storage.extensions, ...this.configGui.extra_extensions].join(' ')
this.extensions = [...this.configPlayout.storage.extensions, ...this.configGui.extra_extensions].join(',')
this.getPath(this.extensions, '')
},

2
ffplayout/frontend/pages/player.vue
View File

@ -337,7 +337,7 @@ export default {
async created () {
await this.getStatus()
this.extensions = this.configPlayout.storage.extensions.join(' ')
this.extensions = this.configPlayout.storage.extensions.join(',')
await this.getPath(this.extensions, '')

4
ffplayout/frontend/store/config.js
View File

@ -48,7 +48,7 @@ export const actions = {
}
if (response.data && response.data[0]) {
if (response.data[0].extra_extensions) {
response.data[0].extra_extensions = response.data[0].extra_extensions.split(' ')
response.data[0].extra_extensions = response.data[0].extra_extensions.split(',')
} else {
response.data[0].extra_extensions = []
}
@ -68,7 +68,7 @@ export const actions = {
async setGuiConfig ({ commit, state }, obj) {
const stringObj = JSON.parse(JSON.stringify(obj))
stringObj.extra_extensions = obj.extra_extensions.join(' ')
stringObj.extra_extensions = obj.extra_extensions.join(',')
let response
if (state.configPlayout.length === 0) {