dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-31 16:31:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix playlist file relative path handling

Browse Source
This commit is contained in:
Rafostar
2020-09-17 13:00:45 +02:00
parent ae766298a8
commit 2225aa2343
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
clapper_src/player.js
View File

@@ -1,4 +1,5 @@
const { Gio, GLib, GObject, Gst, GstPlayer } = imports.gi; const { Gio, GLib, GObject, Gst, GstPlayer } = imports.gi;
const ByteArray = imports.byteArray;
const Debug = imports.clapper_src.debug; const Debug = imports.clapper_src.debug;
const GSTPLAYER_DEFAULTS = { const GSTPLAYER_DEFAULTS = {
@@ -75,20 +76,18 @@ class ClapperPlayer extends GstPlayer.Player
set_media(source) set_media(source)
{ {
if(Gst.uri_is_valid(source)) { if(!Gst.uri_is_valid(source))
debug(`setting source URI: ${source}`); source = Gst.filename_to_uri(source);
if(!source)
return debug('parsing source to URI failed');
debug(`parsed source to URI: ${source}`);
if(Gst.Uri.get_protocol(source) !== 'file')
return this.set_uri(source); return this.set_uri(source);
}
debug(`parsing source: ${source}`); let file = Gio.file_new_for_uri(source);
let uri = Gst.filename_to_uri(source);
if(!uri)
return debug('parsing to URI failed');
debug(`parsed source to URI: ${uri}`);
let file = Gio.file_new_for_uri(uri);
if(!file.query_exists(null)) { if(!file.query_exists(null)) {
debug(`file does not exist: ${source}`, 'LEVEL_WARNING'); debug(`file does not exist: ${source}`, 'LEVEL_WARNING');
@@ -103,7 +102,7 @@ class ClapperPlayer extends GstPlayer.Player
if(file.get_path().endsWith(`.${this.playlist_ext}`)) if(file.get_path().endsWith(`.${this.playlist_ext}`))
return this.load_playlist_file(file); return this.load_playlist_file(file);
this.set_uri(uri); this.set_uri(source);
} }
load_playlist_file(file) load_playlist_file(file)
@@ -111,15 +110,25 @@ class ClapperPlayer extends GstPlayer.Player
let stream = new Gio.DataInputStream({ let stream = new Gio.DataInputStream({
base_stream: file.read(null) base_stream: file.read(null)
}); });
let listdir = file.get_parent();
let playlist = []; let playlist = [];
let line; let line;
while((line = stream.read_line(null)[0])) { while((line = stream.read_line(null)[0])) {
line = String(line).trim(); line = (line instanceof Uint8Array)
? ByteArray.toString(line).trim()
: String(line).trim();
if(!Gst.uri_is_valid(line)) {
let lineFile = listdir.resolve_relative_path(line);
if(!lineFile)
continue;
line = lineFile.get_path();
}
debug(`new playlist item: ${line}`); debug(`new playlist item: ${line}`);
playlist.push(line); playlist.push(line);
} }
stream.close(null); stream.close(null);
this.set_playlist(playlist); this.set_playlist(playlist);
} }