evan/deemixer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-organized main search methods, changed Utils export

Browse Source
This commit is contained in:
Roberto Tonino 2020-04-23 21:26:47 +02:00
parent da41d8f58b
commit 2c887d9e28
4 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
public/js/modules/main-search.js
View File

@ -57,13 +57,13 @@ const MainSearch = new Vue({
switch (topResultType) {
case 'artist':
artistView(event)
this.artistView(event)
break
case 'album':
albumView(event)
this.albumView(event)
break
case 'playlist':
playlistView(event)
this.playlistView(event)
break
default:
@ -114,24 +114,20 @@ const MainSearch = new Vue({
nb: 30
})
}
}
}
}).$mount('#search_tab')
socket.on('mainSearch', result => {
},
handleMainSearch(result) {
let resetObj = { data: [], next: 0, total: 0, loaded: false }
MainSearch.results.allTab = result
MainSearch.results.query = result.QUERY
MainSearch.results.trackTab = { ...resetObj }
MainSearch.results.albumTab = { ...resetObj }
MainSearch.results.artistTab = { ...resetObj }
MainSearch.results.playlistTab = { ...resetObj }
this.results.allTab = result
this.results.query = result.QUERY
this.results.trackTab = { ...resetObj }
this.results.albumTab = { ...resetObj }
this.results.artistTab = { ...resetObj }
this.results.playlistTab = { ...resetObj }
document.getElementById('search_all_tab').click()
document.getElementById('search_tab_content').style.display = 'block'
document.getElementById('main_search_tablink').click()
})
socket.on('search', result => {
},
handleSearch(result) {
let next = 0
if (result.next) {
@ -140,15 +136,21 @@ socket.on('search', result => {
next = result.total
}
if (MainSearch.results[result.type + 'Tab'].total != result.total) {
MainSearch.results[result.type + 'Tab'].total = result.total
if (this.results[result.type + 'Tab'].total != result.total) {
this.results[result.type + 'Tab'].total = result.total
}
if (MainSearch.results[result.type + 'Tab'].next != next) {
MainSearch.results[result.type + 'Tab'].next = next
MainSearch.results[result.type + 'Tab'].data = MainSearch.results[result.type + 'Tab'].data.concat(result.data)
if (this.results[result.type + 'Tab'].next != next) {
this.results[result.type + 'Tab'].next = next
this.results[result.type + 'Tab'].data = this.results[result.type + 'Tab'].data.concat(result.data)
}
MainSearch.results[result.type + 'Tab'].loaded = true
})
this.results[result.type + 'Tab'].loaded = true
}
},
mounted() {
socket.on('mainSearch', this.handleMainSearch)
socket.on('search', this.handleSearch)
}
}).$mount('#search_tab')
export default MainSearch

2
public/js/modules/search.js
View File

@ -1,5 +1,5 @@
import MainSearch from './main-search.js'
import * as Utils from './utils.js'
import Utils from './utils.js'
import QualityModal from './quality-modal.js'
import Downloads from './downloads.js'
import { socket } from './socket.js'

3
public/js/modules/tracklist-tab.js
View File

@ -4,7 +4,6 @@ import Downloads from './downloads.js'
import QualityModal from './quality-modal.js'
const TracklistTab = new Vue({
el: '#tracklist_tab',
data: {
title: '',
metadata: '',
@ -116,6 +115,6 @@ const TracklistTab = new Vue({
socket.on('show_album', this.showAlbum)
socket.on('show_playlist', this.showPlaylist)
}
})
}).$mount('#tracklist_tab')
export default TracklistTab

15
public/js/modules/utils.js
View File

@ -1,4 +1,4 @@
export function isValidURL(text) {
function isValidURL(text) {
if (text.toLowerCase().startsWith('http')) {
if (text.toLowerCase().indexOf('deezer.com') >= 0 || text.toLowerCase().indexOf('open.spotify.com') >= 0)
return true
@ -6,7 +6,7 @@ export function isValidURL(text) {
return false
}
export function convertDuration(duration) {
function convertDuration(duration) {
//convert from seconds only to mm:ss format
let mm, ss
mm = Math.floor(duration / 60)
@ -18,7 +18,7 @@ export function convertDuration(duration) {
return mm + ':' + ss
}
export function convertDurationSeparated(duration) {
function convertDurationSeparated(duration) {
let hh, mm, ss
mm = Math.floor(duration / 60)
hh = Math.floor(mm / 60)
@ -29,7 +29,7 @@ export function convertDurationSeparated(duration) {
// On scroll event, returns currentTarget = null
// Probably on other events too
export function debounce(func, wait, immediate) {
function debounce(func, wait, immediate) {
var timeout
return function () {
var context = this
@ -44,3 +44,10 @@ export function debounce(func, wait, immediate) {
if (callNow) func.apply(context, args)
}
}
export default {
isValidURL,
convertDuration,
convertDurationSeparated,
debounce
}