kae/musicmuster
1
0
Fork 0
Code Issues 28 Pull Requests Projects Releases 1 Activity

Add file to db and playlist

Browse Source
This commit is contained in:
Keith Edmunds 2021-04-08 07:38:10 +01:00
parent 67b3b804e1
commit 9068f46d40
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/musicmuster.py
View File

@ -20,6 +20,7 @@ import helpers
from config import Config from config import Config
from model import Settings from model import Settings
from songdb import add_path_to_db
from ui.main_window_ui import Ui_MainWindow from ui.main_window_ui import Ui_MainWindow
@ -81,23 +82,24 @@ class Window(QMainWindow, Ui_MainWindow):
dlg.setNameFilter("Music files (*.flac *.mp3)") dlg.setNameFilter("Music files (*.flac *.mp3)")
if dlg.exec_(): if dlg.exec_():
pass for fname in dlg.selectedFiles():
# TODO Add to database track = add_path_to_db(fname)
# for fname in dlg.selectedFiles():
# trackwest = Track(fname) self.playlist.add_to_playlist(track)
# self.add_to_playlist(track)
def clear_selection(self): def clear_selection(self):
self.playlist.clearSelection() self.playlist.clearSelection()
def connect_signals_slots(self): def connect_signals_slots(self):
self.actionAdd_file.triggered.connect(self.add_file)
self.action_Clear_selection.triggered.connect(self.clear_selection) self.action_Clear_selection.triggered.connect(self.clear_selection)
self.actionFade.triggered.connect(self.fade) self.actionFade.triggered.connect(self.fade)
self.actionNewPlaylist.triggered.connect(self.create_playlist) self.actionNewPlaylist.triggered.connect(self.create_playlist)
self.actionSelectPlaylist.triggered.connect(self.select_playlist)
self.actionPlay_next.triggered.connect(self.play_next) self.actionPlay_next.triggered.connect(self.play_next)
self.actionSearch_database.triggered.connect(self.search_database) self.actionSearch_database.triggered.connect(self.search_database)
self.actionSelectPlaylist.triggered.connect(self.select_playlist)
self.actionSkip_next.triggered.connect(self.play_next) self.actionSkip_next.triggered.connect(self.play_next)
self.btnAddFile.clicked.connect(self.add_file)
self.btnInsertNote.clicked.connect(self.insert_note) self.btnInsertNote.clicked.connect(self.insert_note)
self.btnPrevious.clicked.connect(self.play_previous) self.btnPrevious.clicked.connect(self.play_previous)
self.btnSearchDatabase.clicked.connect(self.search_database) self.btnSearchDatabase.clicked.connect(self.search_database)

8
app/playlists.py
View File

@ -513,11 +513,13 @@ class Playlist(QTableWidget):
start = current_row + 1 start = current_row + 1
else: else:
start = 0 start = 0
notes_rows = self.meta_get_notes()
for row in range(start, self.rowCount()): for row in range(start, self.rowCount()):
if row in notes_rows:
continue
if self.item(row, self.COL_INDEX): if self.item(row, self.COL_INDEX):
if int(self.item(row, self.COL_INDEX).text()) > 0: self.meta_set_next(row)
self.meta_set_next(row) break
break
# Tell database to record it as played # Tell database to record it as played
self.current_track.update_lastplayed() self.current_track.update_lastplayed()

2
app/songdb.py
View File

@ -49,6 +49,8 @@ def add_path_to_db(path):
track.mtime = os.path.getmtime(path) track.mtime = os.path.getmtime(path)
session.commit() session.commit()
return track
def get_audio_segment(path): def get_audio_segment(path):
try: try:

3
app/ui/main_window.ui
View File

@ -803,6 +803,9 @@ border: 1px solid rgb(85, 87, 83);</string>
<property name="text"> <property name="text">
<string>F&amp;ade</string> <string>F&amp;ade</string>
</property> </property>
<property name="shortcut">
<string>Ctrl+S</string>
</property>
</action> </action>
<action name="actionS_top"> <action name="actionS_top">
<property name="icon"> <property name="icon">