Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
532
Issue boards
Milestones
Wiki
Code
Merge requests
14
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
0655ce54
Commit
0655ce54
authored
5 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Storage: override refresh function to filter items
Fix #897 (cherry picked from commit
082fb7ee
)
parent
cafc745d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#7566
passed with stage
in 3 minutes and 50 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt
+3
-3
3 additions, 3 deletions
...android/src/org/videolan/vlc/providers/BrowserProvider.kt
vlc-android/src/org/videolan/vlc/providers/StorageProvider.kt
+16
-1
16 additions, 1 deletion
...android/src/org/videolan/vlc/providers/StorageProvider.kt
with
19 additions
and
4 deletions
vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt
+
3
−
3
View file @
0655ce54
...
...
@@ -57,7 +57,7 @@ abstract class BrowserProvider(val context: Context, val dataset: LiveDataset<Me
protected
var
mediabrowser
:
MediaBrowser
?
=
null
private
val
foldersContentMap
=
SimpleArrayMap
<
MediaLibraryItem
,
MutableList
<
MediaLibraryItem
>>()
pr
ivate
lateinit
var
browserChannel
:
Channel
<
Media
>
pr
otected
lateinit
var
browserChannel
:
Channel
<
Media
>
protected
var
job
:
Job
?
=
null
private
val
showAll
=
Settings
.
getInstance
(
context
).
getBoolean
(
"browser_show_all_files"
,
true
)
...
...
@@ -125,7 +125,7 @@ abstract class BrowserProvider(val context: Context, val dataset: LiveDataset<Me
if
(!
browserActor
.
isClosedForSend
)
browserActor
.
offer
(
ParseSubDirectories
)
}
open
fun
refreshImpl
()
{
open
suspend
fun
refreshImpl
()
{
browserChannel
=
Channel
(
Channel
.
UNLIMITED
)
requestBrowsing
(
url
)
job
=
launch
{
...
...
@@ -228,7 +228,7 @@ abstract class BrowserProvider(val context: Context, val dataset: LiveDataset<Me
return
flags
}
pr
ivate
fun
requestBrowsing
(
url
:
String
?)
=
launch
(
Dispatchers
.
IO
)
{
pr
otected
fun
requestBrowsing
(
url
:
String
?)
=
launch
(
Dispatchers
.
IO
)
{
mutex
.
withLock
{
initBrowser
()
mediabrowser
?.
let
{
...
...
This diff is collapsed.
Click to expand it.
vlc-android/src/org/videolan/vlc/providers/StorageProvider.kt
+
16
−
1
View file @
0655ce54
...
...
@@ -23,6 +23,10 @@ package org.videolan.vlc.providers
import
android.content.Context
import
android.net.Uri
import
android.text.TextUtils
import
kotlinx.coroutines.channels.Channel
import
kotlinx.coroutines.channels.filter
import
kotlinx.coroutines.channels.mapTo
import
org.videolan.libvlc.Media
import
org.videolan.medialibrary.media.MediaLibraryItem
import
org.videolan.medialibrary.media.MediaWrapper
import
org.videolan.medialibrary.media.Storage
...
...
@@ -66,4 +70,15 @@ class StorageProvider(context: Context, dataset: LiveDataset<MediaLibraryItem>,
}
else
if
(
media
.
itemType
!=
MediaLibraryItem
.
TYPE_STORAGE
)
return
super
.
addMedia
(
media
)
}
}
\ No newline at end of file
override
suspend
fun
refreshImpl
()
{
browserChannel
=
Channel
(
Channel
.
UNLIMITED
)
requestBrowsing
(
url
)
val
value
:
MutableList
<
MediaLibraryItem
>
=
browserChannel
.
filter
{
it
.
isStorage
()
}.
mapTo
(
mutableListOf
())
{
Storage
(
it
.
uri
)}
dataset
.
postValue
(
value
)
parseSubDirectories
()
loading
.
postValue
(
false
)
}
}
private
fun
Media
.
isStorage
()
=
type
==
Media
.
Type
.
Directory
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment