kae/musicmuster
1
0
Fork 0
Code Issues 28 Pull Requests Projects Releases 1 Activity
310 Commits 6 Branches 172 Tags 17 MiB
9c0371d41c
Commit Graph

270 Commits

Author SHA1 Message Date
Keith Edmunds
0836f74d17 Improve 'last played' strings 2021-08-14 23:06:16 +01:00
Keith Edmunds
89d49f3e34 Merge 2021-08-14 18:44:05 +01:00
Keith Edmunds
e813a01e14 Improve track info box 2021-08-14 18:29:29 +01:00
Keith Edmunds
72e3ef69ff Handle files not found in database update 
Fixes #37
Fixes #36
 2021-08-14 18:26:59 +01:00
Keith Edmunds
94e7508a24 Default volume to 75 2021-08-14 12:03:46 +01:00
Keith Edmunds
0e4de857d4 Update last played time during show 
Fixes #43
 2021-08-14 09:05:14 +01:00
Keith Edmunds
4687ef5288 Fix check of whether track is readable 
Fixes #45
Fixes #44
Fixes #42
 2021-08-14 08:20:02 +01:00
Keith Edmunds
f0b59b8d23 Improve track info box. Fixes #46 2021-08-14 08:03:03 +01:00
Keith Edmunds
976beade85 Add debug to troubleshoot issue #38 2021-08-10 18:28:20 +01:00
Keith Edmunds
bc54be237b Check tracks for readability 
Check on load and on setting next track. Also provide info popup that
shows path.
 2021-08-10 08:18:05 +01:00
Keith Edmunds
61e1fb1192 Make last played date 'today' when appropriate 2021-08-08 20:05:26 +01:00
Keith Edmunds
35f2b9629b Only open Wikipedia for songs 2021-08-06 13:39:22 +01:00
Keith Edmunds
a6a0b905d8 Put "last played" in place of "path" in playlist 2021-08-06 10:23:30 +01:00
Keith Edmunds
79f1a6afa3 Set track end time when setting next track. Fixes #33 2021-07-24 17:38:53 +01:00
Keith Edmunds
194306bc1d Order functions alphabetically 2021-07-24 17:29:59 +01:00
Keith Edmunds
4f10ed7bad Normalise mp3's on import 2021-07-15 17:54:34 +01:00
Keith Edmunds
a027cbe776 Greatly improve database update 2021-07-04 19:28:18 +01:00
Keith Edmunds
28396d136f Add ui/.py files to git 2021-07-04 19:28:18 +01:00
Keith Edmunds
6936b24129 Facilitate dev and prod databases - fixes #15 2021-07-04 19:21:28 +01:00
Keith Edmunds
199dada246 Save playlist column widths correctly 2021-07-03 10:15:39 +01:00
Keith Edmunds
8838c23c59 Add end times column. Fixes #24 2021-07-03 10:15:08 +01:00
Keith Edmunds
5b6db24692 Clear fade b/g colour explicity - should fix #25 2021-07-03 09:51:54 +01:00
Keith Edmunds
019e9f6cf3 Warn if leading silence over 500ms. Helps #11 2021-06-12 13:19:33 +01:00
Keith Edmunds
f37c6f3e70 Improve metadata handling; fixes #20 2021-06-12 10:09:32 +01:00
Keith Edmunds
f4efeac36a Relayout buttons. Fixes #21 2021-06-12 09:31:37 +01:00
Keith Edmunds
a89e3cf1c9 Fix ToD clock width - fixes #19 2021-06-12 09:27:38 +01:00
Keith Edmunds
b45fab2855 Better UI info - helps issue #11 
- add status bar message to show whether play controls are enabled
 - add warning background colour to 'fade' box
 2021-06-11 09:29:51 +01:00
Keith Edmunds
8baf01bc60 Added DEBUG statements to investigate issue #11 2021-06-11 09:05:02 +01:00
Keith Edmunds
6e754c1b3a Make music fading more solid - issue #3 2021-06-10 17:55:55 +01:00
Keith Edmunds
a80dc3f165 Select and move (un)played tracks. Fixes #4 2021-06-10 15:24:31 +01:00
Keith Edmunds
73879c6a99 Add locking to music.py 
Ensure nothing interrupts the stop - release - nullify sequence. Also
don't limit how many concurrent fades there can be.
 2021-06-07 20:46:05 +01:00
Keith Edmunds
987db155a1 Tighten up player handling (mitigate for issue #11) 2021-06-06 20:01:28 +01:00
Keith Edmunds
6310dfd5c7 Add DEBUG statements to investigate issue #11 2021-06-06 16:52:12 +01:00
Keith Edmunds
caf78df17f Differentiate between playlist tabs and db objects. Fixes #17 2021-06-06 16:40:36 +01:00
Keith Edmunds
20bd178cf1 Differentiate between playlist tabs and db objects. Fixes #17 2021-06-06 16:40:10 +01:00
Keith Edmunds
37ccf7c325 Fix moving tracks between playlists 2021-06-06 15:57:32 +01:00
Keith Edmunds
823d0b6628 Fix error closing playlist 2021-06-06 14:51:46 +01:00
Keith Edmunds
ec760ca0d4 Allow adding more than one file at a time 2021-06-06 14:48:58 +01:00
Keith Edmunds
0ca9bfec0a Segregate adding notes, tracks to onscreen playlist and database 2021-06-06 14:47:14 +01:00
Keith Edmunds
e14bed34bd Improve repr for mode:Playlists 2021-06-06 14:44:15 +01:00
Keith Edmunds
6677577df5 Wire up Tracks, Stop menu. Fixed #6. 2021-06-06 14:43:27 +01:00
Keith Edmunds
c5f5155332 Remove link to database object from playlist. Fixes #16 2021-06-06 11:36:27 +01:00
Keith Edmunds
e498457395 Add option to force DEBUG message to stderr 
If the default log level for stderr is greater than DEBUG, DEBUG
message won't be shown. The DEBUG(msg) function now takes an optional
Boolean second parameter. If that is True, the DEBUG message is always
sent to stderr.
 2021-06-06 10:50:40 +01:00
Keith Edmunds
dbf0c27a09 Set up session before calling DbDialog. Fixes #13 2021-06-06 10:23:27 +01:00
Keith Edmunds
e1b9dacd34 Enable play controls after fade command 2021-06-05 09:01:03 +01:00
Keith Edmunds
5847345cdd Fix dimming of played tracks 2021-06-04 17:25:59 +01:00
Keith Edmunds
0cf649bb01 More 'detached session' fixes 2021-06-04 16:29:16 +01:00
Keith Edmunds
4bae0b8548 Hugely simplify save_playlist 
Don't try to work out how tracks may have moved. Instead, delete all
track from current playlist and re-add them.
 2021-06-04 15:45:29 +01:00
Keith Edmunds
a4bdbfccd0 Explicitly save playlist id in playlist 2021-06-04 15:44:29 +01:00
Keith Edmunds
52d48406ea Reordered functions in model.Playlists 2021-06-04 15:43:35 +01:00
Keith Edmunds
403313c0dd Add session.commit() when adding track 2021-06-04 14:47:17 +01:00
Keith Edmunds
6efc103ba5 More session fixups 2021-06-04 14:46:59 +01:00
Keith Edmunds
1abe377b4c Workaround for issue #10 2021-06-04 12:38:33 +01:00
Keith Edmunds
9eac5caf09 Separate out sessions. Starts addressing issue #10 
We were creating a session in the "Add from database" dialog, and then
creating another session (with the first still active) in _repaint().

Separated out sessions; also don't call _save_playlist from _repaint
as it doesn't really have any connection.
 2021-06-04 12:37:37 +01:00
Keith Edmunds
70f693a86b Enable play controls on Stop. Fixes #7 2021-06-03 21:11:24 +01:00
Keith Edmunds
ad717aeb2c Fix error inserting note (and track?) above selected row 2021-06-02 08:27:45 +01:00
Keith Edmunds
4984ddec98 Use sessions correctly (fixes #5) 2021-06-02 08:26:54 +01:00
Keith Edmunds
caa13b6693 Update database when playlist closed. Fixes #8 2021-06-01 21:20:32 +01:00
Keith Edmunds
326dc3655e Remove superfluous print statement 2021-06-01 18:32:32 +01:00
Keith Edmunds
4a24640666 Select next/previous non-note row with j/k 2021-05-31 12:08:50 +01:00
Keith Edmunds
0c67ba7b3e Add ^N to set next track 2021-05-31 11:24:14 +01:00
Keith Edmunds
453fe87bf9 Co-ordinate right-click play next - Fixes #2 2021-05-30 21:51:23 +01:00
Keith Edmunds
b10e729627 Hopefully addressing segfault in issue #3 2021-05-30 21:50:02 +01:00
Keith Edmunds
8366fed1be Fix no path being shown in playlist 2021-05-30 20:02:31 +01:00
Keith Edmunds
5d61b514b5 Remove current track highlighting when track ends 2021-05-30 19:48:26 +01:00
Keith Edmunds
00c9509c12 Have one "info" button for both Songfacts and Wikipedia 2021-05-30 19:46:38 +01:00
Keith Edmunds
5492ad58d5 Explcitly stop player and release it at end of track 2021-05-30 19:30:12 +01:00
Keith Edmunds
97524c201b Remove dummy 2021-05-29 19:36:03 +01:00
Keith Edmunds
98b23d9c48 Testing gitea. Fixes #1 2021-05-29 19:34:30 +01:00
Keith Edmunds
30e3332795 Fix issue #1: Add playlist table headers 2021-05-29 12:55:51 +01:00
Keith Edmunds
a35181bae7 Add Export Playist 2021-05-28 11:33:24 +01:00
Keith Edmunds
280e966f01 Fix bug where next track wasn't highlighted 2021-05-27 19:57:23 +01:00
Keith Edmunds
b7861ffcf9 Preserve tags on normalise; output time to stdout logs 2021-05-27 16:15:14 +01:00
Keith Edmunds
21c7b234fb Fix adding a new note 2021-05-26 21:19:09 +01:00
Keith Edmunds
0465fb45c4 Move tracks between playlists 2021-05-16 22:56:11 +01:00
Keith Edmunds
997627582f Ensure playlists are marked as open in db 2021-05-16 22:54:36 +01:00
Keith Edmunds
eedd898df9 Improve Add from Database dialog 
- remember size of dialog box
 - show path of selected entry
 2021-05-16 15:12:15 +01:00
Keith Edmunds
51cc3bfbca Add database reference to playlist 
Also lots of cleaning up so that headers and playlist track colours
correct follow which playlist has the current/next track.
 2021-05-16 12:39:19 +01:00
Keith Edmunds
ca9d0c75f8 proof of concept 2021-05-04 19:32:39 +01:00
Keith Edmunds
88e7ef2bca Update connection string and requirements.txt 2021-05-04 18:11:28 +01:00
Keith Edmunds
cc273f305b update requirements 2021-05-03 17:01:49 +01:00
Keith Edmunds
ffef3cd1c7 Close playlists; refine opening playlists 2021-05-02 23:35:00 +01:00
Keith Edmunds
ada25eaa26 Set default volume 2021-05-02 23:34:03 +01:00
Keith Edmunds
551319bb59 Wikipedia and Songsearch icons 2021-05-02 16:58:06 +01:00
Keith Edmunds
dc4b8dafd7 Add icons to Wikipedia and Songsearch buttons 2021-05-02 16:57:25 +01:00
Keith Edmunds
f54955c43a Clear current track header at end of track 2021-05-02 16:55:59 +01:00
Keith Edmunds
1c9c82cc1c Add rescan_database function 2021-05-02 16:11:08 +01:00
Keith Edmunds
cc9b168e81 Add buttons for Wikipedia and Songfacts 2021-05-02 16:10:44 +01:00
Keith Edmunds
74eac83c82 Add Wikipedia and Songfacts buttons 2021-05-02 10:36:25 +01:00
Keith Edmunds
ca995c8794 Change playlist menu names 2021-05-02 09:04:34 +01:00
Keith Edmunds
90b322f282 Scroll current track to centre of screen when played 2021-04-30 02:55:54 +01:00
Keith Edmunds
858bf4392e Display uncaught exceptions red on white 2021-04-30 02:48:06 +01:00
Keith Edmunds
51b2dd43e5 Tabbed playlists working 2021-04-29 22:20:24 +01:00
Keith Edmunds
4d852f7a4e Tabbed playlist proof-of-concept (via menu Test) 2021-04-27 18:34:03 +01:00
Keith Edmunds
e086dd35c6 Improve behaviour of select playlist dialog 2021-04-25 18:39:47 +01:00
Keith Edmunds
839f550e4a Rewrite of save_playlist (extensive) 2021-04-25 17:23:36 +01:00
Keith Edmunds
d113b9fc20 Name internal functions with underscore in playlists.py 2021-04-25 09:44:32 +01:00
Keith Edmunds
b2fe5f6f38 Maintain track headers when changing playlists 2021-04-25 00:04:01 +01:00
Keith Edmunds
d157dbd7c0 Check next track is readable 2021-04-25 00:02:41 +01:00
Keith Edmunds
4f4e81ab75 Use one master VLC instance 2021-04-25 00:01:32 +01:00
Keith Edmunds
2e41a673f4 Normalise tracks on import 2021-04-24 19:35:10 +01:00
Keith Edmunds
7fb76417d0 Fix showing track start times 2021-04-21 08:40:30 +01:00
Keith Edmunds
f452362c2a Add volume and stop, improve fading 2021-04-21 08:39:49 +01:00
Keith Edmunds
1c078a2d69 Show track start times rather than end times 2021-04-19 22:22:02 +01:00
Keith Edmunds
04f5a07c3e Better DEBUG messages 2021-04-19 21:01:27 +01:00
Keith Edmunds
2d80e20d5b New layout 2021-04-19 21:01:09 +01:00
Keith Edmunds
2f991da6ea Handle window closes better 2021-04-19 21:00:38 +01:00
Keith Edmunds
c5917b9df4 Bugfix: music.playing() sometimes wrongly returned False 2021-04-19 20:55:16 +01:00
Keith Edmunds
bb4d1d466c Rework buttons for main window 2021-04-19 07:53:39 +01:00
Keith Edmunds
c9c7331bb2 Use Python 3.8 f strings for DEBUG log 2021-04-16 06:06:08 +01:00
Keith Edmunds
3bcf66d036 Use env to find Python 2021-04-16 06:04:56 +01:00
Keith Edmunds
f049f410fc Enable play controls after fading a track 2021-04-12 18:56:20 +01:00
Keith Edmunds
b4079c2b13 Allow configuration of max VLC volume 2021-04-12 18:55:41 +01:00
Keith Edmunds
00fbfa334e Ensure tracks are visible when added to playlist 2021-04-11 15:40:01 +01:00
Keith Edmunds
0c041d0bf6 Improve detecting when track is playing. 2021-04-11 15:24:06 +01:00
Keith Edmunds
b049f3207d Ensure all rows in playlist are updated. 2021-04-11 15:13:39 +01:00
Keith Edmunds
958c3a8086 Yet another colour for notes 2021-04-11 15:12:57 +01:00
Keith Edmunds
36816c6d96 Tweak note colour 2021-04-10 23:27:42 +01:00
Keith Edmunds
3f7cac07e3 Bug fix: inserting timed note didn't refresh times 2021-04-10 23:12:01 +01:00
Keith Edmunds
5d65bebd1e Cleaned up save_playlist(); improved DEBUG logging. 2021-04-10 19:57:51 +01:00
Keith Edmunds
f61c6fd74f Implement deleting of notes 2021-04-10 17:45:54 +01:00
Keith Edmunds
830c88cc33 Add Config.TESTMODE 2021-04-10 17:21:27 +01:00
Keith Edmunds
62f6775e90 Let notes have times 2021-04-10 17:20:09 +01:00
Keith Edmunds
79b3071170 Improve appearance of buttons bottom right 2021-04-10 15:06:21 +01:00
Keith Edmunds
6adaa844e1 Change notes color to bootstrap bg-info 2021-04-10 13:58:55 +01:00
Keith Edmunds
00ebcb09ea Implement test menu and functions 2021-04-10 13:54:04 +01:00
Keith Edmunds
0a09be839d Don't allow program to quit whilst playing track. 2021-04-10 12:58:59 +01:00
Keith Edmunds
8d3c989c18 Keep row selection when adding tracks/notes 2021-04-10 12:54:32 +01:00
Keith Edmunds
2d247db543 Correctly handle determining whether a playlist row is selected. 2021-04-10 12:54:08 +01:00
Keith Edmunds
9ee5730b14 Fix up add from database dialog 2021-04-10 12:25:21 +01:00
Keith Edmunds
301bee4ba5 Reinstate row spanning after note move 2021-04-10 11:25:36 +01:00
Keith Edmunds
b3e3e503ca Improve adding tracks to end of playlist 2021-04-10 11:24:41 +01:00
Keith Edmunds
f550c8944f More DEBUG message improvements 2021-04-10 11:24:01 +01:00
Keith Edmunds
69ba659d73 Improve DEBUG messages 2021-04-10 11:22:34 +01:00
Keith Edmunds
ee0bfceeae Code review for V1.0.0 2021-04-09 23:21:42 +01:00
Keith Edmunds
eff7d0aca9 Log uncaught exceptions 2021-04-08 18:31:30 +01:00
Keith Edmunds
9068f46d40 Add file to db and playlist 2021-04-08 07:38:10 +01:00
Keith Edmunds
67b3b804e1 Playlist creation and changing fragilely working 2021-04-07 22:07:53 +01:00
Keith Edmunds
15a540234e Update headers as part of repaint 2021-04-06 23:57:20 +01:00
Keith Edmunds
5dc3575ce3 Implement right click delete 2021-04-06 23:51:47 +01:00
Keith Edmunds
4ebce12e81 Use resources for button icons 2021-04-06 19:06:42 +01:00
Keith Edmunds
5a446919e3 Store playlist order; allow reordering and save 2021-04-06 16:40:54 +01:00
Keith Edmunds
6d6327ae18 Efficient database updating 2021-04-05 13:20:28 +01:00
Keith Edmunds
8ccded2a57 Can add notes, not saved to db 2021-04-04 23:25:31 +01:00
Keith Edmunds
8f749fa78d Add stop command; some refactoring 2021-04-04 22:17:09 +01:00
Keith Edmunds
8cdeb3d1a9 Implement end times in playlist 2021-04-04 21:50:20 +01:00
Keith Edmunds
233cce7800 Headers, timer colours, all looking good 2021-04-04 19:49:33 +01:00
Keith Edmunds
ba9b9cc936 Dim played tracks 2021-04-04 13:25:55 +01:00
Keith Edmunds
dadd251587 Refactoring mostly done; manage playlist metadata 2021-04-04 12:57:43 +01:00
Keith Edmunds
bcfd076a93 Refactor into modules 2021-04-03 22:45:30 +01:00