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

722 Commits

Author SHA1 Message Date
Keith Edmunds
4af1d4906c Never hide current or next row 2023-03-07 18:02:00 +00:00
Keith Edmunds
ea5e4a2215 Fix merge error 2023-03-05 20:23:43 +00:00
Keith Edmunds
e80a74cc40 Fixup track start/end times 2023-03-05 20:21:27 +00:00
Keith Edmunds
d92612c69a Tidy up when track start/stop times are recalculated 2023-03-05 20:19:40 +00:00
Keith Edmunds
b1841b02ea WIP playlists refactor: set header colour when removing track 2023-03-05 20:05:04 +00:00
Keith Edmunds
c5f89dbcf4 WIP playlists refactor: unify note and tab colour settings 2023-03-05 19:44:13 +00:00
Keith Edmunds
0978e93ee7 WIP: playlists refactor: fixup context menu 2023-03-05 14:36:01 +00:00
Keith Edmunds
15f4bec197 WIP: playlists refactoring 2023-03-05 14:31:30 +00:00
Keith Edmunds
530ee60015 WIP: playlists.py refactoring 2023-03-04 23:02:21 +00:00
Keith Edmunds
4a6ce3b4ee WIP: playists refactor: fix rescan 2023-03-01 20:27:17 +00:00
Keith Edmunds
9d3743ceb5 Update section timer and end of section note 2023-02-28 21:27:48 +00:00
Keith Edmunds
bc06722633 Launch Wikipedia on select vis singleShot timer 2023-02-28 21:27:20 +00:00
Keith Edmunds
aa3388f732 WIP: playlist refactor: section timings 2023-02-28 20:46:22 +00:00
Keith Edmunds
634637f42c WIP: playlist refacton: start/end times 
Clean up function. If next track is above current track, flow start
times around current track rather than resetting them at current
track.
 2023-02-26 22:04:39 +00:00
Keith Edmunds
613fa4343b Fix cancelling creation of new playlist 2023-02-26 22:03:13 +00:00
Keith Edmunds
e23f8afed2 WIP: playlist refactor fix default header colour 2023-02-26 21:31:20 +00:00
Keith Edmunds
45a564729b WIP playlists refactor including fixing saving playlist 2023-02-25 19:45:56 +00:00
Keith Edmunds
cc2f3733b2 Start using signals to call for saving playlist 2023-02-25 19:44:02 +00:00
Keith Edmunds
77716005c7 Modify session logging 2023-02-25 19:40:15 +00:00
Keith Edmunds
fed4e9fbde Open Wikipedia page on single row selection 2023-02-24 20:32:27 +00:00
Keith Edmunds
5902428c23 Clear selection after edit 2023-02-24 20:25:19 +00:00
Keith Edmunds
58ec47517d WIP: playlists.py refactor 2023-02-24 19:31:38 +00:00
Keith Edmunds
c14f03f0c1 WIP: playlists.py refactor 
Reset colour of current track when it has finished and is on a
different tab to the next track.
 2023-02-19 21:31:06 +00:00
Keith Edmunds
2cd49b5898 WIP: playlists.py refactor 
Tracks are bold on import
 2023-02-19 21:22:04 +00:00
Keith Edmunds
6de95573ff WIP: playlists.py refactor 
Hide/show played tracks
 2023-02-19 20:36:08 +00:00
Keith Edmunds
19377a8e1c WIP: playlists.py refactor 
Reset background colour of current track when track ended.
 2023-02-19 20:26:55 +00:00
Keith Edmunds
0794f061ee WIP: playlists.py refactor 2023-02-19 20:09:00 +00:00
Keith Edmunds
1c294e1ce4 Only send exception mails from production environment 2023-02-18 18:11:56 +00:00
Keith Edmunds
a41aea2d36 Fix potential bug in get_selected_playlistrows() 
It was possible for the returned list to have embedded None objects
 2023-02-18 10:43:38 +00:00
Keith Edmunds
c93f24970f Fix moving tracks to another playlist 2023-02-16 11:23:16 +00:00
Keith Edmunds
5fc1d21f5a Clean up "importing track" message 2023-02-16 11:22:52 +00:00
Keith Edmunds
8476dd4ace Add ability to delete and rename playlists 
Fixes #54
 2023-02-13 19:34:28 +00:00
Keith Edmunds
2a6dfc8b63 Fix can't add track to header row 2023-02-10 08:43:04 +00:00
Keith Edmunds
424709ca74 Fix startup issues after refactor 2023-02-10 08:42:41 +00:00
Keith Edmunds
4b104798b8 Add unmark as next, played to context menu 
Fixes #166
Fixex #138
 2023-02-08 20:52:42 +00:00
Keith Edmunds
a15f181008 Fix start time calc that stopped app starting 2023-02-08 16:10:31 +00:00
Keith Edmunds
0c38fc2ef4 Fix all bar one typing errors 2023-02-07 21:58:08 +00:00
Keith Edmunds
df2652e6cc Import tracks in QThread 
Allows progress messages to be sent
Fixes #164
 2023-02-07 21:25:16 +00:00
Keith Edmunds
1cc1f1a185 Display ampersands correctly in header 
Fixes #165
 2023-02-06 21:51:53 +00:00
Keith Edmunds
4a6d6fa208 Log errors importing tracks 2023-02-05 22:48:32 +00:00
Keith Edmunds
4f3fb6c1ae No mypy errors; four FIXMEs 2023-02-05 21:04:10 +00:00
Keith Edmunds
e4ef0b34c8 Improve type hints, rework code 
Fixes #147
 2023-02-05 17:38:56 +00:00
Keith Edmunds
9e6c700644 More typing fixes 2023-02-04 15:01:39 +00:00
Keith Edmunds
f182f49f15 More typing 2023-02-01 08:43:53 +00:00
Keith Edmunds
5d50ebf3aa Typing and other cleanups 2023-01-31 21:14:02 +00:00
Keith Edmunds
73bb4b3a7f WIP: typing 2023-01-30 19:29:33 +00:00
Keith Edmunds
dfb9326d5e Fix display corruption adding a track 
Fixes #137
 2023-01-29 18:31:50 +00:00
Keith Edmunds
e736cb82d2 Close MySQL session after running standalone commands 2023-01-27 10:53:28 +00:00
Keith Edmunds
e77c05b908 Remove unused functions 2023-01-20 22:01:05 +00:00
Keith Edmunds
ffa3015ac3 Fix move existing track when adding duplicate with note 
Fixes #161
 2023-01-20 22:00:47 +00:00
Keith Edmunds
f8dcc69a55 Python typing fixups 2023-01-20 21:59:40 +00:00
Keith Edmunds
c04114b07a Fix some type hints 2023-01-19 23:32:20 +00:00
Keith Edmunds
92852f7e27 Fix bug moving unplayed tracks 
Fixes #162
 2023-01-19 23:29:52 +00:00
Keith Edmunds
0507f495ad Fix adding only a note from track dialog 
Fixes #160
 2023-01-16 17:20:18 +00:00
Keith Edmunds
d87ff80bef Fix next track not selected when playing top row 2023-01-07 12:26:38 +00:00
Keith Edmunds
27cc86d48d Ensure when track stops playing it is no longer highlighted as current 
track in playlist.
 2023-01-07 12:21:53 +00:00
Keith Edmunds
7584ad2090 Make row number a playlist-only concept 
Solves problem of rows being moved in playlist and musicmuster not
knowing which row the current/next track is (but it doesn't need to
know; it only needs to know the PlaylistRows id).
 2023-01-07 11:50:05 +00:00
Keith Edmunds
087139f4de Quickfix: couldn't close tabs 2023-01-02 08:58:16 +00:00
Keith Edmunds
ed4a106bec Fix not recording playlist rows as played 2023-01-01 18:56:02 +00:00
Keith Edmunds
90424e917e Fix not recording playlist rows as played 2023-01-01 18:51:56 +00:00
Keith Edmunds
4870647387 Fix current track highligting when starting track on another playlist 2023-01-01 18:27:41 +00:00
Keith Edmunds
046b689882 Fixup moving tracks between playlists. 
Fixes #155
 2023-01-01 15:52:06 +00:00
Keith Edmunds
74028fadf7 Set colours of tabs correctly. 2023-01-01 14:25:06 +00:00
Keith Edmunds
4edcab1542 Skip over unreadable tracks when selecting next track. 2023-01-01 11:08:37 +00:00
Keith Edmunds
5e75659c48 Don't use row metadat for next/current track 
Get them from musicmuster.
 2023-01-01 10:49:54 +00:00
Keith Edmunds
daf8069de2 Tidy up moving to PlaylistTrack object 2023-01-01 09:19:34 +00:00
Keith Edmunds
4beafe7cfc Fix typo Session→session 2023-01-01 08:33:06 +00:00
Keith Edmunds
2a484d51d3 Remove function_logger 
It doesn't work properly (call methods with an additional "None"
argument).
 2023-01-01 08:11:41 +00:00
Keith Edmunds
b476db188f Implement PlaylistTrack object 2022-12-30 21:43:47 +00:00
Keith Edmunds
f1c27e0e8c WIP 2022-12-29 08:56:58 +00:00
Keith Edmunds
aa405cd6d9 WIP for resume play 2022-12-28 15:08:54 +00:00
Keith Edmunds
8f8c6a1034 Remove redundant code 2022-12-28 09:33:40 +00:00
Keith Edmunds
ece6723211 Database changes needed for 2.8 and 2.9 2022-12-25 10:29:05 +00:00
Keith Edmunds
683e76f9a0 Update database correctly when tabs are closed 2022-12-24 20:24:27 +00:00
Keith Edmunds
abd6ad0a64 Fix to not sending stack dumps in development environment 2022-12-24 20:23:30 +00:00
Keith Edmunds
ea4d7693ef Don't send stackdumps by mail in DEVELOPMENT environment 2022-12-24 18:46:04 +00:00
Keith Edmunds
94b2f473e9 Cleanups from running vulture 2022-12-24 09:36:51 +00:00
Keith Edmunds
f2a27366d3 Fix deleting rows from playlist 2022-12-23 21:27:06 +00:00
Keith Edmunds
46f2b662f3 Copy/paste, insert track/header works 2022-12-23 20:52:18 +00:00
Keith Edmunds
647e7d478a Move rows works. 2022-12-23 20:37:21 +00:00
Keith Edmunds
444c3e4fb4 Remove rows from playlist works and db updates 2022-12-23 20:15:07 +00:00
Keith Edmunds
35b101a538 Tidy up saving database 2022-12-23 17:23:43 +00:00
Keith Edmunds
d3958db8a3 Fix crash if create new playlist is cancelled 2022-12-23 09:27:14 +00:00
Keith Edmunds
be4f19757c Improve performance of save_playlist 2022-12-22 17:41:46 +00:00
Keith Edmunds
784d036bb7 Finally(?) sort out stackprinter logging. 2022-12-21 15:06:10 +00:00
Keith Edmunds
6a2bcfff19 Restore tab order and focussed tab 
Fixes #96
 2022-12-20 18:35:18 +00:00
Keith Edmunds
eb7ed1d6dd Install line-profiler 2022-12-19 21:31:08 +00:00
Keith Edmunds
78a9103490 Better stackprinter handling 2022-12-19 21:07:03 +00:00
Keith Edmunds
0d4b306fc4 Don't scroll on drag and drop 
Fixes #152
 2022-12-19 18:14:59 +00:00
Keith Edmunds
57f038c704 Implement row mark and paste 
Fixed #132
 2022-12-19 15:28:03 +00:00
Keith Edmunds
999a98e2ad Check before moving unplayed tracks 
Fixes #151
 2022-12-18 23:11:05 +00:00
Keith Edmunds
2ada8a27fe Tidy up log.py 2022-12-18 22:23:17 +00:00
Keith Edmunds
bd9c8a84b9 Implement stackprinter 2022-12-18 22:20:55 +00:00
Keith Edmunds
693e8f195d Notify when issue #147 occurs 2022-12-18 21:03:45 +00:00
Keith Edmunds
d9851adf65 Fix inability to play tracks with colon in path 
Fixes #103
 2022-12-17 19:47:17 +00:00
Keith Edmunds
30bd23c088 Workaround for issue #147 2022-11-24 09:17:40 +00:00
Keith Edmunds
f297923a2f Hide carts from config 2022-11-11 21:47:04 +00:00
Keith Edmunds
41379efd1b Limit number of matching tracks on import 2022-11-11 21:12:12 +00:00
Keith Edmunds
6339326947 Don't scroll to top without a row 2022-11-11 21:06:15 +00:00
Keith Edmunds
a0c1dad2f5 Merge branch 'dev' 2022-11-10 10:12:13 +00:00
Keith Edmunds
25add4239d Limit matching tracks on import to five 2022-11-10 10:11:42 +00:00
Keith Edmunds
04f1fba581 Ignore directories for replace_files 2022-11-10 10:11:20 +00:00
Keith Edmunds
9af20c29d3 Fix scroll to current/next with hidden rows 2022-11-06 16:18:51 +00:00
Keith Edmunds
2b4e003caf Speed up marking track as next 2022-10-28 13:22:00 +01:00
Keith Edmunds
0f5edcc86c Use signal to update cart progress bar 2022-10-26 20:09:04 +01:00
Keith Edmunds
52776fcf8d Workaround to crash when playing cart with next track selected 2022-10-26 14:20:34 +01:00
Keith Edmunds
2f13099bda Don't allow cart click while that cart is playing. 2022-10-25 07:46:14 +01:00
Keith Edmunds
9ccff3db20 Specify colour of cart progress bars 2022-10-23 22:37:06 +01:00
Keith Edmunds
ef9b1e7ce5 Remove redundant debug logging 2022-10-23 16:29:38 +01:00
Keith Edmunds
5e770b3975 Cart progress bar tweaks 2022-10-23 16:29:03 +01:00
Keith Edmunds
6c92401ad6 Put progress bars on playing cart buttons. 2022-10-23 16:17:43 +01:00
Keith Edmunds
5b0d604edf Remove extraneous message 2022-10-22 08:55:14 +01:00
Keith Edmunds
15258f6cc8 Put bar under carts 2022-10-22 08:51:52 +01:00
Keith Edmunds
f42261277e Carts: tidy up code 2022-10-21 22:54:50 +01:00
Keith Edmunds
1899aac9ae Implement carts 2022-10-21 22:41:38 +01:00
Keith Edmunds
a649fa8c59 WIP: Carts 2022-10-15 20:15:30 +01:00
Keith Edmunds
ef17b359e2 Put KAE in debug logging strings 2022-10-15 17:57:44 +01:00
Keith Edmunds
0b91cf7da4 WIP: carts 2022-10-15 17:42:37 +01:00
Keith Edmunds
4f3769ae38 Populate footer with next track info if not playing 
Fixes #133
 2022-10-15 13:39:54 +01:00
Keith Edmunds
69afb2986e Highlight leading gap when adding track to header 
Fixes #142
 2022-10-15 10:21:23 +01:00
Keith Edmunds
39f5374b32 Disable set next track during editing 
Fixes #130
 2022-10-14 22:15:40 +01:00
Keith Edmunds
ed2b919db4 Reorder functions 2022-10-14 21:54:39 +01:00
Keith Edmunds
bf67866f8a debug markers to investigate #137 2022-10-14 15:50:13 +01:00
Keith Edmunds
4357e0e038 Fix size/spacing of header bars 
Fixes #144
 2022-10-14 14:22:49 +01:00
Keith Edmunds
5783da051e Add debug statements for scroll to next/current 2022-10-14 09:05:12 +01:00
Keith Edmunds
3528b58174 Add debug to help menu 2022-10-13 19:12:49 +01:00
Keith Edmunds
f6e2fe7652 Add debug to help menu 2022-10-13 19:12:30 +01:00
Keith Edmunds
2d62fb993f Facility to add notes when inserting tracks 2022-10-02 14:05:25 +01:00
Keith Edmunds
11090b57ad Preserve note when adding track to header 2022-10-01 16:47:03 +01:00
Keith Edmunds
00d3add0d3 Implement templates 2022-10-01 14:14:26 +01:00
Keith Edmunds
9f32abc2ea Fix removing track from row (ie, make it a header) 2022-10-01 09:04:37 +01:00
Keith Edmunds
3609a224f1 Fix adding track to header row 2022-10-01 08:57:43 +01:00
Keith Edmunds
5d3d373abc Update headers when editing current/next track 
Fixes #126
 2022-09-30 22:26:49 +01:00
Keith Edmunds
c3712eba27 Switch to correct tab when clicking on next/current header 2022-09-30 21:45:15 +01:00
Keith Edmunds
1da0668807 Preserve bitrate when importing track 2022-09-30 18:54:23 +01:00
Keith Edmunds
1ce009ee73 Playlist deals with invalid track_id 2022-09-30 18:53:04 +01:00
Keith Edmunds
5d1078dea0 Debug output to try to track down why titles are changing 2022-09-30 18:26:13 +01:00
Keith Edmunds
e1ceb5e8e3 Update bitrate displayed if db differs from display 2022-09-30 18:25:51 +01:00
Keith Edmunds
912ed0b1eb Use symbols for columns 2022-09-30 18:24:50 +01:00
Keith Edmunds
d670f397fc Stop notes column going to zero width on track import 2022-09-30 15:55:52 +01:00
Keith Edmunds
7829186d55 Keep row selected after adding section header 2022-09-30 15:33:33 +01:00
Keith Edmunds
0c37eccb76 Adjust row height to edited striped text 2022-09-30 15:21:13 +01:00
Keith Edmunds
7601c7dc4c Clean up duplicate prompts when importing track 2022-09-23 21:13:48 +01:00
Keith Edmunds
84d746bd2f Use symbolic names for columns 2022-09-23 21:09:14 +01:00
Keith Edmunds
b42ffcec69 Fix notes not wrapping on startup 
Ensure notes column stretches to fill width and that it wraps.
 2022-09-19 19:26:59 +01:00
Keith Edmunds
632e555bed Make clock bar darker 2022-09-19 15:54:36 +01:00
Keith Edmunds
dff7e2323d Set next track start time correctly when current track on another tab 2022-09-12 18:24:15 +01:00
Keith Edmunds
0194790605 Clean up importing and track rescan 2022-09-12 18:23:30 +01:00
Keith Edmunds
c907736436 Remove redundant code 2022-09-10 21:59:14 +01:00
Keith Edmunds
c0c90595fd Close Session context before importing tracks 2022-09-09 07:29:46 +01:00
Keith Edmunds
7163a4c6e4 Re-enable session logging 2022-09-09 07:29:20 +01:00
Keith Edmunds
cc80022428 Add About box with version and database name 2022-09-07 20:38:36 +01:00
Keith Edmunds
2f5d00fa3a Scroll to current/next on header click 2022-09-07 20:07:02 +01:00
Keith Edmunds
af11f90808 Only autoscroll when track played 2022-09-07 19:47:51 +01:00
Keith Edmunds
27eba987ca No default note background for track notes 2022-09-07 19:00:48 +01:00
Keith Edmunds
7e02bd60e5 Make 'show played' work again 2022-09-05 18:51:12 +01:00
Keith Edmunds
8044f95556 Remove current track higlighting at end of track 2022-09-05 18:42:30 +01:00
Keith Edmunds
56b99630c1 Increase row height on edit to make editing easier 2022-09-04 21:41:46 +01:00
Keith Edmunds
cdb9e1fb59 Enforce minimum row height; adjust height more intelligently 2022-09-04 21:25:18 +01:00
Keith Edmunds
6ede0ab7ea Pull playlist changes from v2_editor 
- minimum row height
- intelligent row resizing
 2022-09-04 20:55:40 +01:00
Keith Edmunds
958edb0140 Expand last column; use ^Return to close editor 2022-09-04 19:20:54 +01:00
Keith Edmunds
f2f99b5f79 Don't clear selection after adding as track 2022-08-24 17:51:01 +01:00
Keith Edmunds
f3ccab513b Put section headers in row 2 
Bug in Qt means automatically setting row height doesn't take into
account row spans, so putting headers in narrow column makes for tall
rows.
 2022-08-24 17:33:22 +01:00
Keith Edmunds
7819e863eb Merge branch 'EditorClosing' into v3_play 2022-08-24 14:35:10 +01:00
Keith Edmunds
9f6eb2554a close edit box with return 2022-08-24 14:35:01 +01:00
Keith Edmunds
b5c792b8d8 Lots of work on replace_files.py 2022-08-24 12:44:56 +01:00
Keith Edmunds
2b48e889a5 Always print summary from replace_files 2022-08-23 10:38:25 +01:00
Keith Edmunds
688267834d Set bitrate in replace_files.py 2022-08-23 09:32:26 +01:00
Keith Edmunds
c9a411d15d Tuning replace_files.py 2022-08-22 19:27:47 +01:00
Keith Edmunds
a0c074adad Checked all queries are SQLAlchemy V2 format 2022-08-22 17:46:04 +01:00
Keith Edmunds
140722217b Add bitrates to database and display 2022-08-22 17:30:30 +01:00
Keith Edmunds
0e9461e0df Merge branch 'replacing_files' into v3_play 2022-08-22 16:09:04 +01:00
Keith Edmunds
f851fdcafe First draft of rename_singles.py 2022-08-22 16:08:24 +01:00
Keith Edmunds
26358761e5 Default to no processing in replace_files.py 2022-08-22 16:07:44 +01:00
Keith Edmunds
6ce41d3314 Check replace_files is run against production db 2022-08-22 16:01:56 +01:00
Keith Edmunds
62c5fa178c Work around MariaDB bug in replace_files.py 2022-08-22 14:39:18 +01:00
Keith Edmunds
5f8d8572ad Don't allow duplicate track paths 2022-08-21 19:47:47 +01:00
Keith Edmunds
16b9ac19f0 Reset colours for each track on update_display 2022-08-21 17:00:42 +01:00
Keith Edmunds
1bae79265d Only adjust height of track rows with notes, not header rows 2022-08-17 22:18:25 +01:00
Keith Edmunds
c9cdbe2eb2 Remove commented code 2022-08-17 21:30:04 +01:00
Keith Edmunds
dfcdc0b9e8 Only resize track rows that have notes 2022-08-17 21:28:32 +01:00
Keith Edmunds
957450c0f6 Use QPlainTextEdit to edit cells 2022-08-17 21:28:15 +01:00
Keith Edmunds
20e9880a03 Set alternate row colous using App.setPalette 2022-08-17 21:12:21 +01:00
Keith Edmunds
503ba36a88 Replacing files fine tuning 2022-08-17 17:09:19 +01:00
Keith Edmunds
d267b32c0d WIP trying things 2022-08-17 13:30:45 +01:00
Keith Edmunds
7b2b7fada5 WIP: replace notes TableWidgetItem with TextEdit 2022-08-17 12:52:09 +01:00
Keith Edmunds
bcc6634e34 Work on replacing existing music files 2022-08-17 11:28:10 +01:00
Keith Edmunds
4fad05db6b QTextEdit WIP 2022-08-16 12:30:03 +01:00
Keith Edmunds
c4be0b55d4 Make rows tall enough for notes, notes not bold 2022-08-16 10:46:42 +01:00
Keith Edmunds
88d0c11cbc Add track to header working 2022-08-15 21:36:04 +01:00
Keith Edmunds
a67b295f33 Reorder functions 2022-08-15 17:16:06 +01:00
Keith Edmunds
01a9ce342a Open wikipedia and songfacts from right click menu. 
Also reorganised right click menu.
 2022-08-15 17:06:01 +01:00
Keith Edmunds
6ddb40d146 Remove superflous code 2022-08-15 16:01:16 +01:00
Keith Edmunds
61311f67fe Implement musicuster --check-database 2022-08-15 15:59:34 +01:00
Keith Edmunds
8ec0911ce4 Insert commented placeholders for column sorting 2022-08-15 15:33:12 +01:00
Keith Edmunds
87e2f33f59 Scroll to put next, not current, track at top 2022-08-15 15:31:26 +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