Commit Graph

386 Commits

Author SHA1 Message Date
Keith Edmunds
61311f67fe Implement musicuster --check-database 2022-08-15 15:59:34 +01:00
Keith Edmunds
92bdf216ca Remove unused code 2022-08-15 14:19:56 +01:00
Keith Edmunds
73e728177e Import track working 2022-08-15 14:16:46 +01:00
Keith Edmunds
3b4cf5320d Remove unused code 2022-08-15 12:45:45 +01:00
Keith Edmunds
d5950ab29a Move selected / move unplayed working 2022-08-15 12:29:36 +01:00
Keith Edmunds
dcc84e0df1 Move selected working 2022-08-15 09:31:30 +01:00
Keith Edmunds
49bef912d2 Refactor playlist searching 2022-08-15 09:10:26 +01:00
Keith Edmunds
23af906d95 Remove all linting errors 2022-08-14 22:33:14 +01:00
Keith Edmunds
ebdb0d0a82 Much improved search now working 2022-08-14 22:19:15 +01:00
Keith Edmunds
56fb1aeb3d Add section header working 2022-08-14 11:01:20 +01:00
Keith Edmunds
dfc1344c69 Insert track working 2022-08-14 10:25:10 +01:00
Keith Edmunds
4d9bf9a36b Hide/show played tracks button working 2022-08-13 16:32:37 +01:00
Keith Edmunds
ce0c3de40d 3dB drop button working 2022-08-13 16:11:55 +01:00
Keith Edmunds
0f8c648d1c Reorder functions alphabetically 2022-08-13 16:05:12 +01:00
Keith Edmunds
a1060d1173 Skip to next working 2022-08-13 15:24:34 +01:00
Keith Edmunds
930efbbe6e Select next/prev row working 2022-08-13 15:21:09 +01:00
Keith Edmunds
cb5eedd8c8 Open playlists working; playlist queries refactored 2022-08-13 14:50:23 +01:00
Keith Edmunds
c7034cf35a Create playlist working 2022-08-13 14:19:08 +01:00
Keith Edmunds
436f6b4fa9 Export playlist working 2022-08-13 13:32:25 +01:00
Keith Edmunds
9485b244f5 Export played tracks csv works 2022-08-13 12:57:37 +01:00
Keith Edmunds
63acc025f9 Close tab works 2022-08-13 12:27:38 +01:00
Keith Edmunds
066b20a571 Close playlist from menubar 2022-08-13 12:03:35 +01:00
Keith Edmunds
568dc1ef68 Don't check Audacity; save splitter position 2022-08-13 11:05:39 +01:00
Keith Edmunds
7d71e8ce64 WIP: clocks working 2022-08-12 21:25:59 +01:00
Keith Edmunds
afc27c988d Move info tabs to below playlist 2022-08-12 11:57:34 +01:00
Keith Edmunds
70c2c18fb3 WIP (working on marking next track) 2022-08-11 14:43:19 +01:00
Keith Edmunds
c8194fad80 WIP: Implement move rows to playlist 2022-08-09 20:33:06 +01:00
Keith Edmunds
99409e8626 Right-click menu mostly working
Still to implement:
 - Move to playlist
 - Remove row
2022-08-07 20:20:56 +01:00
Keith Edmunds
89781c0a94 Revise menu, selected tracks duration summing OK 2022-08-07 16:15:11 +01:00
Keith Edmunds
91841cfc18 Clear drag mode with clear selection 2022-08-07 11:54:18 +01:00
Keith Edmunds
7a14651bd7 Add function type hints. Section headers and note colours working 2022-08-05 21:52:17 +01:00
Keith Edmunds
caed7fd079 SQLA2: sync'd to v2.3.1 2022-07-31 22:22:55 +01:00
Keith Edmunds
ab47bb0ab4 SQLA2.0 playlist column headers display 2022-07-03 20:59:10 +01:00
Keith Edmunds
bef4507ef6 SQLA2.0 rewrote logging 2022-07-03 15:17:25 +01:00
Keith Edmunds
ff2f0d576c SQLA2.0 main window displays 2022-07-02 21:47:42 +01:00
Keith Edmunds
8192e79d42 Make search case insensitive 2022-06-19 13:57:39 +01:00
Keith Edmunds
29860268ba Revise UI; add -3db button
Fixes #55
2022-06-19 13:33:04 +01:00
Keith Edmunds
de3a746806 WIP: button to drop 3db 2022-06-18 19:04:01 +01:00
Keith Edmunds
cc395ea0df Move notes with tracks
Fixes #106
2022-06-18 18:24:09 +01:00
Keith Edmunds
709347db6b WIP: move notes with tracks 2022-06-18 11:09:47 +01:00
Keith Edmunds
42092d3d39 Add 'last played' time to track select from database box
Fixes #116
2022-06-04 23:05:39 +01:00
Keith Edmunds
a8395d8c97 Fix background importing and duplicate checking 2022-06-04 22:32:22 +01:00
Keith Edmunds
c7f7f25af0 Run file import in separate thread 2022-04-19 15:25:15 +01:00
Keith Edmunds
fd0d3e6e1f Move cron jobs to musicmuster.py 2022-04-18 14:53:57 +01:00
Keith Edmunds
70287d15a6 Implement search of playlist 2022-04-17 13:10:21 +01:00
Keith Edmunds
871598efe6 Code cleanup 2022-04-17 11:30:49 +01:00
Keith Edmunds
f143bd7fe9 Rebase from dev 2022-04-17 10:44:15 +01:00
Keith Edmunds
cf7930190e Add ability to download CSV of played tracks.
Fixes #60
2022-04-09 22:08:08 +01:00
Keith Edmunds
fe4b1f8b5e Crude track import 2022-04-05 22:12:05 +01:00
Keith Edmunds
1abee60827 Correct prod pw/allow adding multiple db tracks 2022-04-05 21:23:30 +01:00
Keith Edmunds
558a283e73 Detect music playing better 2022-04-05 21:03:28 +01:00
Keith Edmunds
c5f33c437f Fix moving tracks between playlists 2022-04-04 21:30:31 +01:00
Keith Edmunds
976eb91e30 Fix move selected tracks 2022-03-20 22:40:38 +00:00
Keith Edmunds
ebfdf98612 Polish typing, explicit returns to terminate context managers 2022-03-20 18:56:59 +00:00
Keith Edmunds
ca385dcf54 Remove test function 2022-03-19 23:24:42 +00:00
Keith Edmunds
75b814e26c Session acquisitiong logging 2022-03-19 20:30:14 +00:00
Keith Edmunds
47f53428f6 Session fixes, MSS colour 2022-03-19 20:20:22 +00:00
Keith Edmunds
87f9e1e81b Merge 2022-03-14 20:10:59 +00:00
Keith Edmunds
a31718d2b9 Separate db config, testing session for pytest 2022-03-14 20:10:07 +00:00
Keith Edmunds
a882d409cb Session sanity 2022-03-04 22:59:01 +00:00
Keith Edmunds
2186b3eb09 Record playlist opening and closing
Also fixes #95
2022-03-04 18:55:02 +00:00
Keith Edmunds
9c0371d41c Scroll current row to top; improve session handling 2022-03-04 18:17:57 +00:00
Keith Edmunds
e7004688d0 Add configurable web zoom factor 2022-03-04 16:53:10 +00:00
Keith Edmunds
8c69f108cb Change LH clock box
Fixes #102, #99
2022-03-04 16:01:20 +00:00
Keith Edmunds
1c56505ab0 Fix playlist export 2022-03-03 18:30:00 +00:00
Keith Edmunds
9397adee03 Don't allow active tab to be closed 2022-03-02 22:04:53 +00:00
Keith Edmunds
4a83e9af86 Revamp menus 2022-03-02 21:13:41 +00:00
Keith Edmunds
f22f2780a3 Fix move tracks 2022-03-02 20:37:27 +00:00
Keith Edmunds
08eea631d6 Rebase dev onto v2_id 2022-03-02 09:27:37 +00:00
Keith Edmunds
e8211414f9 V2 using ids rather than objects. Looking good. 2022-03-02 09:27:12 +00:00
Keith Edmunds
bc6a4c11cf Rebase dev onto v2_id 2022-03-02 09:27:10 +00:00
Keith Edmunds
a91309477b Rebase dev onto v2_id 2022-03-02 09:25:59 +00:00
Keith Edmunds
3a7b09f025 Code cleanups 2022-03-02 09:24:40 +00:00
Keith Edmunds
7f2dd68bce Rebase dev onto v2_id 2022-03-02 09:24:35 +00:00
Keith Edmunds
281a1d40bf Rebase dev onto v2_id 2022-03-02 09:23:56 +00:00
Keith Edmunds
cf58932fca Rebase dev onto v2_id 2022-03-02 09:16:07 +00:00
Keith Edmunds
ab9955b88a v2 tidy/refactor 2022-03-02 09:14:52 +00:00
Keith Edmunds
557b89ba09 Refactoring and tests for models complete (for now) 2022-03-02 09:14:52 +00:00
Keith Edmunds
907861ea48 Rebase dev onto v2_id 2022-03-02 09:13:43 +00:00
Keith Edmunds
04c3c2efbc Refactoring 2022-03-02 09:13:11 +00:00
Keith Edmunds
fa2e1234e9 Remove redundant functions and tests 2022-03-02 09:13:11 +00:00
Keith Edmunds
f3bf829ef3 Rebase dev onto v2_id 2022-03-02 09:11:52 +00:00
Keith Edmunds
1a0cac22f6 Added more tests in test_models 2022-03-02 09:11:10 +00:00
Keith Edmunds
a164f4c962 Rebase dev onto v2_id branch 2022-03-02 09:10:46 +00:00
Keith Edmunds
b283a3db07 Warn if colon in track path 2022-02-26 09:26:13 +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
e256ceee0f Fixups from PyCharm 2022-02-05 16:14:10 +00:00
Keith Edmunds
1a16b1022d Implement tab close buttons
Fixes #81
2021-09-29 21:29:20 +01:00
Keith Edmunds
ab858a62fd Fix moving tracks with Wikipedia tabs open
Fixes #77
2021-09-25 22:22:34 +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
8b641cd728 Fix last track going blank
Fixes: #68
2021-09-11 16:53:00 +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
d8072ae73f Remove TODOs from code.
Fixes #57
2021-08-23 09:23:18 +01:00
Keith Edmunds
9dfc5e50cc Improve tagging on rescan 2021-08-22 20:40:13 +01:00
Keith Edmunds
c5f094443a Enable editing with Audacity
Fixes #28
2021-08-22 17:42:31 +01:00
Keith Edmunds
0caf48919c Implement database search by artist
Fixes #31
2021-08-22 09:53:54 +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
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
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
ee74deaa49 Clean up when tracks ends and next track is not immediately played. 2021-08-15 00:20:30 +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
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
35f2b9629b Only open Wikipedia for songs 2021-08-06 13:39:22 +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
f37c6f3e70 Improve metadata handling; fixes #20 2021-06-12 10:09:32 +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
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
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
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
0cf649bb01 More 'detached session' fixes 2021-06-04 16:29:16 +01:00
Keith Edmunds
6efc103ba5 More session fixups 2021-06-04 14:46:59 +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
4984ddec98 Use sessions correctly (fixes #5) 2021-06-02 08:26:54 +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
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
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
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
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
f54955c43a Clear current track header at end of track 2021-05-02 16:55:59 +01:00
Keith Edmunds
cc9b168e81 Add buttons for Wikipedia and Songfacts 2021-05-02 16:10:44 +01:00
Keith Edmunds
ca995c8794 Change playlist menu names 2021-05-02 09:04:34 +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
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
f452362c2a Add volume and stop, improve fading 2021-04-21 08:39:49 +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
bb4d1d466c Rework buttons for main window 2021-04-19 07:53:39 +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
b049f3207d Ensure all rows in playlist are updated. 2021-04-11 15:13:39 +01:00
Keith Edmunds
79b3071170 Improve appearance of buttons bottom right 2021-04-10 15:06:21 +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
ee0bfceeae Code review for V1.0.0 2021-04-09 23:21:42 +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
5dc3575ce3 Implement right click delete 2021-04-06 23:51:47 +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
233cce7800 Headers, timer colours, all looking good 2021-04-04 19:49:33 +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
Keith Edmunds
cf52eb3c9c Playlist drag and drop; track colours 2021-04-02 00:22:29 +01:00
Keith Edmunds
d3b739dc36 Fix fading; lots of tidying! 2021-03-30 19:42:39 +01:00
Keith Edmunds
6643da84b6 Use thread for fading 2021-03-28 22:05:37 +01:00
Keith Edmunds
9bd3a4cf00 Add fade duration 2021-03-28 14:35:51 +01:00
Keith Edmunds
af895ef577 Store playlist in db 2021-03-27 22:41:29 +00:00
Keith Edmunds
ddce8f2391 Remove pytiger; select next track at end 2021-03-27 16:27:48 +00:00
Keith Edmunds
2bd96ad1a6 Make more robust 2021-03-27 13:55:57 +00:00
Keith Edmunds
44a8d30e35 Add TOD clocks 2021-03-27 00:44:24 +00:00
Keith Edmunds
e5037371af Tidying 2021-03-27 00:17:09 +00:00
Keith Edmunds
28143ced6c Counters updating; store full path; round milliseconds 2021-03-26 23:55:53 +00:00
Keith Edmunds
31cf7ca3e6 QTimer added, TOD clock updating 2021-03-26 18:56:43 +00:00
Keith Edmunds
aeda0880dd Play next works 2021-03-26 18:46:08 +00:00
Keith Edmunds
8abf4caf4a Store window size and location 2021-03-26 15:28:59 +00:00
Keith Edmunds
b58b9fc188 Restructure project layout; implement logging 2021-03-26 09:19:04 +00:00