Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Caption support #2462

Merged
merged 63 commits into from
May 6, 2022
Merged

Caption support #2462

Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
5598f91
support for english caption
cj12312021 Mar 31, 2022
040a677
support other languages
cj12312021 Apr 1, 2022
8ee6fed
changed manualCleanup to true
cj12312021 Apr 1, 2022
5b6a133
Merge branch 'develop' into caption_support
cj12312021 Apr 1, 2022
1e793a5
added captions to manual
cj12312021 Apr 1, 2022
25b64f9
added captioned to sortByList
cj12312021 Apr 1, 2022
590693a
created entry for captioned in en-GB.json file
cj12312021 Apr 1, 2022
bc636d6
updated formatting
cj12312021 Apr 1, 2022
cf6cebc
Translated caption labels
cj12312021 Apr 1, 2022
fb43459
Removed unused GetCaptionPath method
cj12312021 Apr 1, 2022
feeeb1c
Updated caption background to be semi transparent
cj12312021 Apr 1, 2022
9e3424f
Removed edge styling on caption text
cj12312021 Apr 1, 2022
2d8c5c5
convert srt files
cj12312021 Apr 3, 2022
6152119
Merge branch 'develop' into caption_support
cj12312021 Apr 3, 2022
861a1b7
import vtt-live-edit
cj12312021 Apr 4, 2022
09182b1
linter fix
cj12312021 Apr 4, 2022
81d031b
Merge branch 'develop' into caption_support
cj12312021 Apr 4, 2022
188e141
updated schema version after merge and applied bnkai's change
cj12312021 Apr 4, 2022
0c8f5dc
created our own subtitle offseting implementation
cj12312021 Apr 5, 2022
7ddf865
handle captions when transcoding
cj12312021 Apr 5, 2022
e503bbd
updated inner for loop var name. and other linter flags
cj12312021 Apr 5, 2022
41bf0b3
this might be the cause of the bug
cj12312021 Apr 5, 2022
657b2ae
format update
cj12312021 Apr 5, 2022
6074053
added ability to detect what subs were provided
cj12312021 Apr 5, 2022
b177119
linter update
cj12312021 Apr 5, 2022
a30ff42
generically load captions and show user lang by default
cj12312021 Apr 8, 2022
dfcbdee
updated css attribute order
cj12312021 Apr 8, 2022
4fc85e7
simpler caption settings text fix
cj12312021 Apr 8, 2022
2777509
generically detect caption files and includes some clean up
cj12312021 Apr 9, 2022
9298311
linter update
cj12312021 Apr 9, 2022
c3e9593
update to caption detect method
cj12312021 Apr 10, 2022
ffeb5f0
update to caption filter, and md file
cj12312021 Apr 10, 2022
322b3b8
Merge branch 'develop' into caption_support
cj12312021 Apr 11, 2022
482b967
moved change to v0150.md
cj12312021 Apr 11, 2022
fdaa1cf
added tests for caption work and updated md file
cj12312021 Apr 12, 2022
fe702bd
updated captions to string array
cj12312021 Apr 17, 2022
3afdd80
Merge branch 'develop' into caption_support
cj12312021 Apr 17, 2022
83ba144
merge update
cj12312021 Apr 17, 2022
85a982e
removed unused variable
cj12312021 Apr 17, 2022
08e733a
Updated CleanCaptions
cj12312021 Apr 17, 2022
af85da3
Update task_scan_scene.go
cj12312021 Apr 17, 2022
2fdcf9b
expanded caption table
cj12312021 Apr 18, 2022
917c4ce
prettier on ScenePlayer.tsx
cj12312021 Apr 18, 2022
422a214
merge
cj12312021 Apr 18, 2022
69075b3
fix merge issue
cj12312021 Apr 18, 2022
f7f0772
ensure one caption can be active
cj12312021 Apr 18, 2022
38dbce4
Update ScenePlayer.tsx
cj12312021 Apr 18, 2022
5b2f4d8
moved hasDefault declaration
cj12312021 Apr 18, 2022
0ec3e78
dumbed down caption filter
cj12312021 Apr 23, 2022
d1dedca
removed caption index
cj12312021 Apr 23, 2022
7be9076
ran prettier
cj12312021 Apr 23, 2022
75e8bfb
detect captions by default, updated filter, and database
cj12312021 May 4, 2022
10d29c6
Merge branch 'develop' into caption_support
cj12312021 May 4, 2022
7d0eb25
fixes conflicts
cj12312021 May 4, 2022
ea6d415
Merge remote-tracking branch 'upstream/develop' into prs/2462
WithoutPants May 5, 2022
8da00f2
Fix spelling error
WithoutPants May 5, 2022
852183f
Re-add filename to database
WithoutPants May 5, 2022
a79cf2d
Fix caption filtering
WithoutPants May 5, 2022
fdea166
Remove superfluous code
WithoutPants May 5, 2022
a3bce53
Adjust changelog entry
WithoutPants May 5, 2022
92dbf25
Ensure one caption per scene/language
WithoutPants May 5, 2022
013031b
Remove superfluous field
WithoutPants May 5, 2022
2a4f8e6
Fix primary key to support multiple caption types
WithoutPants May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/database/migrations/31_scenes_captions.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ CREATE TABLE `scene_captions` (
`language_code` varchar(255) NOT NULL,
`filename` varchar(255) NOT NULL,
`caption_type` varchar(255) NOT NULL,
primary key (`scene_id`, `language_code`),
WithoutPants marked this conversation as resolved.
Show resolved Hide resolved
foreign key(`scene_id`) references `scenes`(`id`) on delete CASCADE
);