Compare commits
52 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
6cff4247a8
|
|||
|
90ff1382a8
|
|||
|
1450357b91
|
|||
|
7a31c36c10
|
|||
|
5271c12525
|
|||
|
d278e4009d
|
|||
|
e3d80ffc2a
|
|||
|
30a8fbad4e
|
|||
|
e7bc625b6d
|
|||
|
2d71e7b0cb
|
|||
|
2297f87fa3
|
|||
|
271c7e5c13
|
|||
|
9fdea6b169
|
|||
|
38e20044e2
|
|||
|
830cbae17a
|
|||
|
51fee5bfe0
|
|||
|
e40fd2625f
|
|||
|
061ef9bdc9
|
|||
|
d478923ce0
|
|||
|
e4032069a5
|
|||
|
73da4f8dc5
|
|||
|
89ff2bf452
|
|||
|
d0f6d19a7e
|
|||
|
977b3e02e9
|
|||
|
a6d82c1f47
|
|||
|
b808d4be99
|
|||
|
5c3fb66db3
|
|||
|
df081d39ca
|
|||
|
2f2254371b
|
|||
|
857a5e9dd9
|
|||
|
2b4bbdf25e
|
|||
|
08a5650b30
|
|||
|
8a9569ea61
|
|||
|
dc380590e7
|
|||
|
e5fa4c2b65
|
|||
|
97693d6bd0
|
|||
|
edd5eeb4c0
|
|||
|
adf0c24f91
|
|||
|
539fbb6501
|
|||
|
f5dec2a0a7
|
|||
|
da59740b47
|
|||
|
cae07f55cd
|
|||
|
84cf09e61b
|
|||
|
36c1990e5e
|
|||
|
21e51756f0
|
|||
|
caf8b47ca0
|
|||
|
51e5f2d0fb
|
|||
|
b0280767cb
|
|||
|
85f25a38ae
|
|||
|
00399785d4
|
|||
|
f3e69b032f
|
|||
|
cb5c752f8f
|
18
.drone.yml
Normal file
18
.drone.yml
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: default
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: frontend-web
|
||||||
|
image: node:19
|
||||||
|
commands:
|
||||||
|
- cd web
|
||||||
|
- npm install
|
||||||
|
- npm run build
|
||||||
|
|
||||||
|
- name: release
|
||||||
|
image: plugins/gitea-release
|
||||||
|
settings:
|
||||||
|
api_key: da966507c259aa32ccc2d434e930af4a580de785
|
||||||
|
base_url: https://yongyuancv.cn/git/
|
||||||
|
files: dist/*
|
||||||
68
.github/workflows/build.yml
vendored
Normal file
68
.github/workflows/build.yml
vendored
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
# This is a basic workflow to help you get started with Actions
|
||||||
|
|
||||||
|
name: CI
|
||||||
|
|
||||||
|
# Controls when the workflow will run
|
||||||
|
on:
|
||||||
|
# Triggers the workflow on push or pull request events but only for the "master" branch
|
||||||
|
push:
|
||||||
|
branches: [ "master" ]
|
||||||
|
pull_request:
|
||||||
|
branches: [ "master" ]
|
||||||
|
|
||||||
|
# Allows you to run this workflow manually from the Actions tab
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
|
||||||
|
jobs:
|
||||||
|
build-backend-linux:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: actions/setup-go@v3
|
||||||
|
with:
|
||||||
|
go-version: 1.18
|
||||||
|
- name: Build linux backend
|
||||||
|
run: |
|
||||||
|
make linux
|
||||||
|
- name: Upload linux backend
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: backend-linux
|
||||||
|
path: |
|
||||||
|
msw-open-music
|
||||||
|
config.json
|
||||||
|
build-backend-windows:
|
||||||
|
runs-on: windows-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: actions/setup-go@v3
|
||||||
|
with:
|
||||||
|
go-version: 1.18
|
||||||
|
- name: Build windows backend
|
||||||
|
run: |
|
||||||
|
go build -v
|
||||||
|
- name: Upload linux backend
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: backend-windows
|
||||||
|
path: |
|
||||||
|
msw-open-music.exe
|
||||||
|
config.json
|
||||||
|
build-frontend-web:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
CI: false
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: 16
|
||||||
|
- name: Build web front end
|
||||||
|
run: |
|
||||||
|
make web
|
||||||
|
- name: upload packaged front end
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: frontend-web
|
||||||
|
path: web/build
|
||||||
3
Makefile
3
Makefile
@@ -1,4 +1,5 @@
|
|||||||
dist:
|
.PHONY: web linux windows
|
||||||
|
web:
|
||||||
cd web && npm install
|
cd web && npm install
|
||||||
cd web && npm run build
|
cd web && npm run build
|
||||||
|
|
||||||
|
|||||||
137
README-cn.md
Normal file
137
README-cn.md
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
# MSW Open Music Project
|
||||||
|
|
||||||
|
[](https://github.com/heimoshuiyu/msw-open-music/actions/workflows/build.yml)
|
||||||
|
|
||||||
|
🔴 演示 Demo: <https://msw-open-music.live>
|
||||||
|
|
||||||
|
> 找一首歌最好的方法是:打开一个超长的歌单,然后随机播放,直到你找到为止。
|
||||||
|
|
||||||
|
一个 💪 轻量级 ⚡️ 高性能 🖥️ 跨平台的 个人音乐串流平台。管理你现有的音乐文件并在其他设备上播放。
|
||||||
|
|
||||||
|
前端网页应用基于 `react.js` 和 `water.css` 构建。后端服务器程序使用 `golang` 和 `sqlite` 构建。
|
||||||
|
|
||||||
|
## 介绍
|
||||||
|
|
||||||
|
截图
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
### 功能特点
|
||||||
|
|
||||||
|
- 🔎 索引现有的音乐文件,并记录文件名和文件夹元信息
|
||||||
|
|
||||||
|
- 📕 使用 文件夹 📁 标签 🏷️ 评论 💬 来管理你的音乐。
|
||||||
|
|
||||||
|
- 🌐 提供一个轻量高效的网页前端并支持多种语言。
|
||||||
|
|
||||||
|
- 👥 支持多用户。
|
||||||
|
|
||||||
|
- 🔥 调用 `ffmpeg` 配合可自定义的预设配置来转码你的音乐。
|
||||||
|
|
||||||
|
- 🔗 分享音乐链接给好友!
|
||||||
|
|
||||||
|
### 如果你遇到过这样的烦恼...你就是目标用户
|
||||||
|
|
||||||
|
- 硬盘上存了一堆音乐,但没有一个很好的播放器. 🖴
|
||||||
|
|
||||||
|
- 下载了体积非常大的无损音乐,在设备间移动很困难. 🎵
|
||||||
|
|
||||||
|
- 想要在其他 电脑/手机 上听 电脑/服务器 上储存的音乐. 😋
|
||||||
|
|
||||||
|
- 想给你的好友分享本地音乐. 😘
|
||||||
|
|
||||||
|
## 使用方法
|
||||||
|
|
||||||
|
1. 修改 `config.json` 配置文件中的 `secret` 值
|
||||||
|
|
||||||
|
2. 运行后端服务器程序 `msw-open-music.exe` 或者 `msw-open-music`. 服务默认监听 8080 端口。 然后打开 <http://127.0.0.1:8080> 去创建的一个管理员帐号。
|
||||||
|
|
||||||
|
前端 HTML 文件存放在 `web/build` 目录下。
|
||||||
|
|
||||||
|
### 创建第一个管理员帐号
|
||||||
|
|
||||||
|
第一个创建的管理员帐号会被自动激活,其他后续创建的管理员帐号需要管理员手动激活。
|
||||||
|
|
||||||
|
请前往注册页面,选择角色为 管理员,然后注册第一个管理员帐号。
|
||||||
|
|
||||||
|
#### config.json
|
||||||
|
|
||||||
|
- `secret` 字符串类型。用来加密 session 会话。
|
||||||
|
|
||||||
|
- `database_name` 字符串类型。`sqlite3` 数据库的文件名。如果不存在,会自动创建。
|
||||||
|
- `addr` 字符串类型。监听地址和端口。
|
||||||
|
- `ffmpeg_config_list` 列表类型。预设的 `ffmpeg` 配置文件。包含 `ffmpegConfig` 对象。
|
||||||
|
- `file_life_time` 整数类型(秒)。临时文件的生命周期。如果临时文件超过这个时间没有被访问,那么将会被自动删除。
|
||||||
|
- `cleaner_internal` 整数类型(秒)。`tmpfs` 检查临时文件的间隔时间。
|
||||||
|
- `root` 字符串类型。存放临时文件的目录。默认是 `/tmp`。**Windows用户请修改成可用的目录**。如果不存在,将会被自动创建。
|
||||||
|
- `permission` 各个 API 的权限等级。
|
||||||
|
- `0` 无需任何权限。
|
||||||
|
- `1` 需要管理员(最高级别)权限等级。
|
||||||
|
- `2` 需要普通用户权限等级,也就是说,管理员和普通用户都有权访问此等级的 API ,而 匿名用户 则没有权限访问。
|
||||||
|
- 如果你想避免 API 被滥用,可以调整下面 5 个与串流相关的 API 权限等级。
|
||||||
|
- `/get_file` 使用 `io.copy()` 方法串流
|
||||||
|
- `/get_file_direct` 使用 `http.serveFile()` 方法串流
|
||||||
|
- `/get_file_stream` 调用 `ffmpeg` 并串流其标准输出 `stdout`
|
||||||
|
- `/prepare_file_stream_direct` 调用 `ffmpeg` 预转码一个文件
|
||||||
|
- `/get_file_stream_direct` 使用 `http.serveFile()` 获取预转码结束的临时文件
|
||||||
|
- 其他在 `config.json` 中没有设定的 API 将默认拥有 `0` 的权限等级。
|
||||||
|
|
||||||
|
对于 Windows 用户,请确保 `ffmpeg` 正确安装并设置环境变量。
|
||||||
|
|
||||||
|
## 开发
|
||||||
|
|
||||||
|
欢迎任何 issue / pull request / feature request
|
||||||
|
|
||||||
|
### 主要变更历史
|
||||||
|
|
||||||
|
- `v1.0.0` 第一个版本。核心串流功能可用。
|
||||||
|
- `v1.1.0` 使用 `React` 重构前端。
|
||||||
|
- `v1.2.0` 数据库 DBMS 课程作业。添加 用户、标签、评论 和其他功能。
|
||||||
|
|
||||||
|
### ER Diagram
|
||||||
|
|
||||||
|
Database Entities Relationship Diagram
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
- `avatar` 目前没有在使用。
|
||||||
|
|
||||||
|
- 第一次运行程序时,程序会自动创建一个 ID 为 `1` 的匿名用户。所有未登陆的用户都会自动登陆到这个账户。
|
||||||
|
|
||||||
|
- `tmpfs` 储存在内存中,每次重新启动后端程序将会清空记录的信息。
|
||||||
|
|
||||||
|
### 关于 tmpfs
|
||||||
|
|
||||||
|
如果前端的播放器勾选了 `预转码` 选项,后端程序会先将文件转码到临时目录中,转码完成后再串流文件。这么做可以实现断点续传,解决由于网络波动导致 `ffmpeg` 管道链接断开而终止转码的问题。
|
||||||
|
|
||||||
|
默认的临时文件夹目录是 `/tmp`,这是 Linux 系统中通用的临时目录。默认的生存时间是 600 秒(10 分钟)。如果超过这个时间没有访问该临时文件,那么后端程序将会自动删除它。
|
||||||
|
|
||||||
|
### 后端 API 设计
|
||||||
|
|
||||||
|
一个不需要返回任何有用数据的 API 将会返回下面的 JSON 对象
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"status": "OK"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
当错误发生时,后端会返回如下格式的 JSON 对象。`error` 是对错误信息的详细描述文本。
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"error": "Wrong password"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
不需要传递参数的 API 使用 `GET` 方法,否则使用 `POST` 方法。(忽略 RESTFUL 设计)
|
||||||
|
|
||||||
|
后端使用 cookies 来实现用户会话管理。任何不带 cookies 的请求会被认为是由 匿名用户 发送的(也就是 ID 为 `1` 的用户)
|
||||||
|
|
||||||
|
一些重要的源代码文件
|
||||||
|
|
||||||
|
- `pkg/api/api.go` 定义各个 API 的 URL 和对应函数。
|
||||||
|
|
||||||
|
- `pkg/database/sql_stmt.go` 定义 SQL 语句和做一些初始化工作。
|
||||||
|
|
||||||
|
- `pkg/database/struct.go` 定义 JSON 和 数据库对象 的 数据结构。
|
||||||
17
README.md
17
README.md
@@ -1,5 +1,11 @@
|
|||||||
# MSW Open Music Project
|
# MSW Open Music Project
|
||||||
|
|
||||||
|
[](https://github.com/heimoshuiyu/msw-open-music/actions/workflows/build.yml)
|
||||||
|
|
||||||
|
🔴 Demo: <https://msw-open-music.live>
|
||||||
|
|
||||||
|
[中文文档](./README-cn.md)
|
||||||
|
|
||||||
> The best way to search for a music is to load up a huge playlist and shuffle until you find it.
|
> The best way to search for a music is to load up a huge playlist and shuffle until you find it.
|
||||||
|
|
||||||
A 💪 light weight ⚡️ blazingly fast 🖥️ cross platform personal music streaming platform. Manage your existing music files and enjoy them on any devices.
|
A 💪 light weight ⚡️ blazingly fast 🖥️ cross platform personal music streaming platform. Manage your existing music files and enjoy them on any devices.
|
||||||
@@ -60,6 +66,17 @@ Go to register page, select the role to admin, and register the first admin acco
|
|||||||
- `file_life_time` integer type (second). Life time for temporary file. If the temporary file is not accessed for more than this time, back-end server will delete this file.
|
- `file_life_time` integer type (second). Life time for temporary file. If the temporary file is not accessed for more than this time, back-end server will delete this file.
|
||||||
- `cleaner_internal` integer type (second). Interval for `tmpfs` checking temporary file.
|
- `cleaner_internal` integer type (second). Interval for `tmpfs` checking temporary file.
|
||||||
- `root` string type. Directory to store temporary files. Default is `/tmp`, **please modify this directory if you are using Windows.** Directory will be created if not exists.
|
- `root` string type. Directory to store temporary files. Default is `/tmp`, **please modify this directory if you are using Windows.** Directory will be created if not exists.
|
||||||
|
- `permission`. Specify each API's permission level.
|
||||||
|
- `0` for no permission required.
|
||||||
|
- `1` require admin level (highest level) permission.
|
||||||
|
- `2` require normal user level permission. That is, both admins and registered users can access to this URL, except anonymous users.
|
||||||
|
- If you want to avoid abuse of the playback API, you can adjust the permission level for these 5 playback-related APIs.
|
||||||
|
- `/get_file` get file with `io.copy()` method
|
||||||
|
- `/get_file_direct` get file with `http.serveFile()` method
|
||||||
|
- `/get_file_stream` call ffmpeg and stream its `stdout` output
|
||||||
|
- `/prepare_file_stream_direct` call ffmpeg to convert a file
|
||||||
|
- `/get_file_stream_direct` get the converted file with `http.serveFile()`
|
||||||
|
- Other URLs not metion in `config.json` will have `0` permission level by default.
|
||||||
|
|
||||||
For windows user, make sure you have `ffmpeg` installed.
|
For windows user, make sure you have `ffmpeg` installed.
|
||||||
|
|
||||||
|
|||||||
37
config.json
37
config.json
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"api": {
|
"api": {
|
||||||
"secret": "CHANGE_YOUR_SECRET_HERE",
|
"secret": "CHANGE_YOUR_SECRET_HERE",
|
||||||
"database_name": "music.sqlite3",
|
"database_name": "postgres://postgres:woshimima@localhost/postgres?sslmode=disable",
|
||||||
"single_thread": true,
|
"single_thread": true,
|
||||||
"addr": ":8080",
|
"addr": ":8080",
|
||||||
"ffmpeg_threads": 1,
|
"ffmpeg_threads": 1,
|
||||||
@@ -38,8 +38,39 @@
|
|||||||
},
|
},
|
||||||
{ "name": "MP3 128k", "args": "-c:a mp3 -ab 128k -vn", "format": "mp3" },
|
{ "name": "MP3 128k", "args": "-c:a mp3 -ab 128k -vn", "format": "mp3" },
|
||||||
{ "name": "MP3 320k", "args": "-c:a mp3 -ab 320k -vn", "format": "mp3" },
|
{ "name": "MP3 320k", "args": "-c:a mp3 -ab 320k -vn", "format": "mp3" },
|
||||||
{ "name": "全损音质 8k", "args": "-c:a libopus -ab 8k -vn", "format": "webm" }
|
{
|
||||||
]
|
"name": "全损音质 8k",
|
||||||
|
"args": "-c:a libopus -ab 8k -vn",
|
||||||
|
"format": "webm"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"permission": {
|
||||||
|
"/register": 0,
|
||||||
|
"/get_file": 0,
|
||||||
|
"/get_file_direct": 0,
|
||||||
|
"/get_file_stream": 0,
|
||||||
|
"/prepare_file_stream_direct": 0,
|
||||||
|
"/get_file_stream_direct": 0,
|
||||||
|
"/walk": 1,
|
||||||
|
"/reset": 1,
|
||||||
|
"/update_user_active": 1,
|
||||||
|
"/get_feedbacks": 1,
|
||||||
|
"/delete_feedback": 1,
|
||||||
|
"/delete_file": 1,
|
||||||
|
"/update_filename": 1,
|
||||||
|
"/reset_filename": 1,
|
||||||
|
"/reset_foldername": 1,
|
||||||
|
"/update_foldername": 1,
|
||||||
|
"/insert_tag": 1,
|
||||||
|
"/update_tag": 1,
|
||||||
|
"/delete_tag": 1,
|
||||||
|
"/put_tag_on_file": 1,
|
||||||
|
"/delete_tag_on_file": 1,
|
||||||
|
"/delete_review": 2,
|
||||||
|
"/update_review": 2,
|
||||||
|
"/update_user_password": 2,
|
||||||
|
"/update_username": 2
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"tmpfs": {
|
"tmpfs": {
|
||||||
"file_life_time": 600,
|
"file_life_time": 600,
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
# DBMS Group Project Problem Description
|
|
||||||
|
|
||||||
- Group 1
|
|
||||||
|
|
||||||
The Internet infrastructure construction has made the network speed development faster. With the fast Internet, people are gradually migrating various data and services to the cloud. For example, NetEase Cloud Music, Spotify, and Apple Music, we call them streaming media platforms. The definition of streaming media platform is that users purchase the digital copyright of music and then play the music online on the platform.
|
|
||||||
|
|
||||||
Generally speaking, users cannot buy music that is not available on the platform. The user cannot download the digital file of the music (the user purchases the right to play instead of the right to copy). Users cannot upload their music to the platform.
|
|
||||||
|
|
||||||
However, in the era of digital copyright, there are still many advantages to getting original music files, such as no need to install a dedicated player; free copying to other devices (without violating copyright); no risk of music unavailable from the platform; no play records and privacy will be tracked by the platform.
|
|
||||||
|
|
||||||
Some people don't like streaming platforms. They like to collect music (download or buy CDs) and save it on their computers. But as more and more music is collected (over 70,000 songs and in total size of 800GB), it becomes very difficult to manage files. It is difficult for them to find where the songs they want to listen to are saved. Also, lossless music files are large and difficult to play online.
|
|
||||||
|
|
||||||
As long as there no such "Self-hosted music streaming platform" software available, we decided to develop a project based on database knowledge to help people who have collected a lot of music to enjoy their music simply.
|
|
||||||
|
|
||||||
We will handle various relevant types of data in our database. Including song name, album name, file size, update date, rating, comment, user information, etc. They are highly relevant, so using a relational database will be a good choice.
|
|
||||||
|
|
||||||
The features of the project we designed are as follows:
|
|
||||||
|
|
||||||
- Open. Independent front-end (GUI) and back-end (server program), using API to communicate.
|
|
||||||
- Easy to use. Minimize dependencies, allowing users to configure quickly and simply.
|
|
||||||
- Lightweight. The program is small in size and quick to install.
|
|
||||||
- High performance. Only do what should be done, no features that will lead to poor performance.
|
|
||||||
- Cross-platform. The project can run on computers, mobile phones, Linux, Windows, macOS, and X86 and ARM processor architectures.
|
|
||||||
- Extensibility. Access to cloud OSS (Object Storage Service), reverse proxy, or other external software.
|
|
||||||
|
|
||||||
Our project has the following functions:
|
|
||||||
|
|
||||||
- Index file. Index local files into the database.
|
|
||||||
- Search. Search for music based on name/album/tag/comment, sorted by rating or other columns.
|
|
||||||
- Play. Play music online, play music randomly and play music at a low bit rate on a bad network.
|
|
||||||
- User management. Users can register and log in.
|
|
||||||
- Comment. Users can give a like or comment on the music.
|
|
||||||
- Management. The administrator can upload music, update or delete the database.
|
|
||||||
- Share. Generate a link to share the music with others.
|
|
||||||
|
|
||||||
After research and discussion, in order to meet the above requirements, we decided to use the Golang programming language on the backend. SQLite as a database program. Vue as the front-end GUI interface.
|
|
||||||
2
go.mod
2
go.mod
@@ -4,7 +4,7 @@ go 1.18
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/gorilla/sessions v1.2.1
|
github.com/gorilla/sessions v1.2.1
|
||||||
github.com/mattn/go-sqlite3 v1.14.14
|
github.com/lib/pq v1.10.7
|
||||||
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
|
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
4
go.sum
4
go.sum
@@ -2,7 +2,7 @@ github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyC
|
|||||||
github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
|
github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
|
||||||
github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
|
github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
|
||||||
github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
|
github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
|
||||||
github.com/mattn/go-sqlite3 v1.14.14 h1:qZgc/Rwetq+MtyE18WhzjokPD93dNqLGNT3QJuLvBGw=
|
github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
|
||||||
github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
|
github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||||
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
|
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
|
||||||
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
|
|||||||
@@ -57,7 +57,9 @@ func NewAPI(config commonconfig.Config) (*API, error) {
|
|||||||
apiMux.HandleFunc("/get_file_stream", api.HandleGetFileStream)
|
apiMux.HandleFunc("/get_file_stream", api.HandleGetFileStream)
|
||||||
apiMux.HandleFunc("/get_ffmpeg_config_list", api.HandleGetFfmpegConfigs)
|
apiMux.HandleFunc("/get_ffmpeg_config_list", api.HandleGetFfmpegConfigs)
|
||||||
apiMux.HandleFunc("/get_file_info", api.HandleGetFileInfo)
|
apiMux.HandleFunc("/get_file_info", api.HandleGetFileInfo)
|
||||||
|
apiMux.HandleFunc("/get_file_ffprobe_info", api.HandleGetFileFfprobeInfo)
|
||||||
apiMux.HandleFunc("/get_file_stream_direct", api.HandleGetFileStreamDirect)
|
apiMux.HandleFunc("/get_file_stream_direct", api.HandleGetFileStreamDirect)
|
||||||
|
apiMux.HandleFunc("/get_file_avatar", api.HandelGetFileAvatar)
|
||||||
apiMux.HandleFunc("/prepare_file_stream_direct", api.HandlePrepareFileStreamDirect)
|
apiMux.HandleFunc("/prepare_file_stream_direct", api.HandlePrepareFileStreamDirect)
|
||||||
apiMux.HandleFunc("/delete_file", api.HandleDeleteFile)
|
apiMux.HandleFunc("/delete_file", api.HandleDeleteFile)
|
||||||
apiMux.HandleFunc("/update_filename", api.HandleUpdateFilename)
|
apiMux.HandleFunc("/update_filename", api.HandleUpdateFilename)
|
||||||
@@ -70,7 +72,7 @@ func NewAPI(config commonconfig.Config) (*API, error) {
|
|||||||
// user
|
// user
|
||||||
apiMux.HandleFunc("/login", api.HandleLogin)
|
apiMux.HandleFunc("/login", api.HandleLogin)
|
||||||
apiMux.HandleFunc("/register", api.HandleRegister)
|
apiMux.HandleFunc("/register", api.HandleRegister)
|
||||||
apiMux.HandleFunc("/logout", api.LoginAsAnonymous)
|
apiMux.HandleFunc("/logout", api.HandleLoginAsAnonymous)
|
||||||
apiMux.HandleFunc("/get_user_info", api.HandleGetUserInfo)
|
apiMux.HandleFunc("/get_user_info", api.HandleGetUserInfo)
|
||||||
apiMux.HandleFunc("/get_users", api.HandleGetUsers)
|
apiMux.HandleFunc("/get_users", api.HandleGetUsers)
|
||||||
apiMux.HandleFunc("/update_user_active", api.HandleUpdateUserActive)
|
apiMux.HandleFunc("/update_user_active", api.HandleUpdateUserActive)
|
||||||
@@ -94,11 +96,13 @@ func NewAPI(config commonconfig.Config) (*API, error) {
|
|||||||
apiMux.HandleFunc("/update_review", api.HandleUpdateReview)
|
apiMux.HandleFunc("/update_review", api.HandleUpdateReview)
|
||||||
apiMux.HandleFunc("/delete_review", api.HandleDeleteReview)
|
apiMux.HandleFunc("/delete_review", api.HandleDeleteReview)
|
||||||
apiMux.HandleFunc("/get_reviews_by_user", api.HandleGetReviewsByUser)
|
apiMux.HandleFunc("/get_reviews_by_user", api.HandleGetReviewsByUser)
|
||||||
// below needs admin
|
// statistic
|
||||||
|
apiMux.HandleFunc("/record_playback", api.HandleRecordPlayback)
|
||||||
|
// database
|
||||||
apiMux.HandleFunc("/walk", api.HandleWalk)
|
apiMux.HandleFunc("/walk", api.HandleWalk)
|
||||||
apiMux.HandleFunc("/reset", api.HandleReset)
|
apiMux.HandleFunc("/reset", api.HandleReset)
|
||||||
|
|
||||||
mux.Handle("/api/v1/", http.StripPrefix("/api/v1", apiMux))
|
mux.Handle("/api/v1/", http.StripPrefix("/api/v1", api.PermissionMiddleware(apiMux)))
|
||||||
mux.Handle("/", http.StripPrefix("/", http.FileServer(http.Dir("web/build"))))
|
mux.Handle("/", http.StripPrefix("/", http.FileServer(http.Dir("web/build"))))
|
||||||
|
|
||||||
return api, nil
|
return api, nil
|
||||||
|
|||||||
108
pkg/api/handle_avatar.go
Normal file
108
pkg/api/handle_avatar.go
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
"log"
|
||||||
|
"msw-open-music/pkg/database"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"path"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (api *API) HandelGetFileAvatar(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var err error
|
||||||
|
q := r.URL.Query()
|
||||||
|
ids := q["id"]
|
||||||
|
if len(ids) == 0 {
|
||||||
|
err = errors.New(`parameter "id" can't be empty`)
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
id, err := strconv.Atoi(ids[0])
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
file, err := api.Db.GetFile(int64(id))
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
path, err := file.Path()
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
log.Println("[api] Get avatar of file", path)
|
||||||
|
buff := make([]byte, 0)
|
||||||
|
cache := bytes.NewBuffer(buff)
|
||||||
|
cmd := exec.Command("ffmpeg", "-i", path, "-c:v", "libwebp_anim", "-update", "1", "-frames:v", "1", "-f", "image2pipe", "-")
|
||||||
|
cmd.Stdout = cache
|
||||||
|
|
||||||
|
err = cmd.Run()
|
||||||
|
if err != nil {
|
||||||
|
api.HandleGetAlternativeFileAvatar(w, r, file)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "image/webp")
|
||||||
|
io.Copy(w, cache)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (api *API) HandleGetAlternativeFileAvatar(w http.ResponseWriter, r *http.Request, f *database.File) {
|
||||||
|
var err error
|
||||||
|
dir, err := f.Dir()
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
log.Println("[api] Get alternative avatar in dir", dir)
|
||||||
|
files, err := os.ReadDir(dir)
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
avatar, err := findAvatarFile(files)
|
||||||
|
avatarPath := path.Join(dir, avatar)
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cmd := exec.Command("ffmpeg", "-i", avatarPath, "-c:v", "libwebp_anim", "-f", "image2pipe", "-")
|
||||||
|
cmd.Stdout = w
|
||||||
|
w.Header().Set("Content-Type", "image/webp")
|
||||||
|
|
||||||
|
err = cmd.Run()
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func findAvatarFile(files []os.DirEntry) (string, error) {
|
||||||
|
for _, file := range files {
|
||||||
|
if isAvatarType(file.Name()) {
|
||||||
|
return file.Name(), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "", errors.New("Cannot find avatar file")
|
||||||
|
}
|
||||||
|
|
||||||
|
var avatarFileTypes = []string{
|
||||||
|
".jpg",
|
||||||
|
".png",
|
||||||
|
}
|
||||||
|
|
||||||
|
func isAvatarType(filename string) bool {
|
||||||
|
for _, t := range avatarFileTypes {
|
||||||
|
if strings.HasSuffix(strings.ToLower(filename), t) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
@@ -14,12 +14,6 @@ type WalkRequest struct {
|
|||||||
|
|
||||||
func (api *API) HandleReset(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleReset(w http.ResponseWriter, r *http.Request) {
|
||||||
var err error
|
var err error
|
||||||
// check admin
|
|
||||||
err = api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Println("[api] Reset database")
|
log.Println("[api] Reset database")
|
||||||
|
|
||||||
@@ -46,13 +40,6 @@ func (api *API) HandleWalk(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// check admin
|
|
||||||
err = api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// check root empty
|
// check root empty
|
||||||
if walkRequest.Root == "" {
|
if walkRequest.Root == "" {
|
||||||
api.HandleErrorString(w, r, `key "root" can't be empty`)
|
api.HandleErrorString(w, r, `key "root" can't be empty`)
|
||||||
|
|||||||
@@ -56,13 +56,6 @@ type GetFeedbacksResponse struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleGetFeedbacks(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleGetFeedbacks(w http.ResponseWriter, r *http.Request) {
|
||||||
// check if admin
|
|
||||||
err := api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
feedbacks, err := api.Db.GetFeedbacks()
|
feedbacks, err := api.Db.GetFeedbacks()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
@@ -85,15 +78,8 @@ type DeleteFeedbackRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleDeleteFeedback(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleDeleteFeedback(w http.ResponseWriter, r *http.Request) {
|
||||||
// check if admin
|
|
||||||
err := api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &DeleteFeedbackRequest{}
|
req := &DeleteFeedbackRequest{}
|
||||||
err = json.NewDecoder(r.Body).Decode(req)
|
err := json.NewDecoder(r.Body).Decode(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
|
"os/exec"
|
||||||
"strconv"
|
"strconv"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -46,10 +47,8 @@ func (api *API) HandleGetFileInfo(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// /get_file
|
func (api *API) HandleGetFileFfprobeInfo(w http.ResponseWriter, r *http.Request) {
|
||||||
// get raw file with io.Copy method
|
getFileRequest := &GetFileRequest {
|
||||||
func (api *API) HandleGetFile(w http.ResponseWriter, r *http.Request) {
|
|
||||||
getFileRequest := &GetFileRequest{
|
|
||||||
ID: -1,
|
ID: -1,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,12 +64,52 @@ func (api *API) HandleGetFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log.Println("[api] Get file Ffprobe info", getFileRequest.ID)
|
||||||
|
|
||||||
file, err := api.Db.GetFile(getFileRequest.ID)
|
file, err := api.Db.GetFile(getFileRequest.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
path, err := file.Path()
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cmd := exec.Command("ffprobe", "-i", path, "-hide_banner")
|
||||||
|
cmd.Stderr = w
|
||||||
|
err = cmd.Run()
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// /api/v1/get_file?id=123
|
||||||
|
// get raw file with io.Copy method
|
||||||
|
func (api *API) HandleGetFile(w http.ResponseWriter, r *http.Request) {
|
||||||
|
q := r.URL.Query()
|
||||||
|
ids := q["id"]
|
||||||
|
_id, err := strconv.Atoi(ids[0])
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
id := int64(_id)
|
||||||
|
|
||||||
|
// check empty
|
||||||
|
if id < 0 {
|
||||||
|
api.HandleErrorString(w, r, `"id" can't be none or negative`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
file, err := api.Db.GetFile(id)
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
path, err := file.Path()
|
path, err := file.Path()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ type GetFilesInFolderRequest struct {
|
|||||||
|
|
||||||
type GetFilesInFolderResponse struct {
|
type GetFilesInFolderResponse struct {
|
||||||
Files *[]database.File `json:"files"`
|
Files *[]database.File `json:"files"`
|
||||||
|
Folder string `json:"folder"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleGetFilesInFolder(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleGetFilesInFolder(w http.ResponseWriter, r *http.Request) {
|
||||||
@@ -34,7 +35,7 @@ func (api *API) HandleGetFilesInFolder(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
files, err := api.Db.GetFilesInFolder(getFilesInFolderRequest.Folder_id, getFilesInFolderRequest.Limit, getFilesInFolderRequest.Offset)
|
files, folder, err := api.Db.GetFilesInFolder(getFilesInFolderRequest.Folder_id, getFilesInFolderRequest.Limit, getFilesInFolderRequest.Offset)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
@@ -42,6 +43,7 @@ func (api *API) HandleGetFilesInFolder(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
getFilesInFolderResponse := &GetFilesInFolderResponse{
|
getFilesInFolderResponse := &GetFilesInFolderResponse{
|
||||||
Files: &files,
|
Files: &files,
|
||||||
|
Folder: folder,
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Println("[api] Get files in folder", getFilesInFolderRequest.Folder_id)
|
log.Println("[api] Get files in folder", getFilesInFolderRequest.Folder_id)
|
||||||
|
|||||||
@@ -11,15 +11,8 @@ type DeleteFileRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleDeleteFile(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleDeleteFile(w http.ResponseWriter, r *http.Request) {
|
||||||
// check admin
|
|
||||||
err := api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &DeleteFileRequest{}
|
req := &DeleteFileRequest{}
|
||||||
err = json.NewDecoder(r.Body).Decode(req)
|
err := json.NewDecoder(r.Body).Decode(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
@@ -42,15 +35,8 @@ type UpdateFilenameRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleUpdateFilename(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleUpdateFilename(w http.ResponseWriter, r *http.Request) {
|
||||||
// check admin
|
|
||||||
err := api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &UpdateFilenameRequest{}
|
req := &UpdateFilenameRequest{}
|
||||||
err = json.NewDecoder(r.Body).Decode(req)
|
err := json.NewDecoder(r.Body).Decode(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
@@ -72,15 +58,8 @@ type ResetFilenameRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleResetFilename(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleResetFilename(w http.ResponseWriter, r *http.Request) {
|
||||||
// check admin
|
|
||||||
err := api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &ResetFilenameRequest{}
|
req := &ResetFilenameRequest{}
|
||||||
err = json.NewDecoder(r.Body).Decode(req)
|
err := json.NewDecoder(r.Body).Decode(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -11,15 +11,8 @@ type ResetFoldernameRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleResetFoldername(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleResetFoldername(w http.ResponseWriter, r *http.Request) {
|
||||||
// check admin
|
|
||||||
err := api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &ResetFoldernameRequest{}
|
req := &ResetFoldernameRequest{}
|
||||||
err = json.NewDecoder(r.Body).Decode(req)
|
err := json.NewDecoder(r.Body).Decode(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
return
|
return
|
||||||
@@ -49,13 +42,6 @@ func (api *API) HandleUpdateFoldername(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// check is admin
|
|
||||||
err = api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Println("[api] Update foldername folderID", req.ID, req.Foldername)
|
log.Println("[api] Update foldername folderID", req.ID, req.Foldername)
|
||||||
|
|
||||||
err = api.Db.UpdateFoldername(req.ID, req.Foldername)
|
err = api.Db.UpdateFoldername(req.ID, req.Foldername)
|
||||||
|
|||||||
@@ -116,13 +116,8 @@ func (api *API) CheckUserCanModifyReview(w http.ResponseWriter, r *http.Request,
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = api.CheckNotAnonymous(w, r)
|
userLevel := api.GetUserLevel(r)
|
||||||
if err != nil {
|
if userLevel != database.RoleAdmin {
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
userID, err := api.GetUserID(w, r)
|
userID, err := api.GetUserID(w, r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
51
pkg/api/handle_stat.go
Normal file
51
pkg/api/handle_stat.go
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"log"
|
||||||
|
"msw-open-music/pkg/database"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type RecordPlaybackRequest struct {
|
||||||
|
Playback database.Playback `json:"playback"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (api *API) HandleRecordPlayback(w http.ResponseWriter, r *http.Request) {
|
||||||
|
recordPlaybackRequest := &RecordPlaybackRequest{}
|
||||||
|
err := json.NewDecoder(r.Body).Decode(recordPlaybackRequest)
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
recordPlaybackRequest.Playback.Time = time.Now()
|
||||||
|
recordPlaybackRequest.Playback.UserID, err = api.GetUserID(w, r)
|
||||||
|
if err != nil {
|
||||||
|
if err == ErrNotLoggedIn {
|
||||||
|
user, err := api.Db.LoginAsAnonymous()
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
recordPlaybackRequest.Playback.UserID = user.ID
|
||||||
|
} else {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Println("[api] Record playback history",
|
||||||
|
recordPlaybackRequest.Playback.UserID,
|
||||||
|
recordPlaybackRequest.Playback.FileID,
|
||||||
|
recordPlaybackRequest.Playback.Duration,
|
||||||
|
recordPlaybackRequest.Playback.Method)
|
||||||
|
|
||||||
|
err = api.Db.RecordPlayback(recordPlaybackRequest.Playback)
|
||||||
|
if err != nil {
|
||||||
|
api.HandleError(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
api.HandleOK(w, r)
|
||||||
|
}
|
||||||
@@ -34,15 +34,8 @@ type InsertTagResponse struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleInsertTag(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleInsertTag(w http.ResponseWriter, r *http.Request) {
|
||||||
// check if user is admin
|
|
||||||
err := api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &database.Tag{}
|
req := &database.Tag{}
|
||||||
err = json.NewDecoder(r.Body).Decode(&req)
|
err := json.NewDecoder(r.Body).Decode(&req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
@@ -107,15 +100,8 @@ func (api *API) HandleGetTagInfo(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleUpdateTag(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleUpdateTag(w http.ResponseWriter, r *http.Request) {
|
||||||
// check if user is admin
|
|
||||||
err := api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &database.Tag{}
|
req := &database.Tag{}
|
||||||
err = json.NewDecoder(r.Body).Decode(req)
|
err := json.NewDecoder(r.Body).Decode(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
@@ -135,15 +121,8 @@ type DeleteTagRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleDeleteTag(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleDeleteTag(w http.ResponseWriter, r *http.Request) {
|
||||||
// check if user is admin
|
|
||||||
err := api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &DeleteTagRequest{}
|
req := &DeleteTagRequest{}
|
||||||
err = json.NewDecoder(r.Body).Decode(req)
|
err := json.NewDecoder(r.Body).Decode(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -13,15 +13,8 @@ type PutTagOnFileRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandlePutTagOnFile(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandlePutTagOnFile(w http.ResponseWriter, r *http.Request) {
|
||||||
// check if the user is admin
|
|
||||||
err := api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &PutTagOnFileRequest{}
|
req := &PutTagOnFileRequest{}
|
||||||
err = json.NewDecoder(r.Body).Decode(req)
|
err := json.NewDecoder(r.Body).Decode(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
@@ -87,15 +80,8 @@ type DeleteTagOnFileRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleDeleteTagOnFile(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleDeleteTagOnFile(w http.ResponseWriter, r *http.Request) {
|
||||||
// check if the user is admin
|
|
||||||
err := api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &DeleteTagOnFileRequest{}
|
req := &DeleteTagOnFileRequest{}
|
||||||
err = json.NewDecoder(r.Body).Decode(req)
|
err := json.NewDecoder(r.Body).Decode(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -17,23 +17,8 @@ type LoginResponse struct {
|
|||||||
User *database.User `json:"user"`
|
User *database.User `json:"user"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) LoginAsAnonymous(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleLoginAsAnonymous(w http.ResponseWriter, r *http.Request) {
|
||||||
user, err := api.Db.LoginAsAnonymous()
|
user, err := api.LoginAsAnonymous(w, r)
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
session, _ := api.store.Get(r, api.defaultSessionName)
|
|
||||||
|
|
||||||
// save session
|
|
||||||
session.Values["userId"] = user.ID
|
|
||||||
err = session.Save(r, w)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
resp := &LoginResponse{
|
resp := &LoginResponse{
|
||||||
User: user,
|
User: user,
|
||||||
}
|
}
|
||||||
@@ -45,6 +30,25 @@ func (api *API) LoginAsAnonymous(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (api *API) LoginAsAnonymous(w http.ResponseWriter, r *http.Request) (*database.User, error) {
|
||||||
|
user, err := api.Db.LoginAsAnonymous()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
session, _ := api.store.Get(r, api.defaultSessionName)
|
||||||
|
|
||||||
|
// save session
|
||||||
|
session.Values["userId"] = user.ID
|
||||||
|
err = session.Save(r, w)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// return user
|
||||||
|
return user, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (api *API) HandleLogin(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleLogin(w http.ResponseWriter, r *http.Request) {
|
||||||
var user *database.User
|
var user *database.User
|
||||||
var err error
|
var err error
|
||||||
@@ -142,44 +146,6 @@ func (api *API) HandleRegister(w http.ResponseWriter, r *http.Request) {
|
|||||||
api.HandleOK(w, r)
|
api.HandleOK(w, r)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) CheckAdmin(w http.ResponseWriter, r *http.Request) error {
|
|
||||||
session, _ := api.store.Get(r, api.defaultSessionName)
|
|
||||||
userId, ok := session.Values["userId"]
|
|
||||||
if !ok {
|
|
||||||
return ErrNotLoggedIn
|
|
||||||
}
|
|
||||||
|
|
||||||
user, err := api.Db.GetUserById(userId.(int64))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if user.Role != database.RoleAdmin {
|
|
||||||
return ErrNotAdmin
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (api *API) CheckNotAnonymous(w http.ResponseWriter, r *http.Request) error {
|
|
||||||
session, _ := api.store.Get(r, api.defaultSessionName)
|
|
||||||
userId, ok := session.Values["userId"]
|
|
||||||
if !ok {
|
|
||||||
return ErrNotLoggedIn
|
|
||||||
}
|
|
||||||
|
|
||||||
user, err := api.Db.GetUserById(userId.(int64))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if user.Role == database.RoleAnonymous {
|
|
||||||
return ErrAnonymous
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (api *API) GetUserID(w http.ResponseWriter, r *http.Request) (int64, error) {
|
func (api *API) GetUserID(w http.ResponseWriter, r *http.Request) (int64, error) {
|
||||||
session, _ := api.store.Get(r, api.defaultSessionName)
|
session, _ := api.store.Get(r, api.defaultSessionName)
|
||||||
userId, ok := session.Values["userId"]
|
userId, ok := session.Values["userId"]
|
||||||
@@ -218,14 +184,8 @@ type UpdateUserActiveRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleUpdateUserActive(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleUpdateUserActive(w http.ResponseWriter, r *http.Request) {
|
||||||
err := api.CheckAdmin(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &UpdateUserActiveRequest{}
|
req := &UpdateUserActiveRequest{}
|
||||||
err = json.NewDecoder(r.Body).Decode(req)
|
err := json.NewDecoder(r.Body).Decode(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
@@ -245,16 +205,11 @@ type UpdateUsernameRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleUpdateUsername(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleUpdateUsername(w http.ResponseWriter, r *http.Request) {
|
||||||
// reject anonymous user
|
// middileware reject anonymous user
|
||||||
err := api.CheckNotAnonymous(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &UpdateUsernameRequest{}
|
req := &UpdateUsernameRequest{}
|
||||||
|
|
||||||
err = json.NewDecoder(r.Body).Decode(req)
|
err := json.NewDecoder(r.Body).Decode(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
@@ -326,15 +281,10 @@ type UpdateUserPasswordRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) HandleUpdateUserPassword(w http.ResponseWriter, r *http.Request) {
|
func (api *API) HandleUpdateUserPassword(w http.ResponseWriter, r *http.Request) {
|
||||||
// reject anonymous user
|
// middleware reject anonymous user
|
||||||
err := api.CheckNotAnonymous(w, r)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
req := &UpdateUserPasswordRequest{}
|
req := &UpdateUserPasswordRequest{}
|
||||||
err = json.NewDecoder(r.Body).Decode(req)
|
err := json.NewDecoder(r.Body).Decode(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
|
|||||||
55
pkg/api/middleware.go
Normal file
55
pkg/api/middleware.go
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (api *API) PermissionMiddleware(next http.Handler) http.Handler {
|
||||||
|
// 0 anonymous user
|
||||||
|
// 1 admin
|
||||||
|
// 2 normal user
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// get permission of URL
|
||||||
|
permission, ok := api.APIConfig.Permission[r.URL.Path]
|
||||||
|
// 0 means no permission required
|
||||||
|
if !ok || permission == 0 {
|
||||||
|
next.ServeHTTP(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// ger user permission level
|
||||||
|
userLevel := api.GetUserLevel(r)
|
||||||
|
|
||||||
|
// admin has root (highest) permission level 1
|
||||||
|
if userLevel == 1 {
|
||||||
|
next.ServeHTTP(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// anonymous userLevel 0 don't have any permission
|
||||||
|
// check permission level for other users
|
||||||
|
if userLevel == 0 || userLevel > permission {
|
||||||
|
api.HandleError(w, r, errors.New("No enougth permission"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
next.ServeHTTP(w, r)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (api *API) GetUserLevel(r *http.Request) int64 {
|
||||||
|
session, _ := api.store.Get(r, api.defaultSessionName)
|
||||||
|
userId, ok := session.Values["userId"]
|
||||||
|
if !ok {
|
||||||
|
// not logined user is considered anonymous user
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
user, err := api.Db.GetUserById(userId.(int64))
|
||||||
|
if err != nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
return user.Role
|
||||||
|
}
|
||||||
@@ -12,6 +12,7 @@ type APIConfig struct {
|
|||||||
FfmpegThreads int64 `json:"ffmpeg_threads"`
|
FfmpegThreads int64 `json:"ffmpeg_threads"`
|
||||||
FfmpegConfigList []FfmpegConfig `json:"ffmpeg_config_list"`
|
FfmpegConfigList []FfmpegConfig `json:"ffmpeg_config_list"`
|
||||||
SECRET string `json:"secret"`
|
SECRET string `json:"secret"`
|
||||||
|
Permission map[string]int64 `json:"permission"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type FfmpegConfigList struct {
|
type FfmpegConfigList struct {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import (
|
|||||||
"database/sql"
|
"database/sql"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
_ "github.com/mattn/go-sqlite3"
|
_ "github.com/lib/pq"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Database struct {
|
type Database struct {
|
||||||
@@ -41,7 +41,7 @@ func NewDatabase(dbName string, singleThread bool) (*Database, error) {
|
|||||||
var err error
|
var err error
|
||||||
|
|
||||||
// open database
|
// open database
|
||||||
sqlConn, err := sql.Open("sqlite3", dbName)
|
sqlConn, err := sql.Open("postgres", dbName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,28 +53,29 @@ func (database *Database) GetRandomFilesWithTag(tagID, limit int64) ([]File, err
|
|||||||
return files, nil
|
return files, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (database *Database) GetFilesInFolder(folder_id int64, limit int64, offset int64) ([]File, error) {
|
func (database *Database) GetFilesInFolder(folder_id int64, limit int64, offset int64) ([]File, string, error) {
|
||||||
database.singleThreadLock.Lock()
|
database.singleThreadLock.Lock()
|
||||||
defer database.singleThreadLock.Unlock()
|
defer database.singleThreadLock.Unlock()
|
||||||
|
|
||||||
rows, err := database.stmt.getFilesInFolder.Query(folder_id, limit, offset)
|
rows, err := database.stmt.getFilesInFolder.Query(folder_id, limit, offset)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
defer rows.Close()
|
defer rows.Close()
|
||||||
files := make([]File, 0)
|
files := make([]File, 0)
|
||||||
|
folder := ""
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
file := File{
|
file := File{
|
||||||
Db: database,
|
Db: database,
|
||||||
Folder_id: folder_id,
|
Folder_id: folder_id,
|
||||||
}
|
}
|
||||||
err = rows.Scan(&file.ID, &file.Filename, &file.Filesize, &file.Foldername)
|
err = rows.Scan(&file.ID, &file.Filename, &file.Filesize, &file.Foldername, &folder)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
files = append(files, file)
|
files = append(files, file)
|
||||||
}
|
}
|
||||||
return files, nil
|
return files, folder, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (database *Database) SearchFolders(foldername string, limit int64, offset int64) ([]Folder, error) {
|
func (database *Database) SearchFolders(foldername string, limit int64, offset int64) ([]Folder, error) {
|
||||||
@@ -159,7 +160,17 @@ func (database *Database) Walk(root string, pattern []string, tagIDs []int64, us
|
|||||||
tags = append(tags, tag)
|
tags = append(tags, tag)
|
||||||
}
|
}
|
||||||
|
|
||||||
return filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
|
tx, err := database.sqlConn.Begin()
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
insertFolderStmt := tx.Stmt(database.stmt.insertFolder)
|
||||||
|
insertFileStmt := tx.Stmt(database.stmt.insertFile)
|
||||||
|
putTagOnFileStmt := tx.Stmt(database.stmt.putTagOnFile)
|
||||||
|
findFolderStmt := tx.Stmt(database.stmt.findFolder)
|
||||||
|
findFileStmt := tx.Stmt(database.stmt.findFile)
|
||||||
|
|
||||||
|
err = filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -174,20 +185,66 @@ func (database *Database) Walk(root string, pattern []string, tagIDs []int64, us
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// insert file, folder will aut created
|
// insert file and folder
|
||||||
fileID, err := database.Insert(path, info.Size())
|
// fileID, err := database.Insert(path, info.Size())
|
||||||
|
// if err != nil {
|
||||||
|
// return err
|
||||||
|
// }
|
||||||
|
|
||||||
|
var folderID int64
|
||||||
|
folder, filename := filepath.Split(path)
|
||||||
|
err = findFolderStmt.QueryRow(folder).Scan(&folderID)
|
||||||
|
if err != nil {
|
||||||
|
result, err := insertFolderStmt.Query(folder, filepath.Base(folder))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
for result.Next() {
|
||||||
|
err = result.Scan(&folderID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// try find file id
|
||||||
|
var fileID int64
|
||||||
|
result, err := findFileStmt.Query(folderID, filename)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for result.Next() {
|
||||||
|
err = result.Scan(&fileID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// insert new file
|
||||||
|
result, err = insertFileStmt.Query(folderID, filename, filename, info.Size())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for result.Next() {
|
||||||
|
err = result.Scan(&fileID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for _, tag := range tags {
|
for _, tag := range tags {
|
||||||
err = database.PutTagOnFile(tag.ID, fileID, userID)
|
_, err := putTagOnFileStmt.Exec(tag.ID, fileID, userID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return tx.Commit()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (database *Database) GetFolder(folderId int64) (*Folder, error) {
|
func (database *Database) GetFolder(folderId int64) (*Folder, error) {
|
||||||
|
|||||||
7
pkg/database/method_playback.go
Normal file
7
pkg/database/method_playback.go
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
package database
|
||||||
|
|
||||||
|
func (database *Database) RecordPlayback(playback Playback) error {
|
||||||
|
_, err := database.stmt.recordPlaybackStmt.Exec(
|
||||||
|
playback.UserID, playback.FileID, playback.Time, playback.Method, playback.Duration)
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -6,11 +6,17 @@ func (database *Database) InsertTag(tag *Tag) (int64, error) {
|
|||||||
database.singleThreadLock.Lock()
|
database.singleThreadLock.Lock()
|
||||||
defer database.singleThreadLock.Unlock()
|
defer database.singleThreadLock.Unlock()
|
||||||
|
|
||||||
result, err := database.stmt.insertTag.Exec(tag.Name, tag.Description, tag.CreatedByUserId)
|
result, err := database.stmt.insertTag.Query(tag.Name, tag.Description, tag.CreatedByUserId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
id, err := result.LastInsertId()
|
var id int64
|
||||||
|
for result.Next() {
|
||||||
|
err = result.Scan(&id)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,25 +2,26 @@ package database
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
|
"log"
|
||||||
)
|
)
|
||||||
|
|
||||||
var initFilesTableQuery = `CREATE TABLE IF NOT EXISTS files (
|
var initFilesTableQuery = `CREATE TABLE IF NOT EXISTS files (
|
||||||
id INTEGER PRIMARY KEY,
|
id SERIAL PRIMARY KEY,
|
||||||
folder_id INTEGER NOT NULL,
|
folder_id INTEGER NOT NULL REFERENCES folders(id),
|
||||||
realname TEXT NOT NULL,
|
realname TEXT NOT NULL,
|
||||||
filename TEXT NOT NULL,
|
filename TEXT NOT NULL,
|
||||||
filesize INTEGER NOT NULL,
|
filesize INTEGER NOT NULL,
|
||||||
FOREIGN KEY(folder_id) REFERENCES folders(id)
|
UNIQUE (folder_id, realname)
|
||||||
);`
|
);`
|
||||||
|
|
||||||
var initFoldersTableQuery = `CREATE TABLE IF NOT EXISTS folders (
|
var initFoldersTableQuery = `CREATE TABLE IF NOT EXISTS folders (
|
||||||
id INTEGER PRIMARY KEY,
|
id SERIAL PRIMARY KEY,
|
||||||
folder TEXT NOT NULL,
|
folder TEXT NOT NULL UNIQUE,
|
||||||
foldername TEXT NOT NULL
|
foldername TEXT NOT NULL
|
||||||
);`
|
);`
|
||||||
|
|
||||||
var initFeedbacksTableQuery = `CREATE TABLE IF NOT EXISTS feedbacks (
|
var initFeedbacksTableQuery = `CREATE TABLE IF NOT EXISTS feedbacks (
|
||||||
id INTEGER PRIMARY KEY,
|
id SERIAL PRIMARY KEY,
|
||||||
time INTEGER NOT NULL,
|
time INTEGER NOT NULL,
|
||||||
content TEXT NOT NULL,
|
content TEXT NOT NULL,
|
||||||
user_id INTEGER NOT NULL,
|
user_id INTEGER NOT NULL,
|
||||||
@@ -29,107 +30,101 @@ var initFeedbacksTableQuery = `CREATE TABLE IF NOT EXISTS feedbacks (
|
|||||||
|
|
||||||
// User table schema definition
|
// User table schema definition
|
||||||
// role: 0 - Anonymous User, 1 - Admin, 2 - User
|
// role: 0 - Anonymous User, 1 - Admin, 2 - User
|
||||||
|
// postgres avatar references problem
|
||||||
var initUsersTableQuery = `CREATE TABLE IF NOT EXISTS users (
|
var initUsersTableQuery = `CREATE TABLE IF NOT EXISTS users (
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
id SERIAL PRIMARY KEY,
|
||||||
username TEXT NOT NULL UNIQUE,
|
username TEXT NOT NULL UNIQUE,
|
||||||
password TEXT NOT NULL,
|
password TEXT NOT NULL,
|
||||||
role INTEGER NOT NULL,
|
role INTEGER NOT NULL,
|
||||||
active BOOLEAN NOT NULL,
|
active BOOLEAN NOT NULL,
|
||||||
avatar_id INTEGER NOT NULL,
|
avatar_id INTEGER NOT NULL DEFAULT 0
|
||||||
FOREIGN KEY(avatar_id) REFERENCES avatars(id)
|
|
||||||
);`
|
);`
|
||||||
|
|
||||||
var initAvatarsTableQuery = `CREATE TABLE IF NOT EXISTS avatars (
|
var initAvatarsTableQuery = `CREATE TABLE IF NOT EXISTS avatars (
|
||||||
id INTEGER PRIMARY KEY,
|
id SERIAL PRIMARY KEY,
|
||||||
avatarname TEXT NOT NULL,
|
avatarname TEXT NOT NULL,
|
||||||
avatar BLOB NOT NULL
|
avatar BYTEA NOT NULL
|
||||||
);`
|
);`
|
||||||
|
|
||||||
var initTagsTableQuery = `CREATE TABLE IF NOT EXISTS tags (
|
var initTagsTableQuery = `CREATE TABLE IF NOT EXISTS tags (
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
id SERIAL PRIMARY KEY,
|
||||||
name TEXT NOT NULL UNIQUE,
|
name TEXT NOT NULL UNIQUE,
|
||||||
description TEXT NOT NULL,
|
description TEXT NOT NULL,
|
||||||
created_by_user_id INTEGER NOT NULL,
|
created_by_user_id INTEGER NOT NULL REFERENCES users(id)
|
||||||
FOREIGN KEY(created_by_user_id) REFERENCES users(id)
|
|
||||||
);`
|
);`
|
||||||
|
|
||||||
var initFileHasTagTableQuery = `CREATE TABLE IF NOT EXISTS file_has_tag (
|
var initFileHasTagTableQuery = `CREATE TABLE IF NOT EXISTS file_has_tag (
|
||||||
file_id INTEGER NOT NULL,
|
file_id INTEGER NOT NULL REFERENCES files(id),
|
||||||
tag_id INTEGER NOT NULL,
|
tag_id INTEGER NOT NULL REFERENCES tags(id),
|
||||||
user_id INTEGER NOT NULL,
|
user_id INTEGER NOT NULL REFERENCES users(id),
|
||||||
PRIMARY KEY (file_id, tag_id),
|
PRIMARY KEY (file_id, tag_id)
|
||||||
FOREIGN KEY(user_id) REFERENCES users(id)
|
|
||||||
FOREIGN KEY (file_id) REFERENCES files(id),
|
|
||||||
FOREIGN KEY (tag_id) REFERENCES tags(id)
|
|
||||||
);`
|
);`
|
||||||
|
|
||||||
var initLikesTableQuery = `CREATE TABLE IF NOT EXISTS likes (
|
var initLikesTableQuery = `CREATE TABLE IF NOT EXISTS likes (
|
||||||
user_id INTEGER NOT NULL,
|
user_id INTEGER NOT NULL REFERENCES users(id),
|
||||||
file_id INTEGER NOT NULL,
|
file_id INTEGER NOT NULL REFERENCES files(id),
|
||||||
PRIMARY KEY (user_id, file_id),
|
PRIMARY KEY (user_id, file_id)
|
||||||
FOREIGN KEY (user_id) REFERENCES users(id),
|
|
||||||
FOREIGN KEY (file_id) REFERENCES files(id)
|
|
||||||
);`
|
);`
|
||||||
|
|
||||||
var initReviewsTableQuery = `CREATE TABLE IF NOT EXISTS reviews (
|
var initReviewsTableQuery = `CREATE TABLE IF NOT EXISTS reviews (
|
||||||
id INTEGER PRIMARY KEY,
|
id SERIAL PRIMARY KEY,
|
||||||
user_id INTEGER NOT NULL,
|
user_id INTEGER NOT NULL REFERENCES users(id),
|
||||||
file_id INTEGER NOT NULL,
|
file_id INTEGER NOT NULL REFERENCES files(id),
|
||||||
created_at INTEGER NOT NULL,
|
created_at INTEGER NOT NULL,
|
||||||
updated_at INTEGER NOT NULL DEFAULT 0,
|
updated_at INTEGER NOT NULL DEFAULT 0,
|
||||||
content TEXT NOT NULL,
|
content TEXT NOT NULL
|
||||||
FOREIGN KEY (user_id) REFERENCES users(id),
|
|
||||||
FOREIGN KEY (file_id) REFERENCES files(id)
|
|
||||||
);`
|
);`
|
||||||
|
|
||||||
var initPlaybacksTableQuery = `CREATE TABLE IF NOT EXISTS playbacks (
|
var initPlaybacksTableQuery = `CREATE TABLE IF NOT EXISTS playbacks (
|
||||||
id INTEGER PRIMARY KEY,
|
id SERIAL PRIMARY KEY,
|
||||||
user_id INTEGER NOT NULL,
|
user_id INTEGER NOT NULL REFERENCES users(id),
|
||||||
file_id INTEGER NOT NULL,
|
file_id INTEGER NOT NULL REFERENCES files(id),
|
||||||
time INTEGER NOT NULL,
|
time TIMESTAMP NOT NULL,
|
||||||
mothod INTEGER NOT NULL,
|
method INTEGER NOT NULL,
|
||||||
FOREIGN KEY (user_id) REFERENCES users(id),
|
duration INTERVAL NOT NULL
|
||||||
FOREIGN KEY (file_id) REFERENCES files(id)
|
|
||||||
);`
|
);`
|
||||||
|
|
||||||
var initLogsTableQuery = `CREATE TABLE IF NOT EXISTS logs (
|
var initLogsTableQuery = `CREATE TABLE IF NOT EXISTS logs (
|
||||||
id INTEGER PRIMARY KEY,
|
id SERIAL PRIMARY KEY,
|
||||||
time INTEGER NOT NULL,
|
time INTEGER NOT NULL,
|
||||||
message TEXT NOT NULL,
|
message TEXT NOT NULL,
|
||||||
user_id INTEGER NOT NULL,
|
user_id INTEGER NOT NULL REFERENCES users(id)
|
||||||
FOREIGN KEY (user_id) REFERENCES users(id)
|
|
||||||
);`
|
);`
|
||||||
|
|
||||||
var initTmpfsTableQuery = `CREATE TABLE IF NOT EXISTS tmpfs (
|
var initTmpfsTableQuery = `CREATE TABLE IF NOT EXISTS tmpfs (
|
||||||
id INTEGER PRIMARY KEY,
|
id SERIAL PRIMARY KEY,
|
||||||
path TEXT NOT NULL,
|
path TEXT NOT NULL,
|
||||||
size INTEGER NOT NULL,
|
size INTEGER NOT NULL,
|
||||||
file_id INTEGER NOT NULL,
|
file_id INTEGER NOT NULL REFERENCES files(id),
|
||||||
ffmpeg_config TEXT NOT NULL,
|
ffmpeg_config TEXT NOT NULL,
|
||||||
created_time INTEGER NOT NULL,
|
created_time INTEGER NOT NULL,
|
||||||
accessed_time INTEGER NOT NULL,
|
accessed_time INTEGER NOT NULL
|
||||||
FOREIGN KEY (file_id) REFERENCES files(id)
|
|
||||||
);`
|
);`
|
||||||
|
|
||||||
var insertFolderQuery = `INSERT INTO folders (folder, foldername)
|
var insertFolderQuery = `INSERT INTO folders (folder, foldername)
|
||||||
VALUES (?, ?);`
|
VALUES ($1, $2)
|
||||||
|
ON CONFLICT DO NOTHING
|
||||||
|
RETURNING id;
|
||||||
|
;`
|
||||||
|
|
||||||
var findFolderQuery = `SELECT id FROM folders WHERE folder = ? LIMIT 1;`
|
var findFolderQuery = `SELECT id FROM folders WHERE folder = $1 LIMIT 1;`
|
||||||
|
|
||||||
var findFileQuery = `SELECT id FROM files WHERE folder_id = ? AND realname = ? LIMIT 1;`
|
var findFileQuery = `SELECT id FROM files WHERE folder_id = $1 AND realname = $2 LIMIT 1;`
|
||||||
|
|
||||||
var insertFileQuery = `INSERT INTO files (folder_id, realname, filename, filesize)
|
var insertFileQuery = `INSERT INTO files (folder_id, realname, filename, filesize)
|
||||||
VALUES (?, ?, ?, ?);`
|
VALUES ($1, $2, $3, $4)
|
||||||
|
ON CONFLICT DO NOTHING
|
||||||
|
RETURNING id;`
|
||||||
|
|
||||||
var searchFilesQuery = `SELECT
|
var searchFilesQuery = `SELECT
|
||||||
files.id, files.folder_id, files.filename, folders.foldername, files.filesize
|
files.id, files.folder_id, files.filename, folders.foldername, files.filesize
|
||||||
FROM files
|
FROM files
|
||||||
JOIN folders ON files.folder_id = folders.id
|
JOIN folders ON files.folder_id = folders.id
|
||||||
WHERE filename LIKE ?
|
WHERE filename ILIKE $1
|
||||||
ORDER BY folders.foldername, files.filename
|
ORDER BY folders.foldername, files.filename
|
||||||
LIMIT ? OFFSET ?;`
|
LIMIT $2 OFFSET $3;`
|
||||||
|
|
||||||
var getFolderQuery = `SELECT folder FROM folders WHERE id = ? LIMIT 1;`
|
var getFolderQuery = `SELECT folder FROM folders WHERE id = $1 LIMIT 1;`
|
||||||
|
|
||||||
var dropFilesQuery = `DROP TABLE files;`
|
var dropFilesQuery = `DROP TABLE files;`
|
||||||
|
|
||||||
@@ -139,42 +134,42 @@ var getFileQuery = `SELECT
|
|||||||
files.id, files.folder_id, files.realname, files.filename, folders.foldername, files.filesize
|
files.id, files.folder_id, files.realname, files.filename, folders.foldername, files.filesize
|
||||||
FROM files
|
FROM files
|
||||||
JOIN folders ON files.folder_id = folders.id
|
JOIN folders ON files.folder_id = folders.id
|
||||||
WHERE files.id = ?
|
WHERE files.id = $1
|
||||||
LIMIT 1;`
|
LIMIT 1;`
|
||||||
|
|
||||||
var searchFoldersQuery = `SELECT
|
var searchFoldersQuery = `SELECT
|
||||||
id, folder, foldername
|
id, folder, foldername
|
||||||
FROM folders
|
FROM folders
|
||||||
WHERE foldername LIKE ?
|
WHERE foldername ILIKE $1
|
||||||
ORDER BY foldername
|
ORDER BY foldername
|
||||||
LIMIT ? OFFSET ?;`
|
LIMIT $2 OFFSET $3;`
|
||||||
|
|
||||||
var getFilesInFolderQuery = `SELECT
|
var getFilesInFolderQuery = `SELECT
|
||||||
files.id, files.filename, files.filesize, folders.foldername
|
files.id, files.filename, files.filesize, folders.foldername, folders.folder
|
||||||
FROM files
|
FROM files
|
||||||
JOIN folders ON files.folder_id = folders.id
|
JOIN folders ON files.folder_id = folders.id
|
||||||
WHERE folder_id = ?
|
WHERE folder_id = $1
|
||||||
ORDER BY files.filename
|
ORDER BY files.filename
|
||||||
LIMIT ? OFFSET ?;`
|
LIMIT $2 OFFSET $3;`
|
||||||
|
|
||||||
var getRandomFilesQuery = `SELECT
|
var getRandomFilesQuery = `SELECT
|
||||||
files.id, files.folder_id, files.filename, folders.foldername, files.filesize
|
files.id, files.folder_id, files.filename, folders.foldername, files.filesize
|
||||||
FROM files
|
FROM files
|
||||||
JOIN folders ON files.folder_id = folders.id
|
JOIN folders ON files.folder_id = folders.id
|
||||||
ORDER BY RANDOM()
|
ORDER BY RANDOM()
|
||||||
LIMIT ?;`
|
LIMIT $1;`
|
||||||
|
|
||||||
var getRandomFilesWithTagQuery = `SELECT
|
var getRandomFilesWithTagQuery = `SELECT
|
||||||
files.id, files.folder_id, files.filename, folders.foldername, files.filesize
|
files.id, files.folder_id, files.filename, folders.foldername, files.filesize
|
||||||
FROM file_has_tag
|
FROM file_has_tag
|
||||||
JOIN files ON file_has_tag.file_id = files.id
|
JOIN files ON file_has_tag.file_id = files.id
|
||||||
JOIN folders ON files.folder_id = folders.id
|
JOIN folders ON files.folder_id = folders.id
|
||||||
WHERE file_has_tag.tag_id = ?
|
WHERE file_has_tag.tag_id = $1
|
||||||
ORDER BY RANDOM()
|
ORDER BY RANDOM()
|
||||||
LIMIT ?;`
|
LIMIT $2;`
|
||||||
|
|
||||||
var insertFeedbackQuery = `INSERT INTO feedbacks (time, content, user_id, header)
|
var insertFeedbackQuery = `INSERT INTO feedbacks (time, content, user_id, header)
|
||||||
VALUES (?, ?, ?, ?);`
|
VALUES ($1, $2, $3, $4);`
|
||||||
|
|
||||||
var getFeedbacksQuery = `SELECT
|
var getFeedbacksQuery = `SELECT
|
||||||
feedbacks.id, feedbacks.time, feedbacks.content, feedbacks.header,
|
feedbacks.id, feedbacks.time, feedbacks.content, feedbacks.header,
|
||||||
@@ -184,39 +179,39 @@ JOIN users ON feedbacks.user_id = users.id
|
|||||||
ORDER BY feedbacks.time
|
ORDER BY feedbacks.time
|
||||||
;`
|
;`
|
||||||
|
|
||||||
var deleteFeedbackQuery = `DELETE FROM feedbacks WHERE id = ?;`
|
var deleteFeedbackQuery = `DELETE FROM feedbacks WHERE id = $1;`
|
||||||
|
|
||||||
var insertUserQuery = `INSERT INTO users (username, password, role, active, avatar_id)
|
var insertUserQuery = `INSERT INTO users (username, password, role, active, avatar_id)
|
||||||
VALUES (?, ?, ?, ?, ?);`
|
VALUES ($1, $2, $3, $4, $5);`
|
||||||
|
|
||||||
var countUserQuery = `SELECT count(*) FROM users;`
|
var countUserQuery = `SELECT count(*) FROM users;`
|
||||||
|
|
||||||
var countAdminQuery = `SELECT count(*) FROM users WHERE role= 1;`
|
var countAdminQuery = `SELECT count(*) FROM users WHERE role= 1;`
|
||||||
|
|
||||||
var getUserQuery = `SELECT id, username, password, role, active, avatar_id FROM users WHERE username = ? LIMIT 1;`
|
var getUserQuery = `SELECT id, username, password, role, active, avatar_id FROM users WHERE username = $1 LIMIT 1;`
|
||||||
|
|
||||||
var getUsersQuery = `SELECT id, username, role, active, avatar_id FROM users;`
|
var getUsersQuery = `SELECT id, username, role, active, avatar_id FROM users;`
|
||||||
|
|
||||||
var getUserByIdQuery = `SELECT id, username, role, active, avatar_id FROM users WHERE id = ? LIMIT 1;`
|
var getUserByIdQuery = `SELECT id, username, role, active, avatar_id FROM users WHERE id = $1 LIMIT 1;`
|
||||||
|
|
||||||
var updateUserActiveQuery = `UPDATE users SET active = ? WHERE id = ?;`
|
var updateUserActiveQuery = `UPDATE users SET active = $1 WHERE id = $2;`
|
||||||
|
|
||||||
var updateUsernameQuery = `UPDATE users SET username = ? WHERE id = ?;`
|
var updateUsernameQuery = `UPDATE users SET username = $1 WHERE id = $2;`
|
||||||
|
|
||||||
var updateUserPasswordQuery = `UPDATE users SET password = ? WHERE id = ?;`
|
var updateUserPasswordQuery = `UPDATE users SET password = $1 WHERE id = $2;`
|
||||||
|
|
||||||
var getAnonymousUserQuery = `SELECT id, username, role, avatar_id FROM users WHERE role = 0 LIMIT 1;`
|
var getAnonymousUserQuery = `SELECT id, username, role, avatar_id FROM users WHERE role = 0 LIMIT 1;`
|
||||||
|
|
||||||
var insertTagQuery = `INSERT INTO tags (name, description, created_by_user_id) VALUES (?, ?, ?);`
|
var insertTagQuery = `INSERT INTO tags (name, description, created_by_user_id) VALUES ($1, $2, $3) RETURNING id;`
|
||||||
|
|
||||||
var deleteTagQuery = `DELETE FROM tags WHERE id = ?;`
|
var deleteTagQuery = `DELETE FROM tags WHERE id = $1;`
|
||||||
|
|
||||||
var getTagQuery = `SELECT
|
var getTagQuery = `SELECT
|
||||||
tags.id, tags.name, tags.description,
|
tags.id, tags.name, tags.description,
|
||||||
users.id, users.username, users.role, users.avatar_id
|
users.id, users.username, users.role, users.avatar_id
|
||||||
FROM tags
|
FROM tags
|
||||||
JOIN users ON tags.created_by_user_id = users.id
|
JOIN users ON tags.created_by_user_id = users.id
|
||||||
WHERE tags.id = ? LIMIT 1;`
|
WHERE tags.id = $1 LIMIT 1;`
|
||||||
|
|
||||||
var getTagsQuery = `SELECT
|
var getTagsQuery = `SELECT
|
||||||
tags.id, tags.name, tags.description,
|
tags.id, tags.name, tags.description,
|
||||||
@@ -226,26 +221,27 @@ JOIN users ON tags.created_by_user_id = users.id
|
|||||||
ORDER BY tags.name
|
ORDER BY tags.name
|
||||||
;`
|
;`
|
||||||
|
|
||||||
var updateTagQuery = `UPDATE tags SET name = ?, description = ? WHERE id = ?;`
|
var updateTagQuery = `UPDATE tags SET name = $1, description = $2 WHERE id = $3;`
|
||||||
|
|
||||||
var putTagOnFileQuery = `INSERT OR IGNORE INTO file_has_tag (tag_id, file_id, user_id) VALUES (?, ?, ?);`
|
// postgres INSERT IGNORE
|
||||||
|
var putTagOnFileQuery = `INSERT INTO file_has_tag (tag_id, file_id, user_id) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING;`
|
||||||
|
|
||||||
var getTagsOnFileQuery = `SELECT
|
var getTagsOnFileQuery = `SELECT
|
||||||
tags.id, tags.name, tags.description, tags.created_by_user_id
|
tags.id, tags.name, tags.description, tags.created_by_user_id
|
||||||
FROM file_has_tag
|
FROM file_has_tag
|
||||||
JOIN tags ON file_has_tag.tag_id = tags.id
|
JOIN tags ON file_has_tag.tag_id = tags.id
|
||||||
WHERE file_has_tag.file_id = ?
|
WHERE file_has_tag.file_id = $1
|
||||||
ORDER BY tags.name
|
ORDER BY tags.name
|
||||||
;`
|
;`
|
||||||
|
|
||||||
var deleteTagOnFileQuery = `DELETE FROM file_has_tag WHERE tag_id = ? AND file_id = ?;`
|
var deleteTagOnFileQuery = `DELETE FROM file_has_tag WHERE tag_id = $1 AND file_id = $2;`
|
||||||
|
|
||||||
var deleteTagReferenceInFileHasTagQuery = `DELETE FROM file_has_tag WHERE tag_id = ?;`
|
var deleteTagReferenceInFileHasTagQuery = `DELETE FROM file_has_tag WHERE tag_id = $1;`
|
||||||
|
|
||||||
var updateFoldernameQuery = `UPDATE folders SET foldername = ? WHERE id = ?;`
|
var updateFoldernameQuery = `UPDATE folders SET foldername = $1 WHERE id = $2;`
|
||||||
|
|
||||||
var insertReviewQuery = `INSERT INTO reviews (user_id, file_id, created_at, content)
|
var insertReviewQuery = `INSERT INTO reviews (user_id, file_id, created_at, content)
|
||||||
VALUES (?, ?, ?, ?);`
|
VALUES ($1, $2, $3, $4);`
|
||||||
|
|
||||||
var getReviewsOnFileQuery = `SELECT
|
var getReviewsOnFileQuery = `SELECT
|
||||||
reviews.id, reviews.created_at, reviews.updated_at, reviews.content,
|
reviews.id, reviews.created_at, reviews.updated_at, reviews.content,
|
||||||
@@ -254,15 +250,15 @@ files.id, files.filename
|
|||||||
FROM reviews
|
FROM reviews
|
||||||
JOIN users ON reviews.user_id = users.id
|
JOIN users ON reviews.user_id = users.id
|
||||||
JOIN files ON reviews.file_id = files.id
|
JOIN files ON reviews.file_id = files.id
|
||||||
WHERE reviews.file_id = ?
|
WHERE reviews.file_id = $1
|
||||||
ORDER BY reviews.created_at
|
ORDER BY reviews.created_at
|
||||||
;`
|
;`
|
||||||
|
|
||||||
var getReviewQuery = `SELECT id, file_id, user_id, created_at, updated_at, content FROM reviews WHERE id = ? LIMIT 1;`
|
var getReviewQuery = `SELECT id, file_id, user_id, created_at, updated_at, content FROM reviews WHERE id = $1 LIMIT 1;`
|
||||||
|
|
||||||
var updateReviewQuery = `UPDATE reviews SET content = ?, updated_at = ? WHERE id = ?;`
|
var updateReviewQuery = `UPDATE reviews SET content = $1, updated_at = $2 WHERE id = $3;`
|
||||||
|
|
||||||
var deleteReviewQuery = `DELETE FROM reviews WHERE id = ?;`
|
var deleteReviewQuery = `DELETE FROM reviews WHERE id = $1;`
|
||||||
|
|
||||||
var getReviewsByUserQuery = `SELECT
|
var getReviewsByUserQuery = `SELECT
|
||||||
reviews.id, reviews.created_at, reviews.updated_at, reviews.content,
|
reviews.id, reviews.created_at, reviews.updated_at, reviews.content,
|
||||||
@@ -271,19 +267,21 @@ files.id, files.filename
|
|||||||
FROM reviews
|
FROM reviews
|
||||||
JOIN users ON reviews.user_id = users.id
|
JOIN users ON reviews.user_id = users.id
|
||||||
JOIN files ON reviews.file_id = files.id
|
JOIN files ON reviews.file_id = files.id
|
||||||
WHERE reviews.user_id = ?
|
WHERE reviews.user_id = $1
|
||||||
ORDER BY reviews.created_at
|
ORDER BY reviews.created_at
|
||||||
;`
|
;`
|
||||||
|
|
||||||
var deleteFileQuery = `DELETE FROM files WHERE id = ?;`
|
var deleteFileQuery = `DELETE FROM files WHERE id = $1;`
|
||||||
|
|
||||||
var deleteFileReferenceInFileHasTagQuery = `DELETE FROM file_has_tag WHERE file_id = ?;`
|
var deleteFileReferenceInFileHasTagQuery = `DELETE FROM file_has_tag WHERE file_id = $1;`
|
||||||
|
|
||||||
var deleteFileReferenceInReviewsQuery = `DELETE FROM reviews WHERE file_id = ?;`
|
var deleteFileReferenceInReviewsQuery = `DELETE FROM reviews WHERE file_id = $1;`
|
||||||
|
|
||||||
var updateFilenameQuery = `UPDATE files SET filename = ? WHERE id = ?;`
|
var updateFilenameQuery = `UPDATE files SET filename = $1 WHERE id = $2;`
|
||||||
|
|
||||||
var resetFilenameQuery = `UPDATE files SET filename = realname WHERE id = ?;`
|
var resetFilenameQuery = `UPDATE files SET filename = realname WHERE id = $1;`
|
||||||
|
|
||||||
|
var recordPlaybackQuery = `INSERT INTO playbacks (user_id, file_id, time, method, duration) VALUES ($1, $2, $3, $4, $5);`
|
||||||
|
|
||||||
type Stmt struct {
|
type Stmt struct {
|
||||||
initFilesTable *sql.Stmt
|
initFilesTable *sql.Stmt
|
||||||
@@ -345,6 +343,7 @@ type Stmt struct {
|
|||||||
deleteFileReferenceInReviews *sql.Stmt
|
deleteFileReferenceInReviews *sql.Stmt
|
||||||
updateFilename *sql.Stmt
|
updateFilename *sql.Stmt
|
||||||
resetFilename *sql.Stmt
|
resetFilename *sql.Stmt
|
||||||
|
recordPlaybackStmt *sql.Stmt
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewPreparedStatement(sqlConn *sql.DB) (*Stmt, error) {
|
func NewPreparedStatement(sqlConn *sql.DB) (*Stmt, error) {
|
||||||
@@ -352,26 +351,22 @@ func NewPreparedStatement(sqlConn *sql.DB) (*Stmt, error) {
|
|||||||
|
|
||||||
stmt := &Stmt{}
|
stmt := &Stmt{}
|
||||||
|
|
||||||
// init files table
|
|
||||||
stmt.initFilesTable, err = sqlConn.Prepare(initFilesTableQuery)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// init folders table
|
// init folders table
|
||||||
stmt.initFoldersTable, err = sqlConn.Prepare(initFoldersTableQuery)
|
stmt.initFoldersTable, err = sqlConn.Prepare(initFoldersTableQuery)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
_, err = stmt.initFoldersTable.Exec()
|
||||||
// init feedbacks tables
|
|
||||||
stmt.initFeedbacksTable, err = sqlConn.Prepare(initFeedbacksTableQuery)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// init users table
|
// init files table
|
||||||
stmt.initUsersTable, err = sqlConn.Prepare(initUsersTableQuery)
|
stmt.initFilesTable, err = sqlConn.Prepare(initFilesTableQuery)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
_, err = stmt.initFilesTable.Exec()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -381,99 +376,103 @@ func NewPreparedStatement(sqlConn *sql.DB) (*Stmt, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
_, err = stmt.initAvatarsTable.Exec()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// init users table
|
||||||
|
stmt.initUsersTable, err = sqlConn.Prepare(initUsersTableQuery)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
_, err = stmt.initUsersTable.Exec()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// init feedbacks tables
|
||||||
|
stmt.initFeedbacksTable, err = sqlConn.Prepare(initFeedbacksTableQuery)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
_, err = stmt.initFeedbacksTable.Exec()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
// init tags table
|
// init tags table
|
||||||
stmt.initTagsTable, err = sqlConn.Prepare(initTagsTableQuery)
|
stmt.initTagsTable, err = sqlConn.Prepare(initTagsTableQuery)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
_, err = stmt.initTagsTable.Exec()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
// init file_has_tag table
|
// init file_has_tag table
|
||||||
stmt.initFileHasTag, err = sqlConn.Prepare(initFileHasTagTableQuery)
|
stmt.initFileHasTag, err = sqlConn.Prepare(initFileHasTagTableQuery)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
_, err = stmt.initFileHasTag.Exec()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
// init likes table
|
// init likes table
|
||||||
stmt.initLikesTable, err = sqlConn.Prepare(initLikesTableQuery)
|
stmt.initLikesTable, err = sqlConn.Prepare(initLikesTableQuery)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
_, err = stmt.initLikesTable.Exec()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
// init reviews table
|
// init reviews table
|
||||||
stmt.initReviewsTable, err = sqlConn.Prepare(initReviewsTableQuery)
|
stmt.initReviewsTable, err = sqlConn.Prepare(initReviewsTableQuery)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
_, err = stmt.initReviewsTable.Exec()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
// init playbacks table
|
// init playbacks table
|
||||||
stmt.initPlaybacksTable, err = sqlConn.Prepare(initPlaybacksTableQuery)
|
stmt.initPlaybacksTable, err = sqlConn.Prepare(initPlaybacksTableQuery)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
_, err = stmt.initPlaybacksTable.Exec()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
// init logs table
|
// init logs table
|
||||||
stmt.initLogsTable, err = sqlConn.Prepare(initLogsTableQuery)
|
stmt.initLogsTable, err = sqlConn.Prepare(initLogsTableQuery)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
_, err = stmt.initLogsTable.Exec()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
// init tmpfs table
|
// init tmpfs table
|
||||||
stmt.initTmpfsTable, err = sqlConn.Prepare(initTmpfsTableQuery)
|
stmt.initTmpfsTable, err = sqlConn.Prepare(initTmpfsTableQuery)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// run init statement
|
|
||||||
_, err = stmt.initFilesTable.Exec()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
_, err = stmt.initFoldersTable.Exec()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
_, err = stmt.initFeedbacksTable.Exec()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
_, err = stmt.initUsersTable.Exec()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
_, err = stmt.initAvatarsTable.Exec()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
_, err = stmt.initTagsTable.Exec()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
_, err = stmt.initFileHasTag.Exec()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
_, err = stmt.initLikesTable.Exec()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
_, err = stmt.initReviewsTable.Exec()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
_, err = stmt.initPlaybacksTable.Exec()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
_, err = stmt.initLogsTable.Exec()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
_, err = stmt.initTmpfsTable.Exec()
|
_, err = stmt.initTmpfsTable.Exec()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log.Println("Init tables finished")
|
||||||
|
|
||||||
// init insert folder statement
|
// init insert folder statement
|
||||||
stmt.insertFolder, err = sqlConn.Prepare(insertFolderQuery)
|
stmt.insertFolder, err = sqlConn.Prepare(insertFolderQuery)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -772,5 +771,12 @@ func NewPreparedStatement(sqlConn *sql.DB) (*Stmt, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stmt.recordPlaybackStmt, err = sqlConn.Prepare(recordPlaybackQuery)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Println("Init statements finished")
|
||||||
|
|
||||||
return stmt, err
|
return stmt, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package database
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type File struct {
|
type File struct {
|
||||||
@@ -12,12 +13,13 @@ type File struct {
|
|||||||
Realname string `json:"-"`
|
Realname string `json:"-"`
|
||||||
Filename string `json:"filename"`
|
Filename string `json:"filename"`
|
||||||
Filesize int64 `json:"filesize"`
|
Filesize int64 `json:"filesize"`
|
||||||
|
folderCache *Folder
|
||||||
}
|
}
|
||||||
|
|
||||||
type Folder struct {
|
type Folder struct {
|
||||||
Db *Database `json:"-"`
|
Db *Database `json:"-"`
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
Folder string `json:"-"`
|
Folder string `json:"folder"`
|
||||||
Foldername string `json:"foldername"`
|
Foldername string `json:"foldername"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,6 +60,15 @@ type Feedback struct {
|
|||||||
Time int64 `json:"time"`
|
Time int64 `json:"time"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type Playback struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
UserID int64 `json:"user_id"`
|
||||||
|
FileID int64 `json:"file_id"`
|
||||||
|
Time time.Time `json:"time"`
|
||||||
|
Method int64 `json:"method"`
|
||||||
|
Duration time.Duration `json:"Duration"`
|
||||||
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
RoleAnonymous = int64(0)
|
RoleAnonymous = int64(0)
|
||||||
RoleAdmin = int64(1)
|
RoleAdmin = int64(1)
|
||||||
@@ -65,9 +76,23 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func (f *File) Path() (string, error) {
|
func (f *File) Path() (string, error) {
|
||||||
folder, err := f.Db.GetFolder(f.Folder_id)
|
var err error
|
||||||
|
if f.folderCache == nil {
|
||||||
|
f.folderCache, err = f.Db.GetFolder(f.Folder_id)
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
return filepath.Join(folder.Folder, f.Realname), nil
|
return filepath.Join(f.folderCache.Folder, f.Realname), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *File) Dir() (string, error) {
|
||||||
|
var err error
|
||||||
|
if f.folderCache == nil {
|
||||||
|
f.folderCache, err = f.Db.GetFolder(f.Folder_id)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return f.folderCache.Folder, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,70 +1,9 @@
|
|||||||
# Getting Started with Create React App
|
# MSW Open Music Web Frontend
|
||||||
|
|
||||||
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
|
This is a React single page application. And use Preact instead of React to achieve a smaller file size.
|
||||||
|
|
||||||
## Available Scripts
|
`node_modules` only has 19M. We uses esbuild and shell scripts and build only takes a milliseconds!
|
||||||
|
|
||||||
In the project directory, you can run:
|
## How to build
|
||||||
|
|
||||||
### `npm start`
|
Simple run `./build.sh`, then all output files are under `./build/` directory.
|
||||||
|
|
||||||
Runs the app in the development mode.\
|
|
||||||
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
|
|
||||||
|
|
||||||
The page will reload if you make edits.\
|
|
||||||
You will also see any lint errors in the console.
|
|
||||||
|
|
||||||
### `npm test`
|
|
||||||
|
|
||||||
Launches the test runner in the interactive watch mode.\
|
|
||||||
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
|
|
||||||
|
|
||||||
### `npm run build`
|
|
||||||
|
|
||||||
Builds the app for production to the `build` folder.\
|
|
||||||
It correctly bundles React in production mode and optimizes the build for the best performance.
|
|
||||||
|
|
||||||
The build is minified and the filenames include the hashes.\
|
|
||||||
Your app is ready to be deployed!
|
|
||||||
|
|
||||||
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
|
|
||||||
|
|
||||||
### `npm run eject`
|
|
||||||
|
|
||||||
**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
|
|
||||||
|
|
||||||
If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
|
|
||||||
|
|
||||||
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
|
|
||||||
|
|
||||||
You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
|
|
||||||
|
|
||||||
## Learn More
|
|
||||||
|
|
||||||
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
|
|
||||||
|
|
||||||
To learn React, check out the [React documentation](https://reactjs.org/).
|
|
||||||
|
|
||||||
### Code Splitting
|
|
||||||
|
|
||||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
|
|
||||||
|
|
||||||
### Analyzing the Bundle Size
|
|
||||||
|
|
||||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
|
|
||||||
|
|
||||||
### Making a Progressive Web App
|
|
||||||
|
|
||||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
|
|
||||||
|
|
||||||
### Advanced Configuration
|
|
||||||
|
|
||||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
|
|
||||||
|
|
||||||
### Deployment
|
|
||||||
|
|
||||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
|
|
||||||
|
|
||||||
### `npm run build` fails to minify
|
|
||||||
|
|
||||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
|
|
||||||
|
|||||||
6
web/build.sh
Executable file
6
web/build.sh
Executable file
@@ -0,0 +1,6 @@
|
|||||||
|
rm -rf build
|
||||||
|
cp -raf public build
|
||||||
|
./node_modules/.bin/esbuild src/index.jsx --bundle --outfile=build/msw-open-music.js --alias:react=preact/compat --alias:react-dom=preact/compat --minify --analyze
|
||||||
|
cat public/index.html | sed "s/%PUBLIC_URL%/$PUBLIC_URL/" > build/index.html
|
||||||
|
|
||||||
|
echo "Build done, output files under ./build directory"
|
||||||
37921
web/package-lock.json
generated
37921
web/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,44 +1,14 @@
|
|||||||
{
|
{
|
||||||
"name": "msw-open-music-react",
|
"name": "msw-open-music-react",
|
||||||
"version": "1.1.0",
|
"version": "1.2.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@testing-library/jest-dom": "^5.15.0",
|
"@preact/compat": "^17.1.2",
|
||||||
"@testing-library/react": "^11.2.7",
|
"esbuild": "^0.15.17",
|
||||||
"@testing-library/user-event": "^12.8.3",
|
"react-router-dom": "^6.4.4",
|
||||||
"react": "^17.0.2",
|
"water.css": "^2.1.1"
|
||||||
"react-dom": "^17.0.2",
|
|
||||||
"react-router": "^6.3.0",
|
|
||||||
"react-router-dom": "^6.3.0",
|
|
||||||
"react-scripts": "^4.0.3",
|
|
||||||
"water.css": "^2.1.1",
|
|
||||||
"web-vitals": "^1.1.2"
|
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "react-scripts start",
|
"build": "bash ./build.sh"
|
||||||
"build": "react-scripts build",
|
|
||||||
"test": "react-scripts test",
|
|
||||||
"eject": "react-scripts eject"
|
|
||||||
},
|
|
||||||
"eslintConfig": {
|
|
||||||
"extends": [
|
|
||||||
"react-app",
|
|
||||||
"react-app/jest"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"browserslist": {
|
|
||||||
"production": [
|
|
||||||
">0.2%",
|
|
||||||
"not dead",
|
|
||||||
"not op_mini all"
|
|
||||||
],
|
|
||||||
"development": [
|
|
||||||
"last 1 chrome version",
|
|
||||||
"last 1 firefox version",
|
|
||||||
"last 1 safari version"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@types/react": "^17.0.34"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,36 +6,14 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
<meta name="description" content="Personal music streaming platform" />
|
<meta name="description" content="Personal music streaming platform" />
|
||||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/favicon.png" />
|
<link rel="apple-touch-icon" href="%PUBLIC_URL%/favicon.png" />
|
||||||
<!--
|
|
||||||
manifest.json provides metadata used when your web app is installed on a
|
|
||||||
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
|
|
||||||
-->
|
|
||||||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
|
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
|
||||||
<!--
|
<link rel="stylesheet" href="%PUBLIC_URL%/msw-open-music.css" />
|
||||||
Notice the use of %PUBLIC_URL% in the tags above.
|
|
||||||
It will be replaced with the URL of the `public` folder during the build.
|
|
||||||
Only files inside the `public` folder can be referenced from the HTML.
|
|
||||||
|
|
||||||
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
|
|
||||||
work correctly both with client-side routing and a non-root public URL.
|
|
||||||
Learn how to configure a non-root public URL by running `npm run build`.
|
|
||||||
-->
|
|
||||||
<!-- Add to homescreen for Chrome on Android -->
|
|
||||||
<meta name="mobile-web-app-capable" content="yes" />
|
<meta name="mobile-web-app-capable" content="yes" />
|
||||||
<title>MSW Open Music</title>
|
<title>MSW Open Music</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
<!--
|
<script type="module" src="%PUBLIC_URL%/msw-open-music.js"></script>
|
||||||
This HTML file is a template.
|
|
||||||
If you open it directly in the browser, you will see an empty page.
|
|
||||||
|
|
||||||
You can add webfonts, meta tags, or analytics to this file.
|
|
||||||
The build step will place the bundled scripts into the <body> tag.
|
|
||||||
|
|
||||||
To begin the development, run `npm start` or `yarn start`.
|
|
||||||
To create a production bundle, use `npm run build` or `yarn build`.
|
|
||||||
-->
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -3,11 +3,19 @@ html {
|
|||||||
}
|
}
|
||||||
body {
|
body {
|
||||||
margin: auto;
|
margin: auto;
|
||||||
margin-top: 1rem;
|
padding-top: 1rem;
|
||||||
|
max-width: unset;
|
||||||
|
min-height: 100vh;
|
||||||
|
}
|
||||||
|
#root {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
}
|
}
|
||||||
.base {
|
.base {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-row-gap: 1em;
|
grid-row-gap: 1em;
|
||||||
|
max-width: 800px;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
.header {
|
.header {
|
||||||
color: white;
|
color: white;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { HashRouter as Router, Routes, Route, NavLink } from "react-router-dom";
|
import { HashRouter as Router, Routes, Route, NavLink } from "react-router-dom";
|
||||||
import "./App.css";
|
import "./App.css";
|
||||||
|
|
||||||
@@ -27,6 +28,27 @@ function App() {
|
|||||||
const [user, setUser] = useState({});
|
const [user, setUser] = useState({});
|
||||||
const [langCode, setLangCode] = useState("en_US");
|
const [langCode, setLangCode] = useState("en_US");
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (playingFile.id === undefined) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const html = document.getElementsByTagName("html")[0];
|
||||||
|
const retStyle = html.style;
|
||||||
|
const bodyRetStyle = document.body.style
|
||||||
|
html.style = `
|
||||||
|
backdrop-filter: blur(10px);
|
||||||
|
background-size: cover;
|
||||||
|
background-attachment: fixed;
|
||||||
|
background-position: center;
|
||||||
|
background-image: url("/api/v1/get_file_avatar?id=${playingFile.id}");
|
||||||
|
`;
|
||||||
|
document.body.style.opacity = 0.88;
|
||||||
|
return () => {
|
||||||
|
html.style = retStyle;
|
||||||
|
document.body.style = bodyRetStyle;
|
||||||
|
};
|
||||||
|
}, [playingFile.id]);
|
||||||
|
|
||||||
// select language
|
// select language
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const browserCode = window.navigator.language;
|
const browserCode = window.navigator.language;
|
||||||
@@ -40,7 +62,7 @@ function App() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// fallback to english
|
// fallback to english
|
||||||
setLangCode('en-US');
|
setLangCode("en-US");
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
import { useEffect, useState } from "react";
|
import * as React from 'react';
|
||||||
import { useNavigate } from "react-router";
|
import {useEffect, useState} from "react";
|
||||||
import { CalcReadableFilesizeDetail } from "./Common";
|
import {useNavigate} from "react-router";
|
||||||
|
import {CalcReadableFilesizeDetail} from "./Common";
|
||||||
import FfmpegConfig from "./FfmpegConfig";
|
import FfmpegConfig from "./FfmpegConfig";
|
||||||
import FileDialog from "./FileDialog";
|
import FileDialog from "./FileDialog";
|
||||||
import { Tr } from "../translate";
|
import {Tr} from "../translate";
|
||||||
|
|
||||||
function AudioPlayer(props) {
|
function AudioPlayer(props) {
|
||||||
// props.playingFile
|
// props.playingFile
|
||||||
@@ -21,12 +22,50 @@ function AudioPlayer(props) {
|
|||||||
const [isPreparing, setIsPreparing] = useState(false);
|
const [isPreparing, setIsPreparing] = useState(false);
|
||||||
const [timerCount, setTimerCount] = useState(0);
|
const [timerCount, setTimerCount] = useState(0);
|
||||||
const [timerID, setTimerID] = useState(null);
|
const [timerID, setTimerID] = useState(null);
|
||||||
|
const [beginPlayTime, setBeginPlayTime] = useState(null);
|
||||||
|
const [lastID, setLastID] = useState(null);
|
||||||
|
|
||||||
|
const recordPlaybackHistory = async (file_id, method) => {
|
||||||
|
if (file_id === null) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const player = document.getElementById('dom-player')
|
||||||
|
const endPlayTime = new Date()
|
||||||
|
let duration = parseInt((endPlayTime - beginPlayTime) / 1000)
|
||||||
|
const maxDuration = parseInt(player.duration)
|
||||||
|
// treat 85% of duration as finished
|
||||||
|
if (duration / maxDuration >= 0.85) {
|
||||||
|
method = 1
|
||||||
|
}
|
||||||
|
duration = duration < maxDuration ? duration : maxDuration
|
||||||
|
setBeginPlayTime(endPlayTime)
|
||||||
|
await fetch('/api/v1/record_playback', {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
playback: {
|
||||||
|
file_id,
|
||||||
|
method,
|
||||||
|
duration,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// init mediaSession API
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// no playing file
|
if (navigator.mediaSession) {
|
||||||
|
navigator.mediaSession.setActionHandler("stop", () => {
|
||||||
|
props.setPlayingFile({});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const updatePlayMode = () => {
|
||||||
if (props.playingFile.id === undefined) {
|
if (props.playingFile.id === undefined) {
|
||||||
setPlayingURL("");
|
return
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
if (raw) {
|
if (raw) {
|
||||||
console.log("Play raw file");
|
console.log("Play raw file");
|
||||||
@@ -37,7 +76,7 @@ function AudioPlayer(props) {
|
|||||||
setIsPreparing(true);
|
setIsPreparing(true);
|
||||||
fetch("/api/v1/prepare_file_stream_direct", {
|
fetch("/api/v1/prepare_file_stream_direct", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: {"Content-Type": "application/json"},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
id: props.playingFile.id,
|
id: props.playingFile.id,
|
||||||
config_name: selectedFfmpegConfig.name,
|
config_name: selectedFfmpegConfig.name,
|
||||||
@@ -62,7 +101,39 @@ function AudioPlayer(props) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, [props.playingFile.id, raw, prepare, selectedFfmpegConfig]);
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
// media session related staff
|
||||||
|
if (navigator.mediaSession) {
|
||||||
|
navigator.mediaSession.metadata = new window.MediaMetadata({
|
||||||
|
title: props.playingFile.filename,
|
||||||
|
album: props.playingFile.foldername,
|
||||||
|
artwork: [{src: "/favicon.png", type: "image/png"}],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// no playing file
|
||||||
|
if (props.playingFile.id === undefined) {
|
||||||
|
// 3 music stopped
|
||||||
|
recordPlaybackHistory(lastID, 3)
|
||||||
|
setPlayingURL("");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// crrently playing file, record interupt
|
||||||
|
if (playingURL) {
|
||||||
|
// 2 music changed
|
||||||
|
recordPlaybackHistory(lastID, 2)
|
||||||
|
}
|
||||||
|
setLastID(props.playingFile.id)
|
||||||
|
// have playingFile, record begin time
|
||||||
|
setBeginPlayTime(new Date())
|
||||||
|
updatePlayMode()
|
||||||
|
}, [props.playingFile.id]);
|
||||||
|
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
updatePlayMode()
|
||||||
|
}, [raw, prepare, selectedFfmpegConfig])
|
||||||
|
|
||||||
let navigate = useNavigate();
|
let navigate = useNavigate();
|
||||||
|
|
||||||
@@ -98,7 +169,7 @@ function AudioPlayer(props) {
|
|||||||
{CalcReadableFilesizeDetail(props.playingFile.filesize)}
|
{CalcReadableFilesizeDetail(props.playingFile.filesize)}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{isPreparing && <button disabled>Preparing...</button>}
|
{isPreparing && <button disabled>{Tr("Preparing...")}</button>}
|
||||||
|
|
||||||
{playingURL !== "" && (
|
{playingURL !== "" && (
|
||||||
<button
|
<button
|
||||||
@@ -174,22 +245,30 @@ function AudioPlayer(props) {
|
|||||||
)}
|
)}
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
{playingURL !== "" && (
|
|
||||||
<audio
|
<audio
|
||||||
id="dom-player"
|
id="dom-player"
|
||||||
controls
|
controls
|
||||||
autoPlay
|
autoPlay
|
||||||
loop={loop}
|
|
||||||
className="audio-player"
|
className="audio-player"
|
||||||
src={playingURL}
|
src={playingURL}
|
||||||
|
onEnded={async () => {
|
||||||
|
const player = document.getElementById('dom-player')
|
||||||
|
if (loop) {
|
||||||
|
player.play()
|
||||||
|
}
|
||||||
|
// 1 music finished
|
||||||
|
recordPlaybackHistory(props.playingFile.id, 1)
|
||||||
|
}}
|
||||||
|
onPlay={async () => {
|
||||||
|
setBeginPlayTime(new Date());
|
||||||
|
}}
|
||||||
></audio>
|
></audio>
|
||||||
)}
|
|
||||||
|
|
||||||
<FfmpegConfig
|
<FfmpegConfig
|
||||||
selectedFfmpegConfig={selectedFfmpegConfig}
|
selectedFfmpegConfig={selectedFfmpegConfig}
|
||||||
setSelectedFfmpegConfig={setSelectedFfmpegConfig}
|
setSelectedFfmpegConfig={setSelectedFfmpegConfig}
|
||||||
/>
|
/>
|
||||||
</footer>
|
</footer >
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useState, useEffect, useContext } from "react";
|
import { useState, useEffect, useContext } from "react";
|
||||||
import { Tr, tr, langCodeContext } from "../translate";
|
import { Tr, tr, langCodeContext } from "../translate";
|
||||||
|
|
||||||
function Database() {
|
function Database() {
|
||||||
const [walkPath, setWalkPath] = useState("");
|
const [walkPath, setWalkPath] = useState("");
|
||||||
const [patternString, setPatternString] = useState(
|
const [patternString, setPatternString] = useState(
|
||||||
"wav flac mp3 ogg m4a mka"
|
"wav flac mp3 ogg m4a mka webm"
|
||||||
);
|
);
|
||||||
const [tags, setTags] = useState([]);
|
const [tags, setTags] = useState([]);
|
||||||
const [selectedTags, setSelectedTags] = useState([]);
|
const [selectedTags, setSelectedTags] = useState([]);
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useContext, useEffect, useState } from "react";
|
import { useContext, useEffect, useState } from "react";
|
||||||
import { useParams, useNavigate } from "react-router";
|
import { useParams, useNavigate } from "react-router";
|
||||||
import { tr, Tr, langCodeContext } from "../translate";
|
import { tr, Tr, langCodeContext } from "../translate";
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useState, useEffect, useContext } from "react";
|
import { useState, useEffect, useContext } from "react";
|
||||||
import { useParams, useNavigate } from "react-router";
|
import { useParams, useNavigate } from "react-router";
|
||||||
import { tr, Tr, langCodeContext } from "../translate";
|
import { tr, Tr, langCodeContext } from "../translate";
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useState, useEffect } from "react";
|
import { useState, useEffect } from "react";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { convertIntToDateTime } from "./Common";
|
import { convertIntToDateTime } from "./Common";
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
|
|
||||||
function FfmpegConfig(props) {
|
function FfmpegConfig(props) {
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useNavigate } from "react-router";
|
import { useNavigate } from "react-router";
|
||||||
import { Tr } from "../translate";
|
import { Tr } from "../translate";
|
||||||
|
|
||||||
@@ -11,7 +12,12 @@ function FileDialog(props) {
|
|||||||
let navigate = useNavigate();
|
let navigate = useNavigate();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<dialog open={props.showStatus}>
|
<dialog
|
||||||
|
open={props.showStatus}
|
||||||
|
style={{
|
||||||
|
zIndex: 1,
|
||||||
|
}}
|
||||||
|
>
|
||||||
<p
|
<p
|
||||||
style={{
|
style={{
|
||||||
cursor: "pointer",
|
cursor: "pointer",
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { useNavigate } from "react-router";
|
import { useNavigate } from "react-router";
|
||||||
import { CalcReadableFilesize } from "./Common";
|
import { CalcReadableFilesize } from "./Common";
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import { useNavigate, useParams } from "react-router";
|
import * as React from 'react';
|
||||||
import { useContext, useEffect, useState } from "react";
|
import {useNavigate, useParams} from "react-router";
|
||||||
import { Tr, tr, langCodeContext } from "../translate";
|
import {useContext, useEffect, useState} from "react";
|
||||||
|
import {Tr, tr, langCodeContext} from "../translate";
|
||||||
|
|
||||||
function FileInfo(props) {
|
function FileInfo(props) {
|
||||||
let navigate = useNavigate();
|
let navigate = useNavigate();
|
||||||
@@ -15,7 +16,8 @@ function FileInfo(props) {
|
|||||||
const [tags, setTags] = useState([]);
|
const [tags, setTags] = useState([]);
|
||||||
const [tagsOnFile, setTagsOnFile] = useState([]);
|
const [tagsOnFile, setTagsOnFile] = useState([]);
|
||||||
const [selectedTagID, setSelectedTagID] = useState("");
|
const [selectedTagID, setSelectedTagID] = useState("");
|
||||||
const { langCode } = useContext(langCodeContext);
|
const {langCode} = useContext(langCodeContext);
|
||||||
|
const [ffprobeInfo, setFfprobeInfo] = useState("");
|
||||||
|
|
||||||
function refresh() {
|
function refresh() {
|
||||||
fetch(`/api/v1/get_file_info`, {
|
fetch(`/api/v1/get_file_info`, {
|
||||||
@@ -301,6 +303,27 @@ function FileInfo(props) {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<button onClick={async () => {
|
||||||
|
const resp = await fetch(`/api/v1/get_file_ffprobe_info`, {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
id: parseInt(params.id),
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
const text = await resp.text();
|
||||||
|
setFfprobeInfo(text);
|
||||||
|
}}>FFprobe</button>
|
||||||
|
|
||||||
|
{ffprobeInfo && <textarea
|
||||||
|
style={{
|
||||||
|
height: "30em",
|
||||||
|
}}
|
||||||
|
>{ffprobeInfo}</textarea>}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
import { useParams } from "react-router";
|
import * as React from 'react';
|
||||||
import { useState, useEffect } from "react";
|
import {useParams} from "react-router";
|
||||||
import { useNavigate } from "react-router-dom";
|
import {useState, useEffect} from "react";
|
||||||
import { useQuery } from "./Common";
|
import {useNavigate} from "react-router-dom";
|
||||||
|
import {useQuery} from "./Common";
|
||||||
import FilesTable from "./FilesTable";
|
import FilesTable from "./FilesTable";
|
||||||
import { Tr } from "../translate";
|
import {Tr} from "../translate";
|
||||||
|
|
||||||
function FilesInFolder(props) {
|
function FilesInFolder(props) {
|
||||||
let params = useParams();
|
let params = useParams();
|
||||||
@@ -13,13 +14,14 @@ function FilesInFolder(props) {
|
|||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
const offset = parseInt(query.get("o")) || 0;
|
const offset = parseInt(query.get("o")) || 0;
|
||||||
const [newFoldername, setNewFoldername] = useState("");
|
const [newFoldername, setNewFoldername] = useState("");
|
||||||
|
const [folderPath, setFolderPath] = useState("");
|
||||||
const limit = 10;
|
const limit = 10;
|
||||||
|
|
||||||
function refresh() {
|
function refresh() {
|
||||||
setIsLoading(true);
|
setIsLoading(true);
|
||||||
fetch("/api/v1/get_files_in_folder", {
|
fetch("/api/v1/get_files_in_folder", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: {"Content-Type": "application/json"},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
folder_id: parseInt(params.id),
|
folder_id: parseInt(params.id),
|
||||||
offset: offset,
|
offset: offset,
|
||||||
@@ -32,6 +34,7 @@ function FilesInFolder(props) {
|
|||||||
alert(data.error);
|
alert(data.error);
|
||||||
} else {
|
} else {
|
||||||
setFiles(data.files);
|
setFiles(data.files);
|
||||||
|
setFolderPath(data.folder);
|
||||||
if (data.files.length > 0) {
|
if (data.files.length > 0) {
|
||||||
setNewFoldername(data.files[0].foldername);
|
setNewFoldername(data.files[0].foldername);
|
||||||
}
|
}
|
||||||
@@ -63,7 +66,7 @@ function FilesInFolder(props) {
|
|||||||
setIsLoading(true);
|
setIsLoading(true);
|
||||||
fetch("/api/v1/update_foldername", {
|
fetch("/api/v1/update_foldername", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: {"Content-Type": "application/json"},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
id: parseInt(params.id),
|
id: parseInt(params.id),
|
||||||
foldername: newFoldername,
|
foldername: newFoldername,
|
||||||
@@ -87,7 +90,7 @@ function FilesInFolder(props) {
|
|||||||
setIsLoading(true);
|
setIsLoading(true);
|
||||||
fetch("/api/v1/reset_foldername", {
|
fetch("/api/v1/reset_foldername", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: {"Content-Type": "application/json"},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
id: parseInt(params.id),
|
id: parseInt(params.id),
|
||||||
}),
|
}),
|
||||||
@@ -119,6 +122,7 @@ function FilesInFolder(props) {
|
|||||||
<button onClick={nextPage}>{Tr("Next page")}</button>
|
<button onClick={nextPage}>{Tr("Next page")}</button>
|
||||||
</div>
|
</div>
|
||||||
<FilesTable setPlayingFile={props.setPlayingFile} files={files} />
|
<FilesTable setPlayingFile={props.setPlayingFile} files={files} />
|
||||||
|
<span>{folderPath}</span>
|
||||||
<div>
|
<div>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import FileEntry from "./FileEntry";
|
import FileEntry from "./FileEntry";
|
||||||
import { Tr } from "../translate";
|
import { Tr } from "../translate";
|
||||||
|
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useNavigate } from "react-router";
|
import { useNavigate } from "react-router";
|
||||||
import { Tr } from "../translate";
|
import { Tr } from "../translate";
|
||||||
|
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useContext, useEffect, useState } from "react";
|
import { useContext, useEffect, useState } from "react";
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
import { useQuery } from "./Common";
|
import { useQuery } from "./Common";
|
||||||
@@ -13,12 +14,17 @@ function GetRandomFiles(props) {
|
|||||||
const selectedTag = query.get("t") || "";
|
const selectedTag = query.get("t") || "";
|
||||||
const { langCode } = useContext(langCodeContext);
|
const { langCode } = useContext(langCodeContext);
|
||||||
|
|
||||||
function getRandomFiles() {
|
const fetchRandomFiles = async () => {
|
||||||
|
const resp = await fetch("/api/v1/get_random_files");
|
||||||
|
const json = await resp.json();
|
||||||
|
return json.files;
|
||||||
|
};
|
||||||
|
|
||||||
|
async function getRandomFiles() {
|
||||||
setIsLoading(true);
|
setIsLoading(true);
|
||||||
fetch("/api/v1/get_random_files")
|
fetchRandomFiles()
|
||||||
.then((response) => response.json())
|
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
setFiles(data.files);
|
setFiles(data);
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
alert("get_random_files error: " + error);
|
alert("get_random_files error: " + error);
|
||||||
@@ -28,9 +34,8 @@ function GetRandomFiles(props) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function getRandomFilesWithTag() {
|
const fetchRandomFilesWithTag = async (selectedTag) => {
|
||||||
setIsLoading(true);
|
const resp = await fetch("/api/v1/get_random_files_with_tag", {
|
||||||
fetch("/api/v1/get_random_files_with_tag", {
|
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
@@ -38,14 +43,16 @@ function GetRandomFiles(props) {
|
|||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
id: parseInt(selectedTag),
|
id: parseInt(selectedTag),
|
||||||
}),
|
}),
|
||||||
})
|
});
|
||||||
.then((response) => response.json())
|
const json = await resp.json();
|
||||||
.then((data) => {
|
return json.files;
|
||||||
if (data.error) {
|
};
|
||||||
alert(data.error);
|
|
||||||
} else {
|
function getRandomFilesWithTag() {
|
||||||
setFiles(data.files);
|
setIsLoading(true);
|
||||||
}
|
fetchRandomFilesWithTag(selectedTag)
|
||||||
|
.then((files) => {
|
||||||
|
setFiles(files);
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
alert("get_random_files_with_tag error: " + error);
|
alert("get_random_files_with_tag error: " + error);
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
import { useContext, useState } from "react";
|
import { useContext, useState } from "react";
|
||||||
import { Tr, tr, langCodeContext } from "../translate";
|
import { Tr, tr, langCodeContext } from "../translate";
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useNavigate } from "react-router";
|
import { useNavigate } from "react-router";
|
||||||
import Database from "./Database";
|
import Database from "./Database";
|
||||||
|
|
||||||
@@ -7,7 +8,6 @@ import { useContext } from "react";
|
|||||||
function Manage(props) {
|
function Manage(props) {
|
||||||
let navigate = useNavigate();
|
let navigate = useNavigate();
|
||||||
const { langCode, setLangCode } = useContext(langCodeContext);
|
const { langCode, setLangCode } = useContext(langCodeContext);
|
||||||
const codes = Object.keys(LANG_OPTIONS);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="page">
|
<div className="page">
|
||||||
@@ -17,13 +17,18 @@ function Manage(props) {
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<select
|
<select
|
||||||
|
value={langCode}
|
||||||
onChange={(event) => {
|
onChange={(event) => {
|
||||||
setLangCode(codes[event.target.selectedIndex]);
|
setLangCode(event.target.value);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{codes.map((code) => {
|
{Object.keys(LANG_OPTIONS).map((code) => {
|
||||||
const langOption = LANG_OPTIONS[code];
|
const langOption = LANG_OPTIONS[code];
|
||||||
return <option key={code}>{langOption.name}</option>;
|
return (
|
||||||
|
<option value={code} key={code}>
|
||||||
|
{langOption.name}
|
||||||
|
</option>
|
||||||
|
);
|
||||||
})}
|
})}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
@@ -80,6 +85,15 @@ function Manage(props) {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<Database />
|
<Database />
|
||||||
|
<p>
|
||||||
|
<a
|
||||||
|
href="https://github.com/heimoshuiyu/msw-open-music"
|
||||||
|
target="_blank"
|
||||||
|
rel="noreferrer"
|
||||||
|
>
|
||||||
|
{Tr("View source code on Github")}
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useState, useEffect } from "react";
|
import { useState, useEffect } from "react";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { Tr } from "../translate";
|
import { Tr } from "../translate";
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
import { useContext, useState } from "react";
|
import { useContext, useState } from "react";
|
||||||
import { tr, Tr, langCodeContext } from "../translate";
|
import { tr, Tr, langCodeContext } from "../translate";
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { convertIntToDateTime } from "./Common";
|
import { convertIntToDateTime } from "./Common";
|
||||||
import { Tr, tr, langCodeContext } from "../translate";
|
import { Tr, tr, langCodeContext } from "../translate";
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useState, useEffect } from "react";
|
import { useState, useEffect } from "react";
|
||||||
import { useParams } from "react-router";
|
import { useParams } from "react-router";
|
||||||
import ReviewEntry from "./ReviewEntry";
|
import ReviewEntry from "./ReviewEntry";
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useState, useEffect, useContext } from "react";
|
import { useState, useEffect, useContext } from "react";
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
import { useQuery } from "./Common";
|
import { useQuery } from "./Common";
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useContext, useEffect, useState } from "react";
|
import { useContext, useEffect, useState } from "react";
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
import { useQuery } from "./Common";
|
import { useQuery } from "./Common";
|
||||||
@@ -1,11 +1,14 @@
|
|||||||
import { useEffect, useState } from "react";
|
import * as React from 'react';
|
||||||
|
import { useContext, useEffect, useState } from "react";
|
||||||
import { useParams } from "react-router";
|
import { useParams } from "react-router";
|
||||||
import FilesTable from "./FilesTable";
|
import FilesTable from "./FilesTable";
|
||||||
import { Tr } from "../translate";
|
import { Tr, tr, langCodeContext } from "../translate";
|
||||||
|
|
||||||
function Share(props) {
|
function Share(props) {
|
||||||
let params = useParams();
|
let params = useParams();
|
||||||
const [file, setFile] = useState([]);
|
const { langCode } = useContext(langCodeContext);
|
||||||
|
|
||||||
|
const [file, setFile] = useState({});
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetch("/api/v1/get_file_info", {
|
fetch("/api/v1/get_file_info", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
@@ -16,12 +19,27 @@ function Share(props) {
|
|||||||
})
|
})
|
||||||
.then((response) => response.json())
|
.then((response) => response.json())
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
setFile([data]);
|
setFile(data);
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
alert("get_file_info error: " + error);
|
alert("get_file_info error: " + error);
|
||||||
});
|
});
|
||||||
}, [params]);
|
}, [params]);
|
||||||
|
|
||||||
|
// change title
|
||||||
|
useEffect(() => {
|
||||||
|
const oldTitle = document.title;
|
||||||
|
|
||||||
|
document.title = `${tr("Share", langCode)}🎵: ${
|
||||||
|
file.filename
|
||||||
|
} - MSW Open Music`;
|
||||||
|
|
||||||
|
// set title back
|
||||||
|
return () => {
|
||||||
|
document.title = oldTitle;
|
||||||
|
};
|
||||||
|
}, [file]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="page">
|
<div className="page">
|
||||||
<h3>{Tr("Share with others!")}</h3>
|
<h3>{Tr("Share with others!")}</h3>
|
||||||
@@ -33,7 +51,7 @@ function Share(props) {
|
|||||||
👇 {Tr("Click the filename below to enjoy music!")}
|
👇 {Tr("Click the filename below to enjoy music!")}
|
||||||
<br />
|
<br />
|
||||||
</p>
|
</p>
|
||||||
<FilesTable setPlayingFile={props.setPlayingFile} files={file} />
|
<FilesTable setPlayingFile={props.setPlayingFile} files={[file]} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { Tr } from "../translate";
|
import { Tr } from "../translate";
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useState, useEffect, useContext } from "react";
|
import { useState, useEffect, useContext } from "react";
|
||||||
import { useParams } from "react-router";
|
import { useParams } from "react-router";
|
||||||
import ReviewEntry from "./ReviewEntry";
|
import ReviewEntry from "./ReviewEntry";
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import * as React from 'react';
|
||||||
import { useEffect } from 'react';
|
import { useEffect } from 'react';
|
||||||
|
|
||||||
function UserStatus(props) {
|
function UserStatus(props) {
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import ReactDOM from 'react-dom';
|
|
||||||
import './index.css';
|
|
||||||
import 'water.css';
|
|
||||||
import App from './App';
|
|
||||||
import reportWebVitals from './reportWebVitals';
|
|
||||||
|
|
||||||
ReactDOM.render(
|
|
||||||
<React.StrictMode>
|
|
||||||
<App />
|
|
||||||
</React.StrictMode>,
|
|
||||||
document.getElementById('root')
|
|
||||||
);
|
|
||||||
|
|
||||||
// If you want to start measuring performance in your app, pass a function
|
|
||||||
// to log results (for example: reportWebVitals(console.log))
|
|
||||||
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
|
|
||||||
reportWebVitals();
|
|
||||||
12
web/src/index.jsx
Normal file
12
web/src/index.jsx
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import ReactDOM from 'react-dom';
|
||||||
|
import './index.css';
|
||||||
|
import 'water.css';
|
||||||
|
import App from './App';
|
||||||
|
|
||||||
|
ReactDOM.render(
|
||||||
|
<React.StrictMode>
|
||||||
|
<App />
|
||||||
|
</React.StrictMode>,
|
||||||
|
document.getElementById('root')
|
||||||
|
);
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
const reportWebVitals = onPerfEntry => {
|
|
||||||
if (onPerfEntry && onPerfEntry instanceof Function) {
|
|
||||||
import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
|
|
||||||
getCLS(onPerfEntry);
|
|
||||||
getFID(onPerfEntry);
|
|
||||||
getFCP(onPerfEntry);
|
|
||||||
getLCP(onPerfEntry);
|
|
||||||
getTTFB(onPerfEntry);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export default reportWebVitals;
|
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { createContext, renderToString } from "react";
|
import * as React from 'react';
|
||||||
|
import { createContext } from "react";
|
||||||
import MAP_zh_CN from "./zh_CN";
|
import MAP_zh_CN from "./zh_CN";
|
||||||
|
|
||||||
const LANG_OPTIONS = {
|
const LANG_OPTIONS = {
|
||||||
@@ -100,6 +100,8 @@ const LANG_zh_CN = {
|
|||||||
"filename updated": "已修改文件名",
|
"filename updated": "已修改文件名",
|
||||||
"please select a tag": "请选择一个标签",
|
"please select a tag": "请选择一个标签",
|
||||||
"files in folder": "文件夹内",
|
"files in folder": "文件夹内",
|
||||||
|
"preparing...": "转码中...",
|
||||||
|
"view source code on github": "在 Github 上查看源代码",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default LANG_zh_CN;
|
export default LANG_zh_CN;
|
||||||
|
|||||||
Reference in New Issue
Block a user