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.

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

Improved video #1910

Merged
merged 38 commits into from
Apr 12, 2022
Merged

Improved video #1910

merged 38 commits into from
Apr 12, 2022

Conversation

marinofaggiana
Copy link
Member

@marinofaggiana marinofaggiana commented Mar 2, 2022

  • Create ToolBar storyboard (removed from ViewerMediaPage storyboard)
  • Improved the code and stability (toolbar)
  • added subtitle view (for .srt format)
  • added the subtitle button (visible if subtitle are available)

Fix:

Subtitles .SRT format:

moviefile
moviefile.lang.srt

example:

movie1.mov
movie1.eng.srt
movie1.ita.srt

@marinofaggiana marinofaggiana marked this pull request as draft March 11, 2022 15:51
@marinofaggiana marinofaggiana changed the title Improved video ToolBar Improved video Mar 15, 2022
@marinofaggiana marinofaggiana force-pushed the improvedVideo branch 3 times, most recently from 8603267 to 74c50d7 Compare March 25, 2022 10:14
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
@marinofaggiana marinofaggiana marked this pull request as ready for review April 8, 2022 08:58
@marinofaggiana
Copy link
Member Author

@thisIsTheFoxe please approved this, thanks

Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Signed-off-by: marinofaggiana <ios@nextcloud.com>
@marinofaggiana marinofaggiana added this to the 4.4.0 milestone Apr 11, 2022
Copy link
Contributor

@thisIsTheFoxe thisIsTheFoxe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks #1882 again..

UX: Subtitle button acts as a toggle. I think it might be clearer to do it similar to native iOS subtitles and have a separate "Off" subtitle..?

Notes:

  • doesn't support embedded subtitles(?)
  • subtitles don't support formatting
  • subtitles need to be downloaded beforehand. Alternatively, could show an alert like: "Subtitle file(s) detected, download?"

iOSClient/Utility/CCUtility.m Outdated Show resolved Hide resolved
print("Play Subtitle at:\n\(url.path)")

let videoUrlTitle = self.metadata.fileName.alphanumeric.dropLast(3)
let subtitleUrlTitle = url.lastPathComponent.alphanumeric.dropLast(3)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this just remove the extension? Why do you need .alphanumeric? Why not just use deletingPathExtension()?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will be improved


alert.addAction(UIAlertAction(title: titleSubtitle, style: .default, handler: { [self] _ in

if NCUtilityFileSystem.shared.getFileSize(filePath: url.path) > 0 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If subtitles can't be found they probably shouldn't be displayed in the first place.. I suggest to move this check outside before addAction

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will be improved

iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift Outdated Show resolved Hide resolved
Signed-off-by: marinofaggiana <ios@nextcloud.com>
Copy link
Contributor

@thisIsTheFoxe thisIsTheFoxe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good.

Just some minor optimisations I noticed:

  • unused func String.urlSafeBase64Decoded
  • unused l18n _select_trace_ , _video_must_download_ , ...
  • unused vars AssociatedKeys.FontKey, .ColorKey
  • struct AssociatedKeys should be an enum, so it can't be instantiated
  • NCSubtitlePlayer.swift has a header of AVPlayer+Extensions.swift
  • getEncondingDataType(data:) can be refactored to use a loop. or .first(where:)

@marinofaggiana marinofaggiana merged commit 835cb5b into develop Apr 12, 2022
@delete-merged-branch delete-merged-branch bot deleted the improvedVideo branch April 12, 2022 06:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants