Get torrent
@@ -119,46 +141,27 @@
-
-
-
-
- Advanced search
-
-
-
-
Category
-
- Movie
- TV series
- Video
- Music
- Software
- Game
- Image
- Audio
- Misc
-
-
- Fliter
-
-
-
+
+
@@ -224,7 +227,6 @@
var DBDeleteRequest = window.indexedDB.deleteDatabase("FLO_Torrent");
DBDeleteRequest.onsuccess = function (event) {
console.log("Database deleted successfully");
- alert("Successfully Cleared Local Data!");
};
}
@@ -549,6 +551,7 @@
className: 'progress-indicator flex align-center',
innerHTML: `
+
0% done
`
})
@@ -574,7 +577,6 @@
}
}, 300);
}).catch(error => {
- alert(error);
console.error(error);
})
}
@@ -865,6 +867,18 @@
card.querySelector('.torrent-card__uploader').textContent = `by ${uploader}`
card.querySelector('.torrent-card__icon').innerHTML = getIcon(type)
return card
+ },
+ filterOption(obj){
+ const {content, groupName, value} = obj
+ const option = create('label', {
+ className: 'filter-option'
+ })
+
+ option.innerHTML = `
+
+
${content}
+ `
+ return option
}
}
function getIcon(type) {
@@ -917,9 +931,9 @@
function pushParams() {
let params = ''
- for (let prop in advancedSearch) {
- if (prop !== 'isActive' && advancedSearch[prop] && advancedSearch[prop] !== '') {
- params += `${prop}=${advancedSearch[prop]}&`
+ for (let prop in filteredSearch) {
+ if (prop !== 'isActive' && filteredSearch[prop] && filteredSearch[prop] !== '') {
+ params += `${prop}=${filteredSearch[prop]}&`
}
}
if (params.slice(-1) === '&') {
@@ -928,7 +942,7 @@
history.pushState(null, null, `?${params}#search`)
}
- let advancedSearch = {
+ let filteredSearch = {
active: false,
query: '',
category: ''
@@ -937,14 +951,15 @@
let lastCategory = ''
async function renderSearchResult(searchKey, shouldFilter = false) {
- if (lastQuery !== searchKey || shouldFilter || advancedSearch.category !== lastCategory) {
+ debugger
+ if (lastQuery !== searchKey || shouldFilter || filteredSearch.category !== lastCategory) {
if (shouldFilter) {
searchKey = getRef('advance_torrent_search').value.trim() !== '' ? getRef('advance_torrent_search').value.trim() : lastQuery
}
- advancedSearch['query'] = searchKey
+ filteredSearch['query'] = searchKey
let result
- if (advancedSearch.isActive) {
- result = await getFilteredTorrents(['type'], advancedSearch.category)
+ if (filteredSearch.isActive) {
+ result = await getFilteredTorrents(['type'], filteredSearch.category)
result = await getFilteredTorrents(['name', 'filename', 'tags'], searchKey, {torrents: result})
}
else {
@@ -969,11 +984,28 @@
}
lastQuery = searchKey
- lastCategory = advancedSearch.category
- showPage('search')
+ lastCategory = filteredSearch.category
}
}
+ const categories = ['movie', 'tv series', 'video', 'music', 'software', 'game', 'image', 'audio', 'misc']
+
+ function renderOptions(list, options){
+ const {groupName} = options
+ const frag = document.createDocumentFragment()
+ list.forEach(item => {
+ const optionObj = {
+ content: item,
+ groupName,
+ value: item
+ }
+ frag.append(render.filterOption(optionObj))
+ })
+ return frag
+ }
+
+ let currentpage = ''
+
async function showPage(target) {
let params = getSearchParams()
let page = target.includes('#') ? target.split('#')[1] : target
@@ -981,19 +1013,23 @@
case 'loading_page':
break;
case 'search':
+ if(currentpage !== page){
+ getRef('category_selector').innerHTML = ''
+ getRef('category_selector').append(renderOptions(categories, {groupName: 'category-selector'}))
+ }
if (params.query) {
if (params.category) {
- advancedSearch = {
+ filteredSearch = {
isActive: true,
...params
}
- getRef('advance_search_switch').checked = true
- getRef('advance_search_panel').classList.remove('hide-completely')
+ const selectedCategory = getRef('category_selector').querySelector(`[value="${filteredSearch.category}"]`)
+ if(selectedCategory){
+ selectedCategory.checked = true
+ }
}
else{
- advancedSearch.category = 'movie'
- getRef('advance_search_switch').checked = false
- getRef('advance_search_panel').classList.add('hide-completely')
+ resetFilter()
}
renderSearchResult(params.query)
}
@@ -1006,6 +1042,7 @@
getRef('torrent_description').textContent = description
getRef('torrent_tags').textContent = tags.split('/').join('•')
getRef('torrent_uploader').textContent = `Uploaded by ${uploader}`
+ getRef('torrent_index_tx').href = `https://livenet.flocha.in/tx/${startTx}`
break;
case 'browse':
const category = getRef('browse_category_selector').value
@@ -1019,8 +1056,11 @@
getRef('torrent_container').innerHTML = ``
getRef('torrent_container').append(renderTorrents(allTorrents))
}
- document.querySelector('.page:not(.hide-completely)')?.classList.add('hide-completely')
- getRef(page).classList.remove('hide-completely')
+ if(currentpage !== page){
+ document.querySelector('.page:not(.hide-completely)')?.classList.add('hide-completely')
+ getRef(page).classList.remove('hide-completely')
+ currentpage = page
+ }
}
function alphaIncSort(arr, prop) {
@@ -1105,6 +1145,41 @@
}
}
+ function handleEnter(e){
+ if (e.target.value.trim() !== '') {
+ switch (e.key) {
+ case 'Enter':
+ const searchKey = e.target.value.trim()
+ renderSearchResult(searchKey)
+ pushParams()
+ showPage('search')
+ e.target.value = ''
+ break;
+ case 'ArrowDown':
+ e.preventDefault()
+ e.target.nextElementSibling.firstElementChild.focus()
+ break;
+ }
+ }
+ }
+
+ function handleKeyboardNav(e){
+ switch (e.key) {
+ case 'ArrowUp':
+ e.preventDefault()
+ if (e.target.previousElementSibling)
+ e.target.previousElementSibling.focus()
+ else
+ e.target.parentNode.previousElementSibling.focusIn()
+ break;
+ case 'ArrowDown':
+ e.preventDefault()
+ if (e.target.nextElementSibling)
+ e.target.nextElementSibling.focus()
+ break;
+ }
+ }
+
// Event listeners
window.addEventListener('load', e => {
@@ -1133,40 +1208,11 @@
downloadTorrent(filename, startTx, chunks, cardId)
}
})
- getRef('search_torrent').addEventListener('keydown', async e => {
- if (e.target.value.trim() !== '') {
- switch (e.key) {
- case 'Enter':
- const searchKey = getRef('search_torrent').value.trim()
- renderSearchResult(searchKey)
- pushParams()
- break;
- case 'ArrowDown':
- e.preventDefault()
- getRef('search_suggestions').firstElementChild.focus()
- break;
- }
- }
- })
+ getRef('search_torrent').addEventListener('keydown', handleEnter)
+ getRef('advance_torrent_search').addEventListener('keydown', handleEnter)
getRef('search_suggestions').addEventListener('keydown', handleKeyboardNav)
getRef('advance_search_suggestions').addEventListener('keydown', handleKeyboardNav)
-
- function handleKeyboardNav(e){
- switch (e.key) {
- case 'ArrowUp':
- e.preventDefault()
- if (e.target.previousElementSibling)
- e.target.previousElementSibling.focus()
- else
- e.target.parentNode.previousElementSibling.focusIn()
- break;
- case 'ArrowDown':
- e.preventDefault()
- if (e.target.nextElementSibling)
- e.target.nextElementSibling.focus()
- break;
- }
- }
+
getRef('search_torrent').addEventListener('input', async e => {
throttle(() => {
const searchKey = getRef('search_torrent').value.trim()
@@ -1179,38 +1225,8 @@
renderSearchSuggestions(searchKey, true)
}, 100)
})
- getRef('advance_torrent_search').addEventListener('keydown', async e => {
- if (e.target.value.trim() !== '') {
- switch (e.key) {
- case 'Enter':
- const searchKey = e.target.value.trim()
- renderSearchResult(searchKey)
- pushParams()
- break;
- case 'ArrowDown':
- e.preventDefault()
- getRef('advance_search_suggestions').firstElementChild.focus()
- break;
- }
- }
- })
- getRef('advance_search_switch').addEventListener('change', e => {
- if (e.detail.value) {
- advancedSearch = {
- isActive: true,
- category: getRef('category_selector').value
- }
- getRef('advance_search_panel').classList.remove('hide-completely')
- }
- else {
- advancedSearch.isActive = false
- advancedSearch.category = ''
- getRef('advance_search_panel').classList.add('hide-completely')
- }
- advancedSearch['query'] = getRef('advance_torrent_search').value.trim()
- })
getRef('category_selector').addEventListener('change', e => {
- advancedSearch.category = e.detail.value
+ filteredSearch.category = e.target.value
})
getRef('browse_category_selector').addEventListener('change', e => {
showCategoryTorrents(e.detail.value)
@@ -1240,6 +1256,18 @@
getRef('search_result').append(renderTorrents(result.slice(startIndex, endIndex)))
}, 200);
})
+ function addFilter(){
+ if(filteredSearch.category){
+ filteredSearch.isActive = true
+ }
+ renderSearchResult('', true);
+ pushParams();
+ }
+ function resetFilter(){
+ filteredSearch.isActive = false
+ filteredSearch.category = undefined
+ getRef('filter_form').reset()
+ }