新增播放整个文件夹功能
新增下一首功能
This commit is contained in:
yutou
parent
76c064b14c
commit
806b257e81
@ -41,9 +41,16 @@ public class MusicController {
|
||||
@RequestMapping("list.do")
|
||||
@ResponseBody
|
||||
public String getMusicListOfPath(String path){
|
||||
if(StringUtils.isEmpty(path)||path.equals("root")){
|
||||
if(!StringUtils.isEmpty(path)&&!new File(path).exists()){
|
||||
path=base64ToString(path);
|
||||
}
|
||||
if(StringUtils.isEmpty(path)
|
||||
||path.equals("root")
|
||||
||!path.contains(defaultMusicPath)
|
||||
){
|
||||
path=defaultMusicPath;
|
||||
}
|
||||
|
||||
//path=path.replace(defaultMusicPath+File.separator,"");
|
||||
JSONObject json=new JSONObject();
|
||||
JSONObject data = new JSONObject();
|
||||
|
||||
@ -20,7 +20,7 @@ public class MusicTools {
|
||||
private static MusicTools tools;
|
||||
private String musicPath = "C:\\Users\\admin\\Music";
|
||||
private final List<MusicData> musicList = new ArrayList<>();
|
||||
private HashMap<String,List<MusicData>> musicMap=new HashMap<String,List<MusicData>>();
|
||||
private HashMap<String, List<MusicData>> musicMap = new HashMap<String, List<MusicData>>();
|
||||
private boolean isScan = false;
|
||||
|
||||
public static MusicTools getInstance() {
|
||||
@ -29,12 +29,13 @@ public class MusicTools {
|
||||
}
|
||||
return tools;
|
||||
}
|
||||
private MusicTools(){
|
||||
|
||||
private MusicTools() {
|
||||
scanMusic();
|
||||
}
|
||||
|
||||
public synchronized void scanMusic() {
|
||||
if(isScan){
|
||||
if (isScan) {
|
||||
return;
|
||||
}
|
||||
System.out.println("执行扫描");
|
||||
@ -76,12 +77,32 @@ public class MusicTools {
|
||||
}
|
||||
}
|
||||
}
|
||||
public List<MusicData> getPath(String path){
|
||||
if(musicMap.containsKey(path)){
|
||||
List<MusicData> list=new ArrayList<>();
|
||||
MusicData tmp=musicMap.get(path).isEmpty()?null:musicMap.get(path).get(0);
|
||||
if(tmp!=null){
|
||||
if(!tmp.getFile().getParent().equals(MusicController.defaultMusicPath)) {
|
||||
|
||||
public void getPathOrDir(String path, List<MusicData> list) {
|
||||
File files = new File(path);
|
||||
for (File file : files.listFiles()) {
|
||||
if (file.isFile()) {
|
||||
list.add(getMetadata(file));
|
||||
} else {
|
||||
getPathOrDir(file.getAbsolutePath(), list);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public List<MusicData> getPath(String path) {
|
||||
List<MusicData> list = new ArrayList<>();
|
||||
if (new File(path).isDirectory()&&!path.equals(MusicController.defaultMusicPath)) {
|
||||
for (String key : musicMap.keySet()) {
|
||||
if(key.startsWith(path)){
|
||||
list.addAll(musicMap.get(key));
|
||||
}
|
||||
}
|
||||
return list;
|
||||
}
|
||||
if (musicMap.containsKey(path)) {
|
||||
MusicData tmp = musicMap.get(path).isEmpty() ? null : musicMap.get(path).get(0);
|
||||
if (tmp != null) {
|
||||
if (!tmp.getFile().getParent().equals(MusicController.defaultMusicPath)) {
|
||||
MusicData t2 = new MusicData();
|
||||
t2.setTitle("返回");
|
||||
t2.setFile(new File(tmp.getLastDir()));
|
||||
@ -92,13 +113,14 @@ public class MusicTools {
|
||||
getDirList(path, list);
|
||||
list.addAll(musicMap.get(path));
|
||||
return list;
|
||||
}else{
|
||||
if(path.contains(MusicController.defaultMusicPath)){
|
||||
List<MusicData> list=new ArrayList<>();
|
||||
} else {
|
||||
if (path.contains(MusicController.defaultMusicPath)) {
|
||||
MusicData t2 = new MusicData();
|
||||
t2.setTitle("返回");
|
||||
t2.setFile(new File(path).getParentFile());
|
||||
list.add(t2);
|
||||
if (!path.equals(MusicController.defaultMusicPath)) {
|
||||
list.add(t2);
|
||||
}
|
||||
getDirList(path, list);
|
||||
return list;
|
||||
}
|
||||
@ -108,10 +130,10 @@ public class MusicTools {
|
||||
}
|
||||
|
||||
private void getDirList(String path, List<MusicData> list) {
|
||||
File file=new File(path);
|
||||
File file = new File(path);
|
||||
for (File listFile : file.listFiles()) {
|
||||
if(listFile.isDirectory()){
|
||||
MusicData data=new MusicData();
|
||||
if (listFile.isDirectory()) {
|
||||
MusicData data = new MusicData();
|
||||
data.setTitle(listFile.getName());
|
||||
data.setFile(listFile);
|
||||
list.add(data);
|
||||
@ -123,15 +145,15 @@ public class MusicTools {
|
||||
MusicData data = getMetadata(file);
|
||||
if (data != null) {
|
||||
musicList.add(data);
|
||||
String path=file.getAbsolutePath().replace(File.separator+file.getName(),"");
|
||||
String path = file.getAbsolutePath().replace(File.separator + file.getName(), "");
|
||||
List<MusicData> list;
|
||||
if(musicMap.containsKey(path)){
|
||||
list=musicMap.get(path);
|
||||
}else{
|
||||
list=new ArrayList<>();
|
||||
if (musicMap.containsKey(path)) {
|
||||
list = musicMap.get(path);
|
||||
} else {
|
||||
list = new ArrayList<>();
|
||||
}
|
||||
list.add(data);
|
||||
musicMap.put(path,list);
|
||||
musicMap.put(path, list);
|
||||
}
|
||||
}
|
||||
|
||||
@ -257,9 +279,9 @@ public class MusicTools {
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws Exception{
|
||||
public static void main(String[] args) throws Exception {
|
||||
String base = "bXVzaWMuaHRtbDo2MyBaOlzpn7PkuZBc55m75bGx5bCR5aWzXFtzM11bRURd6Imy6YGV44GE44Gu57%2B8XDAyLiAwMiDoibLpgZXjgYTjga7nv7wgKOOBguOBiuOBhOODkOODvOOCuOODp%2BODsykud2F2Cg%3D%3D";
|
||||
byte[] bytes=getInstance().getMetadata(new File("Z:\\音乐\\BanG Dream!\\Poppin'on!\\B.O.F.flac")).readImage();
|
||||
byte[] bytes = getInstance().getMetadata(new File("Z:\\音乐\\BanG Dream!\\Poppin'on!\\B.O.F.flac")).readImage();
|
||||
System.out.println(bytes.length);
|
||||
}
|
||||
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
<title>来点Music~</title>
|
||||
<link rel="stylesheet" href="/layui/css/layui.css">
|
||||
</head>
|
||||
<link href="/css/video-js.min.css" rel="stylesheet">
|
||||
<body>
|
||||
<div class="layui-layout layui-layout-admin">
|
||||
<div id="header"></div>
|
||||
@ -20,11 +19,13 @@
|
||||
<img src="/assets/defaultPlayImg.jpg" id="img" style="height: 200px; width: 200px"/>
|
||||
|
||||
<div style="display:inline-block;">
|
||||
<div id="playerNowList">播放列表:</div>
|
||||
<div id="title">标题:</div>
|
||||
<div id="artist">艺术家:</div>
|
||||
<div id="album">专辑:</div>
|
||||
<div id="composer">作曲家</div>
|
||||
<a class="layui-btn layui-btn-normal" id="download">下载</a>
|
||||
<a class="layui-btn layui-btn-normal" id="next">下一首</a>
|
||||
</div>
|
||||
|
||||
<div id="audioWrap"></div>
|
||||
@ -43,59 +44,68 @@
|
||||
<link rel="stylesheet" href="/css/AudioPlayer.css">
|
||||
<script src="/js/AudioPlayer.js"></script>
|
||||
<script id="listTemplet">
|
||||
{{# if(d.dir){ }}
|
||||
<div><i class="layui-icon"> </i>{{d.title}}</div>
|
||||
{{# if(d.dir){ }}
|
||||
<div><i class="layui-icon"> </i>{{d.title}}</div>
|
||||
{{# } else { }}
|
||||
<div><i class="layui-icon"> </i>{{d.title}}</div>
|
||||
<div><i class="layui-icon"> </i>{{d.title}}</div>
|
||||
{{# } }}
|
||||
</script>
|
||||
<script type="text/html" id="music">
|
||||
<a class="layui-btn layui-btn-xs" lay-event="download">下载</a>
|
||||
<a class="layui-btn layui-btn-xs" lay-event="play">播放</a>
|
||||
</script>
|
||||
<script>
|
||||
let localhost = "";
|
||||
let musicLib=[]
|
||||
let isRandom=true;
|
||||
let playIndex=0;
|
||||
let playNow=""
|
||||
$.get("/nas/music/getlocalhost.do?token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk",function (obj){
|
||||
let json=JSON.parse(obj);
|
||||
localhost=json.data;
|
||||
// localhost="http://116.22.200.20:8000"
|
||||
let musicLib = []
|
||||
let isRandom = true;
|
||||
let playIndex = 0;
|
||||
let playNow = ""
|
||||
$.get("/nas/music/getlocalhost.do?token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk", function (obj) {
|
||||
try {
|
||||
let json = JSON.parse(obj);
|
||||
localhost = json.data+":8000";
|
||||
if(localhost==='http://null:8000'){
|
||||
localhost=""
|
||||
}
|
||||
} catch (e) {
|
||||
localhost = ""
|
||||
}
|
||||
console.log(localhost)
|
||||
// localhost="http://116.22.200.20:8000"
|
||||
layui.use(['table', 'element'], function () {
|
||||
let table = layui.table;
|
||||
let element = layui.element;
|
||||
let listTable=table.render({
|
||||
let listTable = table.render({
|
||||
elem: '#playlist'
|
||||
, url: localhost + '/nas/music/list.do?token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk' //数据接口
|
||||
, page: true //开启分页
|
||||
, cols: [[
|
||||
{field: 'title', title: '标题', width: 400,templet:"#listTemplet"}
|
||||
{field: 'title', title: '标题', width: 400, templet: "#listTemplet"}
|
||||
, {field: 'artist', title: '艺术家', width: 200}
|
||||
, {field: 'album', title: '专辑', width: 200}
|
||||
, {field: 'composer', title: '作曲', width: 200}
|
||||
, {field: 'track', title: '音轨号', width: 100}
|
||||
, {field: "right", width: 100, toolbar: '#music'}
|
||||
, {field: "right", width: 150, toolbar: '#music'}
|
||||
]]
|
||||
,done:function (res,curr,count){
|
||||
musicLib=res.data
|
||||
, done: function (res, curr, count) {
|
||||
musicLib = res.data
|
||||
}
|
||||
})
|
||||
table.on('rowDouble(music)', function (obj) {
|
||||
//obj 同上
|
||||
console.log(obj.data) //得到当前行元素对象
|
||||
if(obj.data.dir){
|
||||
if (obj.data.dir) {
|
||||
listTable.reload({
|
||||
where:{
|
||||
path:obj.data.file
|
||||
where: {
|
||||
path: obj.data.file
|
||||
}
|
||||
,page:{
|
||||
curr:1
|
||||
, page: {
|
||||
curr: 1
|
||||
}
|
||||
});
|
||||
}else{
|
||||
isRandom=false;
|
||||
playIndex=obj.tr[0].dataset.index;
|
||||
} else {
|
||||
isRandom = false;
|
||||
playIndex = obj.tr[0].dataset.index;
|
||||
play(obj.data.file)
|
||||
}
|
||||
|
||||
@ -103,11 +113,23 @@
|
||||
|
||||
table.on('tool(music)', function (obj) {
|
||||
let data = obj.data;
|
||||
if(obj.event === 'download'){
|
||||
if(!data.dir){
|
||||
window.open(localhost+"/nas/music/play.do?token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk&random=false&filePath="+new Base64().encode(data.file))
|
||||
if (obj.event === 'download') {
|
||||
if (!data.dir) {
|
||||
window.open(localhost + "/nas/music/play.do?token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk&random=false&filePath=" + new Base64().encode(data.file))
|
||||
}
|
||||
} else if (obj.event === 'play') {
|
||||
console.log(data.file)
|
||||
$.get(localhost + "/nas/music/list.do?token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk&path=" + new Base64().encode(data.file), function (obj) {
|
||||
let json = JSON.parse(obj);
|
||||
console.log(json)
|
||||
if(json.code===0){
|
||||
playIndex=0;
|
||||
musicLib=json.data;
|
||||
isRandom=false;
|
||||
playNext()
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
});
|
||||
element.on('nav(menus)', function (elem) {
|
||||
@ -126,9 +148,9 @@
|
||||
, allowSeek: true
|
||||
, endedCallback: function () {
|
||||
console.log('播放完成')
|
||||
if(isRandom){
|
||||
if (isRandom) {
|
||||
random()
|
||||
}else{
|
||||
} else {
|
||||
playNext()
|
||||
}
|
||||
|
||||
@ -141,22 +163,29 @@
|
||||
$('#footer').load("/html/footer.html");
|
||||
$('#side').load("/html/body/nas/side.html");
|
||||
$('#img').click(function () {
|
||||
isRandom=true;
|
||||
isRandom = true;
|
||||
random()
|
||||
});
|
||||
$('#download').click(function (){
|
||||
window.open(localhost+"/nas/music/play.do?token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk&random=false&filePath="+playNow)
|
||||
$('#download').click(function () {
|
||||
window.open(localhost + "/nas/music/play.do?token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk&random=false&filePath=" + playNow)
|
||||
})
|
||||
$('#next').click(function (){
|
||||
playNext()
|
||||
})
|
||||
|
||||
|
||||
function playNext(){
|
||||
if(playIndex===musicLib.length){
|
||||
playIndex=0;
|
||||
function playNext() {
|
||||
if(isRandom){
|
||||
random()
|
||||
return ;
|
||||
}
|
||||
if(musicLib[playIndex].dir){
|
||||
if (playIndex === musicLib.length) {
|
||||
playIndex = 0;
|
||||
}
|
||||
if (musicLib[playIndex].dir) {
|
||||
playIndex++
|
||||
playNext()
|
||||
}else{
|
||||
} else {
|
||||
play(musicLib[playIndex].file);
|
||||
playIndex++
|
||||
}
|
||||
@ -166,9 +195,9 @@
|
||||
$.get(localhost + "/nas/music/random.do?token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk", function (data) {
|
||||
let json = JSON.parse(data)
|
||||
if (json.code === 0) {
|
||||
playNow=json.data
|
||||
playNow = json.data
|
||||
player.updateSource({
|
||||
source: localhost + "/nas/music/play.do?random=false&filePath=" + json.data+"&token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk"
|
||||
source: localhost + "/nas/music/play.do?random=false&filePath=" + json.data + "&token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk"
|
||||
});
|
||||
update(json.data)
|
||||
player.play()
|
||||
@ -181,9 +210,9 @@
|
||||
|
||||
function play(file) {
|
||||
let filePath = escape(new Base64().encode(file))
|
||||
playNow=filePath
|
||||
playNow = filePath
|
||||
player.updateSource({
|
||||
source: localhost + "/nas/music/play.do?random=false&filePath=" + filePath+"&token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk"
|
||||
source: localhost + "/nas/music/play.do?random=false&filePath=" + filePath + "&token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk"
|
||||
});
|
||||
update(filePath)
|
||||
player.play()
|
||||
@ -192,6 +221,11 @@
|
||||
function update(fileName) {
|
||||
$.get(localhost + '/nas/music/find/file.do?token=PlVodzYhvxRQbOHKakpKs2dvnoc43Cnk&path=' + fileName, function (data) {
|
||||
let json = JSON.parse(data);
|
||||
if(isRandom){
|
||||
$('#playerNowList').html("播放列表: (全列表随机播放)")
|
||||
}else{
|
||||
$('#playerNowList').html("播放列表: (" + playIndex+"/"+musicLib.length+")")
|
||||
}
|
||||
$('#title').html("标题:" + json.data.title)
|
||||
$('#artist').html("艺术家:" + json.data.artist)
|
||||
$('#album').html("专辑:" + json.data.album)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user