Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
528
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
386b17a0
Commit
386b17a0
authored
6 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Make browser provider reusable
parent
11dcb0c9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt
+19
-8
19 additions, 8 deletions
...android/src/org/videolan/vlc/providers/BrowserProvider.kt
vlc-android/src/org/videolan/vlc/providers/FilePickerProvider.kt
+1
-1
1 addition, 1 deletion
...roid/src/org/videolan/vlc/providers/FilePickerProvider.kt
with
20 additions
and
9 deletions
vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt
+
19
−
8
View file @
386b17a0
...
...
@@ -53,7 +53,7 @@ abstract class BrowserProvider(val dataset: LiveDataset<MediaLibraryItem>, val u
init
{
fetch
()
}
protected
lateinit
var
mediabrowser
:
MediaBrowser
protected
var
mediabrowser
:
MediaBrowser
?
=
null
private
val
foldersContentMap
=
SimpleArrayMap
<
MediaLibraryItem
,
MutableList
<
MediaLibraryItem
>>()
private
lateinit
var
browserChannel
:
Channel
<
Media
>
...
...
@@ -63,7 +63,7 @@ abstract class BrowserProvider(val dataset: LiveDataset<MediaLibraryItem>, val u
internal
val
medialibrary
=
Medialibrary
.
getInstance
()
protected
open
fun
initBrowser
()
{
if
(
!
this
::
mediabrowser
.
isInitialized
)
mediabrowser
=
MediaBrowser
(
VLCInstance
.
get
(),
this
,
browserHandler
)
if
(
mediabrowser
==
null
)
mediabrowser
=
MediaBrowser
(
VLCInstance
.
get
(),
this
,
browserHandler
)
}
open
fun
fetch
()
{
...
...
@@ -86,7 +86,10 @@ abstract class BrowserProvider(val dataset: LiveDataset<MediaLibraryItem>, val u
browserChannel
=
Channel
(
Channel
.
UNLIMITED
)
requestBrowsing
(
url
)
job
=
uiJob
(
false
)
{
for
(
media
in
browserChannel
)
addMedia
(
findMedia
(
media
))
for
(
media
in
browserChannel
)
{
if
(
isActive
)
addMedia
(
findMedia
(
media
))
else
return
@uiJob
}
parseSubDirectories
()
}
}
...
...
@@ -106,7 +109,7 @@ abstract class BrowserProvider(val dataset: LiveDataset<MediaLibraryItem>, val u
return
true
}
private
suspend
fun
parseSubDirectories
()
{
internal
open
suspend
fun
parseSubDirectories
()
{
if
(
dataset
.
value
.
isEmpty
())
return
val
currentMediaList
=
dataset
.
value
.
toList
()
launch
(
browserContext
,
parent
=
job
)
{
...
...
@@ -133,7 +136,7 @@ abstract class BrowserProvider(val dataset: LiveDataset<MediaLibraryItem>, val u
}
// request parsing
browserChannel
=
Channel
(
Channel
.
UNLIMITED
)
mediabrowser
.
browse
(
current
.
uri
,
0
)
mediabrowser
?
.
browse
(
current
.
uri
,
0
)
// retrieve subitems
for
(
media
in
browserChannel
)
{
val
type
=
media
.
type
...
...
@@ -193,13 +196,21 @@ abstract class BrowserProvider(val dataset: LiveDataset<MediaLibraryItem>, val u
private
fun
requestBrowsing
(
url
:
String
?)
=
launch
(
browserContext
)
{
initBrowser
()
if
(
url
!=
null
)
mediabrowser
.
browse
(
Uri
.
parse
(
url
),
getFlags
())
else
mediabrowser
.
discoverNetworkShares
()
mediabrowser
?.
let
{
if
(
url
!=
null
)
it
.
browse
(
Uri
.
parse
(
url
),
getFlags
())
else
it
.
discoverNetworkShares
()
}
}
fun
stop
()
=
job
?.
cancel
()
fun
release
()
=
launch
(
BrowserProvider
.
browserContext
)
{
if
(
this
@BrowserProvider
::
mediabrowser
.
isInitialized
)
mediabrowser
.
release
()
}
fun
release
()
=
launch
(
BrowserProvider
.
browserContext
)
{
if
(
this
@BrowserProvider
::
browserChannel
.
isInitialized
)
browserChannel
.
close
()
mediabrowser
?.
let
{
it
.
release
()
mediabrowser
=
null
}
}
fun
saveList
(
media
:
MediaWrapper
)
=
foldersContentMap
[
media
]
?.
let
{
if
(!
it
.
isEmpty
())
prefetchLists
[
media
.
location
]
=
it
}
...
...
This diff is collapsed.
Click to expand it.
vlc-android/src/org/videolan/vlc/providers/FilePickerProvider.kt
+
1
−
1
View file @
386b17a0
...
...
@@ -34,7 +34,7 @@ class FilePickerProvider(dataset: LiveDataset<MediaLibraryItem>, url: String?) :
override
fun
initBrowser
()
{
super
.
initBrowser
()
mediabrowser
.
setIgnoreFileTypes
(
"db,nfo,ini,jpg,jpeg,ljpg,gif,png,pgm,pgmyuv,pbm,pam,tga,bmp,pnm,xpm,xcf,pcx,tif,tiff,lbm,sfv"
)
mediabrowser
?
.
setIgnoreFileTypes
(
"db,nfo,ini,jpg,jpeg,ljpg,gif,png,pgm,pgmyuv,pbm,pam,tga,bmp,pnm,xpm,xcf,pcx,tif,tiff,lbm,sfv"
)
}
override
fun
addMedia
(
media
:
MediaLibraryItem
)
{
...
...
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