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

330 Commits

Author SHA1 Message Date
Keith Edmunds
53899b3a24 Manage note colours from database 2022-02-05 21:32:41 +00:00
Keith Edmunds
1ea2f7b531 Update db correctly when opening/closing playlists. 
Ensures that open playlist dialog box lists playlists
in last-used order.
 2022-02-05 20:40:17 +00:00
Keith Edmunds
441c47bdc2 Improve closing of playist tabs 
Fixes #90
 2022-02-05 20:00:10 +00:00
Keith Edmunds
1de7cefe72 Start configurable note colours 2022-02-05 18:42:35 +00:00
Keith Edmunds
80126440c8 Have notes span all columns 
Fixes #88
 2022-02-05 16:30:52 +00:00
Keith Edmunds
e256ceee0f Fixups from PyCharm 2022-02-05 16:14:10 +00:00
Keith Edmunds
bf2ef70595 Use date, not datetime, to dermine how long ago track was last played. 
Fixes #92.
 2022-02-05 16:11:44 +00:00
Keith Edmunds
62364fdaf1 Don't automatically select previously played tracks 
Fixes #89
 2021-10-17 12:08:13 +01:00
Keith Edmunds
125a44c645 Add 'this month then' note colour 2021-10-16 10:33:32 +01:00
Keith Edmunds
a72a86cfcc Don't prompt for duplicate track on a rescan 
Fixes #87
 2021-10-15 15:02:25 +01:00
Keith Edmunds
1a16b1022d Implement tab close buttons 
Fixes #81
 2021-09-29 21:29:20 +01:00
Keith Edmunds
69fb10fcd9 Make database update check cron-friendly. 
Fixes #85
 2021-09-29 20:55:39 +01:00
Keith Edmunds
1a4f842f1f Set last played time when playing track 
Fixes #83
 2021-09-26 08:47:00 +01:00
Keith Edmunds
69dd0235a0 Improve note colouring 
- Make case insensitive
 - If not starts with key, it's a match

Fixes #71
 2021-09-25 22:33:17 +01:00
Keith Edmunds
ab858a62fd Fix moving tracks with Wikipedia tabs open 
Fixes #77
 2021-09-25 22:22:34 +01:00
Keith Edmunds
01b531aabf Scroll to show moved tracks on drag and drop 
Fixes #75
 2021-09-24 15:10:17 +01:00
Keith Edmunds
6ccfae0ab1 Add note colouring by keyword 
Fixes #71
 2021-09-24 14:58:35 +01:00
Keith Edmunds
9cf9ef9a59 Add ^T shortcut to add note 
Fixes #69
 2021-09-24 14:43:33 +01:00
Keith Edmunds
21fe8fff83 Update track.lastplayed field 
Fixes #78
 2021-09-24 08:05:01 +01:00
Keith Edmunds
780b053219 Check for duplicate title on import 
Fixes #80
 2021-09-23 18:07:28 +01:00
Keith Edmunds
2fbf829eed Show track info when importing track 
Fixes #79
 2021-09-23 17:50:39 +01:00
Keith Edmunds
32fb44439d Change force play next keyboard shortcut 
Now control-alt-return to prevent muscle memory typing control-return

Fixes #76
 2021-09-23 08:08:36 +01:00
Keith Edmunds
8b641cd728 Fix last track going blank 
Fixes: #68
 2021-09-11 16:53:00 +01:00
Keith Edmunds
d5d4361ec5 Further fixes to moving tracks between playlists 
Fixes: #38
 2021-09-10 11:48:30 +01:00
Keith Edmunds
c69aefef92 Save playlist after moving tracks to another list 
Fixes: #38
 2021-09-10 09:25:06 +01:00
Keith Edmunds
b46830f010 Tab text colours implemented 
Fixes #61
 2021-08-24 16:41:50 +01:00
Keith Edmunds
0a4730e5a7 Start implementing coloured text on tabs 2021-08-24 15:13:03 +01:00
Keith Edmunds
e4fe4b576e Clear start/end time for unplayed tracks above current 
Fixes #53
 2021-08-23 19:25:47 +01:00
Keith Edmunds
54cfb1191a Set start correctly when note edited 2021-08-23 15:19:52 +01:00
Keith Edmunds
d8072ae73f Remove TODOs from code. 
Fixes #57
 2021-08-23 09:23:18 +01:00
Keith Edmunds
d2e2144148 Remove inapplicable right-click menu items 2021-08-22 20:40:41 +01:00
Keith Edmunds
9dfc5e50cc Improve tagging on rescan 2021-08-22 20:40:13 +01:00
Keith Edmunds
4267901630 Tweak right-click menu order 2021-08-22 19:13:33 +01:00
Keith Edmunds
c5f094443a Enable editing with Audacity 
Fixes #28
 2021-08-22 17:42:31 +01:00
Keith Edmunds
70d986f4ac Delete multiple rows 
Fixes #22
 2021-08-22 16:42:33 +01:00
Keith Edmunds
d9ccaf7caa Allow in-playist editing of title, artist and notes 
Fixes #27 #23
 2021-08-22 13:52:22 +01:00
Keith Edmunds
d767c879c6 Improve track info dialog box 2021-08-22 13:02:03 +01:00
Keith Edmunds
0caf48919c Implement database search by artist 
Fixes #31
 2021-08-22 09:53:54 +01:00
Keith Edmunds
15ec91e446 Implement track rescanning 
Fixes #29
 2021-08-21 23:34:33 +01:00
Keith Edmunds
04788ef923 Implement copy track path 
Fixes #30
 2021-08-21 22:58:01 +01:00
Keith Edmunds
79f9a49659 Remove debug statement 2021-08-21 22:44:14 +01:00
Keith Edmunds
834ad68e00 Tab info for previous / current / next track 2021-08-21 20:47:55 +01:00
Keith Edmunds
8fa85dd47f Import multiple tracks from command line 2021-08-21 18:14:47 +01:00
Keith Edmunds
ccbe8fdb1b Import tracks from command line 
songdb.py -i FILENAME
 2021-08-21 16:46:37 +01:00
Keith Edmunds
762a41bec6 Add total time of selected tracks to status bar 2021-08-21 14:22:55 +01:00
Keith Edmunds
7ed7730574 Clean up timers when track ends 2021-08-15 17:03:19 +01:00
Keith Edmunds
0e3e30391b Don't grow window when track title too long 
Use an elided text box, set wrapping and max height for label.

Fixes #26
 2021-08-15 16:03:48 +01:00
Keith Edmunds
246b0d4915 Improve full database update sanity check 2021-08-15 13:04:30 +01:00
Keith Edmunds
fcf4ba3eb9 Implement full database scan 2021-08-15 12:52:50 +01:00
Keith Edmunds
a7d9252619 Move Fade button to right of Stop 
Fixes #50
 2021-08-15 11:22:35 +01:00
Keith Edmunds
d4f542cc29 Warn when trying to delete playing or next track 2021-08-15 11:17:09 +01:00
Keith Edmunds
2c9f041838 Show last track in playlist as playing when it is 
Fixes #52
 2021-08-15 11:06:08 +01:00
Keith Edmunds
90a8209551 Clean up of musicmuster.py 2021-08-15 10:40:28 +01:00
Keith Edmunds
c0752407b9 Handle next track not found consistently 
Highlight in red, don't set as next track.
Fixes #51
 2021-08-15 10:13:42 +01:00
Keith Edmunds
87fb74b14f Tidy up model.py 2021-08-15 09:21:32 +01:00
Keith Edmunds
ee74deaa49 Clean up when tracks ends and next track is not immediately played. 2021-08-15 00:20:30 +01:00
Keith Edmunds
00cae6dc52 Fix up silence detection from last commit 2021-08-15 00:03:52 +01:00
Keith Edmunds
11e3536801 Emit INFO message during database scan 2021-08-14 23:53:43 +01:00
Keith Edmunds
427afee8da Change algorithm to detect fade point 2021-08-14 23:52:31 +01:00
Keith Edmunds
b4da349a8c Remove unused function last_show() 2021-08-14 23:07:30 +01:00
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