sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-19 21:46:11 +05:00
Code Issues Packages Projects Releases Wiki Activity

mini cache shows all aompleted and inProgress blocks

Browse Source
This commit is contained in:
Daniel Shleifman
2021-06-03 13:03:10 +03:00
parent e62e0a1567
commit da3cb51fc3
3 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/package.json
View File

@@ -19,7 +19,8 @@
"react-konva": "^17.0.2-4", "react-konva": "^17.0.2-4",
"react-measure": "^2.5.2", "react-measure": "^2.5.2",
"react-scripts": "4.0.3", "react-scripts": "4.0.3",
"styled-components": "^5.3.0" "styled-components": "^5.3.0",
"uuid": "^8.3.2"
}, },
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",

89
web/src/components/DialogTorrentDetailsContent/TorrentCache.jsx
View File

@@ -3,13 +3,14 @@ import DialogContent from '@material-ui/core/DialogContent'
import { Stage, Layer } from 'react-konva' import { Stage, Layer } from 'react-konva'
import Measure from 'react-measure' import Measure from 'react-measure'
import isEqual from 'lodash/isEqual' import isEqual from 'lodash/isEqual'
import { v4 as uuidv4 } from 'uuid'
import SingleBlock from './SingleBlock' import SingleBlock from './SingleBlock'
import { useCreateCacheMap } from './customHooks' import { useCreateCacheMap } from './customHooks'
const TorrentCache = memo( const TorrentCache = memo(
({ cache, isMini }) => { ({ cache, isMini }) => {
const [dimensions, setDimensions] = useState({ width: -1, height: -1 }) const [dimensions, setDimensions] = useState({ width: 0, height: 0 })
const [stageSettings, setStageSettings] = useState({ const [stageSettings, setStageSettings] = useState({
boxHeight: null, boxHeight: null,
strokeWidth: null, strokeWidth: null,
@@ -41,9 +42,16 @@ const TorrentCache = memo(
const amountOfBlocksToRenderInShortView = const amountOfBlocksToRenderInShortView =
preloadPiecesAmount === piecesInOneRow preloadPiecesAmount === piecesInOneRow
? preloadPiecesAmount - 1 ? preloadPiecesAmount - 1
: preloadPiecesAmount + piecesInOneRow - (preloadPiecesAmount % piecesInOneRow) - 1 : preloadPiecesAmount + piecesInOneRow - (preloadPiecesAmount % piecesInOneRow) - 1 || 0
const amountOfRows = Math.ceil((isMini ? amountOfBlocksToRenderInShortView : cacheMap.length) / piecesInOneRow) const amountOfRows = Math.ceil((isMini ? amountOfBlocksToRenderInShortView : cacheMap.length) / piecesInOneRow)
let activeId = null const activeId = null
const cacheMapWithoutEmptyBlocks = cacheMap.filter(({ isComplete, inProgress }) => inProgress || isComplete)
const extraEmptyBlocksForFillingLine =
cacheMapWithoutEmptyBlocks.length < amountOfBlocksToRenderInShortView
? new Array(amountOfBlocksToRenderInShortView - cacheMapWithoutEmptyBlocks.length + 1).fill({})
: []
const shortCacheMap = [...cacheMapWithoutEmptyBlocks, ...extraEmptyBlocksForFillingLine]
return ( return (
<Measure bounds onResize={({ bounds }) => setDimensions(bounds)}> <Measure bounds onResize={({ bounds }) => setDimensions(bounds)}>
@@ -57,45 +65,46 @@ const TorrentCache = memo(
height={stageOffset + blockSizeWithMargin * amountOfRows || 0} height={stageOffset + blockSizeWithMargin * amountOfRows || 0}
> >
<Layer> <Layer>
{cacheMap.map(({ id, percentage, isComplete, inProgress, isActive, isReaderRange }) => { {isMini
const currentRow = Math.floor((isMini ? id - activeId : id) / piecesInOneRow) ? shortCacheMap.map(({ percentage, isComplete, inProgress, isActive, isReaderRange }, i) => {
const currentRow = Math.floor(i / piecesInOneRow)
const shouldBeRendered = inProgress || isComplete || i <= amountOfBlocksToRenderInShortView
// -------- related only for short view ------- return (
if (isActive) activeId = id shouldBeRendered && (
const shouldBeRendered = <SingleBlock
isActive || (id - activeId <= amountOfBlocksToRenderInShortView && id - activeId >= 0) key={uuidv4()}
// -------------------------------------------- x={(i % piecesInOneRow) * blockSizeWithMargin}
y={currentRow * blockSizeWithMargin}
percentage={percentage}
inProgress={inProgress}
isComplete={isComplete}
isReaderRange={isReaderRange}
isActive={isActive}
boxHeight={boxHeight}
strokeWidth={strokeWidth}
/>
)
)
})
: cacheMap.map(({ id, percentage, isComplete, inProgress, isActive, isReaderRange }) => {
const currentRow = Math.floor((isMini ? id - activeId : id) / piecesInOneRow)
return isMini ? ( return (
shouldBeRendered && ( <SingleBlock
<SingleBlock key={uuidv4()}
key={id} x={(id % piecesInOneRow) * blockSizeWithMargin}
x={((id - activeId) % piecesInOneRow) * blockSizeWithMargin} y={currentRow * blockSizeWithMargin}
y={currentRow * blockSizeWithMargin} percentage={percentage}
percentage={percentage} inProgress={inProgress}
inProgress={inProgress} isComplete={isComplete}
isComplete={isComplete} isReaderRange={isReaderRange}
isReaderRange={isReaderRange} isActive={isActive}
isActive={isActive} boxHeight={boxHeight}
boxHeight={boxHeight} strokeWidth={strokeWidth}
strokeWidth={strokeWidth} />
/> )
) })}
) : (
<SingleBlock
key={id}
x={(id % piecesInOneRow) * blockSizeWithMargin}
y={currentRow * blockSizeWithMargin}
percentage={percentage}
inProgress={inProgress}
isComplete={isComplete}
isReaderRange={isReaderRange}
isActive={isActive}
boxHeight={boxHeight}
strokeWidth={strokeWidth}
/>
)
})}
</Layer> </Layer>
</Stage> </Stage>
</DialogContent> </DialogContent>

2
web/yarn.lock
View File

@@ -12428,7 +12428,7 @@ uuid@^3.3.2, uuid@^3.4.0:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
uuid@^8.3.0: uuid@^8.3.0, uuid@^8.3.2:
version "8.3.2" version "8.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==