LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

kill render-media (range-requests) and add floating player #2707

Merged
neb-b merged 6 commits from not-streaming-but-streaming into master 2019-08-13 19:48:53 +02:00
Conversation 2 Commits 6 Files changed 65 +1063 -1732
neb-b commented 2019-08-02 08:25:25 +02:00 (Migrated from github.com)
Copy link

By no means is this file viewer/purhcase logic code good, but this is sure as hell better than it was before.

The plan

Merge this shit before anyone can take a really close look at this I'm happy with this now. It should be a lot easier to work moving forward.

Things to actually do before this is ready

  • Fix purchase confirmation modal
  • Fix .lbry file support
  • Fix volume/mute memory
  • Add super basic image viewer
  • Add back analytics (possibly do this in another PR)
    • I stripped out all the analytics stuff for file views since it was so tangled up (and only worked for videos)
By no means is this file viewer/purhcase logic code _good_, but this is sure as hell better than it was before. ### The plan ~Merge this shit before anyone can take a really close look at this~ I'm happy with this now. It should be a lot easier to work moving forward. #### Things to actually do before this is ready - [x] Fix purchase confirmation modal - [x] Fix `.lbry` file support - [ ] Fix volume/mute memory - [x] Add super basic image viewer - [ ] Add back analytics (possibly do this in another PR) - I stripped out all the analytics stuff for file views since it was so tangled up (and only worked for videos)
neb-b commented 2019-08-06 05:30:03 +02:00 (Migrated from github.com)
Copy link

This is ready. I'm going to wait to add analytics in a different PR. Just so we can get a little testing on this to see if anything crazy needs to change before I update this new play api. It should be fairly easy to add for all file types now.

This is ready. I'm going to wait to add analytics in a different PR. Just so we can get a _little_ testing on this to see if anything crazy needs to change before I update this new `play` api. It should be fairly easy to add for all file types now.
neb-b (Migrated from github.com) reviewed 2019-08-06 05:40:04 +02:00
src/ui/page/settings/view.jsx
neb-b (Migrated from github.com) commented 2019-08-06 05:40:04 +02:00
Copy link

@tzarebczan Can you add some help text for this setting?

@tzarebczan Can you add some help text for this setting?
kauffj (Migrated from github.com) reviewed 2019-08-07 00:27:29 +02:00
kauffj (Migrated from github.com) left a comment
Copy link

Slightly hastier review than I would have liked, but wanted to get something back to you today. I also did not run the code. I'd still like to do this, but do not let me block.

Slightly hastier review than I would have liked, but wanted to get something back to you today. I also did not run the code. I'd still like to do this, but do not let me block.
src/ui/component/fileActions/view.jsx
kauffj (Migrated from github.com) commented 2019-08-07 00:09:42 +02:00
Copy link

Is blobs_completed a number or a boolean? this contrasts with https://github.com/lbryio/lbry-desktop/pull/2707/files#diff-90966bed4cd947a3f12fa8f891fd193aR35 below

Is `blobs_completed` a number or a boolean? this contrasts with https://github.com/lbryio/lbry-desktop/pull/2707/files#diff-90966bed4cd947a3f12fa8f891fd193aR35 below
src/ui/component/fileRender/view.jsx
@ -148,3 +101,4 @@
const source = IS_WEB ? `https://api.lbry.tv/content/claims/${claim.name}/${claim.claim_id}/stream` : streamingUrl;
// Human-readable files (scripts and plain-text files)
const readableFiles = ['text', 'document', 'script'];
kauffj (Migrated from github.com) commented 2019-08-07 00:13:05 +02:00
Copy link

does the creation of mediaTypes trigger the instantiation/invocation of the individual components? or is that deferred until the element is used in some way? (I think it's the latter, but making sure)

does the creation of `mediaTypes` trigger the instantiation/invocation of the individual components? or is that deferred until the element is used in some way? (I think it's the latter, but making sure)
src/ui/component/selectThumbnail/view.jsx
kauffj (Migrated from github.com) commented 2019-08-07 00:14:15 +02:00
Copy link

out of scope for this PR, but I wonder if putting all of these on the Lbry object is the right design

out of scope for this PR, but I wonder if putting all of these on the `Lbry` object is the right design
src/ui/component/viewers/appViewer/view.jsx
@ -0,0 +11,4 @@
const SANDBOX_TYPES = ['application/x-lbry', 'application/x-ext-lbry'];
// This server exists in src/platforms/electron/startSandBox.js
const SANDBOX_SET_BASE_URL = 'http://localhost:5278/set/';
kauffj (Migrated from github.com) commented 2019-08-07 00:15:27 +02:00
Copy link

are these important enough configuration values that they should be hoisted to top-level config of some kind? does anything else use them?

are these important enough configuration values that they should be hoisted to top-level config of some kind? does anything else use them?
src/ui/component/viewers/appViewer/view.jsx
@ -0,0 +52,4 @@
src={appUrl}
autosize="on"
style={{ border: 0, width: '100%', height: '100%' }}
useragent="Mozilla/5.0 AppleWebKit/537 Chrome/60 Safari/537"
kauffj (Migrated from github.com) commented 2019-08-07 00:15:53 +02:00
Copy link

can this be read from Electron?

can this be read from Electron?
src/ui/component/viewers/videoViewer/view.jsx
kauffj (Migrated from github.com) commented 2019-08-07 00:17:34 +02:00
Copy link

Add 0.25, 0.75, and 1.1 (assuming no or minimal UI cost or other costs)

YouTube does 0.25 and 0.75 and I've found 1.1 is not very perceptible but still saves meaningful time

Add 0.25, 0.75, and 1.1 (assuming no or minimal UI cost or other costs) YouTube does 0.25 and 0.75 and I've found 1.1 is not very perceptible but still saves meaningful time
kauffj (Migrated from github.com) commented 2019-08-07 00:19:42 +02:00
Copy link

can 53-59 just be:

videoNode.paused ? videoNode.play() : videoNode.pause()

can 53-59 just be: `videoNode.paused ? videoNode.play() : videoNode.pause()`
src/ui/page/settings/view.jsx
kauffj (Migrated from github.com) commented 2019-08-07 00:21:32 +02:00
Copy link

Check boxes always enable, so you do not need to put this in the label. Present tense is better:

"Save all viewed content"

Helper text:

"Content is saved to downloads directory. Paid content and some file types are saved by default. Changing this setting will not affect previously downloaded content."

Possibly the first sentence of helper would be better in label, or something close to this. Try both.

Check boxes always enable, so you do not need to put this in the label. Present tense is better: "Save all viewed content" Helper text: "Content is saved to downloads directory. Paid content and some file types are saved by default. Changing this setting will not affect previously downloaded content." Possibly the first sentence of helper would be better in label, or something close to this. Try both.
kauffj (Migrated from github.com) commented 2019-08-07 00:23:00 +02:00
Copy link

Rewrite similar to above, "Save..."

Rewrite similar to above, "Save..."
src/ui/redux/actions/content.js
kauffj (Migrated from github.com) commented 2019-08-07 00:24:13 +02:00
Copy link

i18n

i18n
src/ui/redux/actions/content.js
kauffj (Migrated from github.com) commented 2019-08-07 00:25:05 +02:00
Copy link

I've seen a few fileInfo checks similar to this, consider if it makes sense to combine into a selector (it might not).

I've seen a few fileInfo checks similar to this, consider if it makes sense to combine into a selector (it might not).
src/ui/redux/actions/content.js
kauffj (Migrated from github.com) commented 2019-08-07 00:25:29 +02:00
Copy link

why always save if cost > 0? I would not expect this

why always save if cost > 0? I would not expect this
src/ui/redux/actions/content.js
kauffj (Migrated from github.com) commented 2019-08-07 00:25:53 +02:00
Copy link

return is avoidable if made into 3 nested if

return is avoidable if made into 3 nested if
src/ui/redux/selectors/app.js
@ -102,3 +102,3 @@
export const selecetMute = createSelector(
export const selectMute = createSelector(
selectState,
kauffj (Migrated from github.com) commented 2019-08-07 00:26:16 +02:00
Copy link

👌

:ok_hand:
neb-b (Migrated from github.com) reviewed 2019-08-07 21:43:37 +02:00
src/ui/component/fileActions/view.jsx
neb-b (Migrated from github.com) commented 2019-08-07 21:43:37 +02:00
Copy link

It is a number, good catch

It is a number, good catch
neb-b (Migrated from github.com) reviewed 2019-08-07 21:44:33 +02:00
src/ui/component/viewers/appViewer/view.jsx
@ -0,0 +11,4 @@
const SANDBOX_TYPES = ['application/x-lbry', 'application/x-ext-lbry'];
// This server exists in src/platforms/electron/startSandBox.js
const SANDBOX_SET_BASE_URL = 'http://localhost:5278/set/';
neb-b (Migrated from github.com) commented 2019-08-07 21:44:33 +02:00
Copy link

Nope, they exist entirely for this app viewer

Nope, they exist entirely for this app viewer
neb-b (Migrated from github.com) reviewed 2019-08-07 21:52:14 +02:00
src/ui/page/settings/view.jsx
neb-b (Migrated from github.com) commented 2019-08-07 21:52:14 +02:00
Copy link

Nice. Much cleaner

Nice. Much cleaner
neb-b (Migrated from github.com) reviewed 2019-08-07 22:12:15 +02:00
src/ui/redux/actions/content.js
neb-b (Migrated from github.com) commented 2019-08-07 22:12:15 +02:00
Copy link

IMO nested if statements are harder to skim and understand. Especially when one of the if statements does something else.

Especially during this new video player refactor, the hardest parts to follow were blocks with nested if statements.

IMO nested if statements are harder to skim and understand. Especially when one of the if statements does something else. Especially during this new video player refactor, the hardest parts to follow were blocks with nested if statements.
kauffj (Migrated from github.com) reviewed 2019-08-07 22:43:04 +02:00
src/ui/redux/actions/content.js
kauffj (Migrated from github.com) commented 2019-08-07 22:43:04 +02:00
Copy link

So one if/else is okay, but a third means use an early return?

I don't hate this but I do think this will result in idiosyncratic code because I doubt others are following this paradigm

However, debating this is classic bikeshedding, so ship whatever you want

So one if/else is okay, but a third means use an early return? I don't hate this but I do think this will result in idiosyncratic code because I doubt others are following this paradigm However, debating this is classic bikeshedding, so ship whatever you want
tzarebczan (Migrated from github.com) reviewed 2019-08-08 13:06:20 +02:00
src/ui/component/fileActions/view.jsx
tzarebczan (Migrated from github.com) commented 2019-08-08 13:06:20 +02:00
Copy link

Blobs completed is a count

Saw it was resolved but not fixed yet

Blobs completed is a count Saw it was resolved but not fixed yet
tzarebczan (Migrated from github.com) reviewed 2019-08-08 13:12:24 +02:00
src/ui/component/selectThumbnail/view.jsx
tzarebczan (Migrated from github.com) commented 2019-08-08 13:12:24 +02:00
Copy link

We also have the file name with extension in the claim data now, but we should fall back to file list when it's not available

We also have the file name with extension in the claim data now, but we should fall back to file list when it's not available
tzarebczan (Migrated from github.com) reviewed 2019-08-08 13:15:18 +02:00
src/ui/page/settings/view.jsx
tzarebczan (Migrated from github.com) commented 2019-08-08 13:15:17 +02:00
Copy link

Will add it today.

Will add it today.
tzarebczan (Migrated from github.com) reviewed 2019-08-08 13:24:57 +02:00
src/ui/component/fileRender/view.jsx
@ -148,3 +101,4 @@
const source = IS_WEB ? `https://api.lbry.tv/content/claims/${claim.name}/${claim.claim_id}/stream` : streamingUrl;
// Human-readable files (scripts and plain-text files)
const readableFiles = ['text', 'document', 'script'];
tzarebczan (Migrated from github.com) commented 2019-08-08 13:24:57 +02:00
Copy link

If download path exists and the file is completed, we should use that for the video and audio player.

If download path exists and the file is completed, we should use that for the video and audio player.
neb-b (Migrated from github.com) reviewed 2019-08-08 17:40:57 +02:00
src/ui/component/viewers/appViewer/view.jsx
@ -0,0 +52,4 @@
src={appUrl}
autosize="on"
style={{ border: 0, width: '100%', height: '100%' }}
useragent="Mozilla/5.0 AppleWebKit/537 Chrome/60 Safari/537"
neb-b (Migrated from github.com) commented 2019-08-08 17:40:57 +02:00
Copy link

Possibly. I haven't spent any time looking into that, just copy pasting it from the old file

Possibly. I haven't spent any time looking into that, just copy pasting it from the old file
neb-b (Migrated from github.com) reviewed 2019-08-13 07:20:58 +02:00
src/ui/component/selectThumbnail/view.jsx
neb-b (Migrated from github.com) commented 2019-08-13 07:20:57 +02:00
Copy link

Since that only has some of the media types, I don't think it's worth it to use for now, especially since it's working pretty well.

And yeah, this is probably better as a regular utility function?

Since that only has _some_ of the media types, I don't think it's worth it to use for now, especially since it's working pretty well. And yeah, this is probably better as a regular utility function?
neb-b commented 2019-08-13 07:36:42 +02:00 (Migrated from github.com)
Copy link

@kauffj this is ready for another review
I gave up on mute/volume/position memory, will circle back after this is merged but I'd rather get this in so I can start on the other tickets before the release.

I would just look at the last commit
2b09d56b63

I responded to your change requests and did all the floating player stuff in that one commit.

@kauffj this is ready for another review I gave up on mute/volume/position memory, will circle back after this is merged but I'd rather get this in so I can start on the other tickets before the release. I would just look at the last commit https://github.com/lbryio/lbry-desktop/pull/2707/commits/2b09d56b63c9d0b0187c0837475dfe9f781c1971 I responded to your change requests and did all the floating player stuff in that one commit.
kauffj (Migrated from github.com) reviewed 2019-08-13 17:27:08 +02:00
src/ui/redux/actions/content.js
kauffj (Migrated from github.com) commented 2019-08-13 17:27:08 +02:00
Copy link

@seanyesmunt I heard the answer to this but I still question it. I say remove.

@seanyesmunt I heard the answer to this but I still question it. I say remove.
kauffj (Migrated from github.com) approved these changes 2019-08-13 18:11:10 +02:00
kauffj (Migrated from github.com) left a comment
Copy link

Code can be shipped, but some UX feedback left in Slack

Code can be shipped, but some UX feedback left in Slack
Sign in to join this conversation.
Reviewers
No reviewers
kauffj
Labels
Clear labels   
accessibility

   
app-parity

   
area: creator

   
area: daemon

   
area: design

   
area: devops

   
area: discovery

   
area: docs

   
area: installer

   
area: internal

   
area: livestream

   
area: performance

   
area: proposal

Work is part of a proposal

  
area: reposts

   
area: rewards

   
area: search

   
area: security

   
area: subscriptions

   
area: sync

   
area: ux

   
area: viewer

   
area: wallet

   
BEAMER

Beamer is waiting on you!

  
channel

   
comments

   
community PR

   
consider soon

Discuss this issue at the next planning meeting, then remove this label

  
core team

   
css

   
dependencies

   
electron

   
Epic

   
feature request

   
first-timers-only

   
good first issue

   
hacktoberfest

Welcome to Hacktoberfest

  
help wanted

   
hub-dependent

   
icebox

Long-term storage

  
Invalid

   
level: 0

   
level: 1

No knowledge of the existing code required

  
level: 2

Some knowledge of the existing code is recommended

  
level: 3

Significant knowledge of the existing code is recommended

  
level: 4

Intimate knowledge of the existing code is recommended

  
merge when green

   
needs: exploration

Solution unclear, needs research

  
needs: grooming

Issue needs to be groomed before work can start

  
needs: priority

Priority level needs to be defined

  
needs: repro

Issue needs step-by-step instructions on how to reproduce in latest code

  
needs: tech design

Needs technical design signoff before implementation can begin

  
notifications

   
odysee

   
on hold

Temporarily paused

  
playlists

   
priority: blocker

Issue is blocking release, do ASAP

  
priority: high

Work needs to be moved into sprint ASAP

  
priority: low

Work should be done but can stay in the backlog for now

  
priority: medium

Work needs to be done within 2-3 sprints

  
protocol dependent

   
recsys

   
redesign

general redesign not prioritize for anyone release

  
regression

   
resilience

   
sdk dependent

Requires work on lbry-sdk repo

  
Tom's Wishlist

   
trending

   
type: bug

Existing functionality is wrong or broken

  
type: discussion

A conversation. No specific changes requested

  
type: improvement

Existing (or partially existing) functionality needs to be changed

  
type: new feature

New functionality that does not exist yet

  
type: refactor

Minimal user-visible changes, but significant internal work

  
type: task

Either work that's not related to the code, or a small chore that does not fit into other categories

  
type: testing

Solution needs additional user testing

  
unplanned

Work that was not planned into the spirnt, took priority over planned work

  
windows
No labels
accessibility
app-parity
area: creator
area: daemon
area: design
area: devops
area: discovery
area: docs
area: installer
area: internal
area: livestream
area: performance
area: proposal
area: reposts
area: rewards
area: search
area: security
area: subscriptions
area: sync
area: ux
area: viewer
area: wallet
BEAMER
channel
comments
community PR
consider soon
core team
css
dependencies
electron
Epic
feature request
first-timers-only
good first issue
hacktoberfest
help wanted
hub-dependent
icebox
Invalid
level: 0
level: 1
level: 2
level: 3
level: 4
merge when green
needs: exploration
needs: grooming
needs: priority
needs: repro
needs: tech design
notifications
odysee
on hold
playlists
priority: blocker
priority: high
priority: low
priority: medium
protocol dependent
recsys
redesign
regression
resilience
sdk dependent
Tom's Wishlist
trending
type: bug
type: discussion
type: improvement
type: new feature
type: refactor
type: task
type: testing
unplanned
windows
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: LBRYCommunity/lbry-desktop#2707
No description provided.
Delete branch "not-streaming-but-streaming"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?