unknown před 4 roky
rodič
revize
a0e05a1d1d

+ 3 - 1
.gitignore

@@ -8,4 +8,6 @@ htmlcov/
 .coverage
 
 /.project
-*.log
+*.log
+
+venv/*

+ 1 - 1
core/constants.py

@@ -9,7 +9,7 @@ MUSIC_FOLDERS = [
 SUPPORTED_EXTENSIONS = ('mp3', 'wma', 'flac')
 
 # VLC
-VLC_PATH = APP_ROOT / 'core' / 'vlc-core'
+VLC_DLL_PATH = APP_ROOT / 'core' / 'vlc-core' / 'libvlc.dll'
 
 DATA_DIR = APP_ROOT / 'data'
 

+ 2 - 1
core/indexer.py

@@ -2,7 +2,7 @@ import time
 from collections import deque
 from threading import Thread, Timer, Event
 
-import vlc
+
 from PyQt5.QtCore import pyqtSignal, QObject
 from path import Path
 
@@ -12,6 +12,7 @@ from core.file_utilities import is_media_file_ext, hash_file
 from core.logging_ import Logger
 from core.models import Track
 from core.repositories import MusicFolderRepository, TrackRepository
+from core.vlc_ import vlc
 
 logger = Logger.get()
 

+ 7 - 0
core/vlc_.py

@@ -0,0 +1,7 @@
+import os
+
+from core import constants
+
+os.environ['PYTHON_VLC_LIB_PATH'] = constants.VLC_DLL_PATH
+if 1:
+    import vlc

binární
data/default/db.sqlite


+ 3 - 0
data/default/settings.yaml

@@ -0,0 +1,3 @@
+muted: false
+playlist: 1
+volume: 50

binární
data/default/youtube/(Ghost) Riders In the Sky (American Outlaws Live at Nassau Coliseum 1990).mp4


+ 1 - 1
ui/qt/widgets/vlcframe.py

@@ -1,7 +1,7 @@
 import time
 from collections import deque
 
-import vlc
+from core.vlc_ import vlc
 from PyQt5 import QtWidgets, QtGui, QtCore
 from PyQt5.QtCore import pyqtSignal
 from PyQt5.QtGui import QIcon

+ 3 - 2
ui/window.py

@@ -208,8 +208,9 @@ class MainWindow(QMainWindow):
         if self.selected_track:
             # refresh tables
             self.refresh_explorer_tree([self.selected_track])
-            self.ui.explorerPlaylist.update()
-            self.ui.sessionPlaylist.update()
+            if self.selected_playlist:
+                self.ui.explorerPlaylist.update()
+                self.ui.sessionPlaylist.update()
 
     def populate_explorer_filter_tags(self):
         tag_repo = TagRepository()