mirror_html/filegator
1
0
Fork 0
mirror of https://github.com/filegator/filegator.git synced 2025-08-09 06:07:04 +02:00
Code Issues Projects Releases Wiki Activity

fix for filter_entries used on selection

Browse Source
This commit is contained in:
Milos Stojanovic
2021-01-13 10:21:49 +01:00
parent caa9c1ef8d
commit fa066e7bfb
1 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
frontend/views/Browser.vue
View File

@@ -146,12 +146,12 @@
</template>
</b-table>
<section class="is-flex is-justify-between">
<section id="bottom-info" class="is-flex is-justify-between">
<div>
<span>{{ lang('Selected', checked.length, totalCount) }}</span>
</div>
<div v-if="(showAllEntries || hasFilteredEntries) ">
<input type="checkbox" id="checkbox" v-model="showAllEntries" @click="loadFiles">
<input type="checkbox" id="checkbox" @click="toggleHidden">
<label for="checkbox"> {{ lang('Show hidden') }}</label>
</div>
</section>
@@ -224,9 +224,8 @@ export default {
to: to.query.cd
})
.then(ret => {
ret.files = this.filterEntries(ret.files)
this.$store.commit('setCwd', {
content: ret.files,
content: this.filterEntries(ret.files),
location: ret.location,
})
this.isLoading = false
@@ -243,47 +242,51 @@ export default {
}
},
methods: {
toggleHidden() {
this.showAllEntries = !this.showAllEntries
this.loadFiles()
this.checked = []
},
filterEntries(files){
var filter_entries = this.$store.state.config.filter_entries
this.hasFilteredEntries = false
if (!this.showAllEntries && typeof filter_entries !== 'undefined' && filter_entries.length > 0){
let filteredFiles = []
_.forEach(files, (file) => {
let filterContinue = false
_.forEach(filter_entries, (ffilter_Entry) => {
if (typeof ffilter_Entry !== 'undefined' && ffilter_Entry.length > 0){
let filter_Entry = ffilter_Entry
let filterEntry_type = filter_Entry.endsWith('/')? 'dir':'file'
filter_Entry = filter_Entry.replace(/\/$/, '')
let filterEntry_isFullPath = filter_Entry.startsWith('/')
let filterEntry_tmpName = filterEntry_isFullPath? '/'+file.path : file.name
filter_Entry = filterEntry_isFullPath? '/'+filter_Entry : filter_Entry
filter_Entry = filter_Entry.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.$&')
let thisRegex = new RegExp('^'+filter_Entry+'$', 'iu')
if(file.type == filterEntry_type && thisRegex.test(filterEntry_tmpName))
{
filterContinue = true
this.hasFilteredEntries = true
return false
}
}
})
if(!filterContinue){
filteredFiles.push(file)
}
})
return filteredFiles
let filteredFiles = []
_.forEach(files, (file) => {
let filterContinue = false
_.forEach(filter_entries, (ffilter_Entry) => {
if (typeof ffilter_Entry !== 'undefined' && ffilter_Entry.length > 0){
let filter_Entry = ffilter_Entry
let filterEntry_type = filter_Entry.endsWith('/')? 'dir':'file'
filter_Entry = filter_Entry.replace(/\/$/, '')
let filterEntry_isFullPath = filter_Entry.startsWith('/')
let filterEntry_tmpName = filterEntry_isFullPath? '/'+file.path : file.name
filter_Entry = filterEntry_isFullPath? '/'+filter_Entry : filter_Entry
filter_Entry = filter_Entry.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.$&')
let thisRegex = new RegExp('^'+filter_Entry+'$', 'iu')
if(file.type == filterEntry_type && thisRegex.test(filterEntry_tmpName))
{
filterContinue = true
this.hasFilteredEntries = true
return false
}
}
})
if(!filterContinue){
filteredFiles.push(file)
}
})
return filteredFiles
}
return files
return files
},
loadFiles() {
api.getDir({
to: '',
})
.then(ret => {
ret.files = this.filterEntries(ret.files)
this.$store.commit('setCwd', {
content: ret.files,
content: this.filterEntries(ret.files),
location: ret.location,
})
})
@@ -626,6 +629,9 @@ export default {
#multi-actions a {
margin: 0 15px 15px 0;
}
#bottom-info {
padding: 15px 0;
}
.file-row a {
color: #373737;
}