Skip to content

Commit

Permalink
fix: fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
hejianglin committed Mar 21, 2023
2 parents cc706be + 880e5b1 commit b8519ba
Show file tree
Hide file tree
Showing 14 changed files with 4,917 additions and 359 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ media/*
config/*
lib/*
*.mp4
.DS_Store
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<a href="https://hub.docker.com/r/h55205l/ffandown">
<img alt="docker pulls" src="https://img.shields.io/docker/pulls/h55205l/ffandown?style=social"/>
</a>
<a href="https://github.com/helson-lin/ffandown">
<img alt="release downloads" src="https://img.shields.io/github/downloads/helson-lin/ffandown/total?color=brightgreen&label=release%20download"/>
</a>
<a href="https://github.com/helson-lin/ffandown">
<img alt="docker image size" src="https://img.shields.io/badge/platform-macos%7Clinux%7Cwin-brightgreen"/>
</a>
Expand Down
4 changes: 2 additions & 2 deletions bin/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const colors = require('colors')
const bodyParser = require('body-parser')
const logger = require('./log')
const app = express()
const { download, getNetwork } = require('./utils.js')
const { download, getNetwork } = require('./utils/index')

app.use(express.static(path.join(__dirname, '../public')))
const jsonParser = bodyParser.json()
Expand All @@ -15,7 +15,7 @@ const createServer = (option) => {
app.post('/down', jsonParser, (req, res) => {
const { name, url } = req.body
const filePath = path.join(option.downloadDir, (name || new Date().getTime()) + '.mp4')
logger.info(`file download path: ${filePath}`)
logger.info(`online m3u8 url: ${url}, file download path: ${filePath}`)
if (!url) {
res.send('{"code": 2, "message":"url cant be null"}')
} else {
Expand Down
350 changes: 0 additions & 350 deletions bin/utils.js

This file was deleted.

Loading

0 comments on commit b8519ba

Please sign in to comment.