Compare commits
No commits in common. "master" and "1.3.0" have entirely different histories.
@ -1,45 +0,0 @@
|
||||
name: MLC Release workflow
|
||||
run-name: ${{ gitea.actor }} is running MLC Release workflow on release ${{ gitea.event.release.tag_name }}
|
||||
on:
|
||||
release:
|
||||
types: [published]
|
||||
|
||||
jobs:
|
||||
Archlinux:
|
||||
runs-on: archlinux
|
||||
steps:
|
||||
- name: Download the release tarball
|
||||
run: curl -sL ${{ gitea.server_url }}/${{ gitea.repository }}/archive/${{ gitea.event.release.tag_name }}.tar.gz --output tarball.tar.gz
|
||||
|
||||
- name: Calculate SHA256 for the tarball
|
||||
run: echo "tbSum=$(sha256sum tarball.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_ENV
|
||||
|
||||
- name: Unarchive tarball
|
||||
run: tar -xvzf tarball.tar.gz
|
||||
|
||||
- name: Clone the AUR repository
|
||||
run: |
|
||||
echo "${{ secrets.DEPLOY_TO_AUR_PRIVATE_KEY }}" > key
|
||||
chmod 600 key
|
||||
GIT_SSH_COMMAND="ssh -i key -o 'IdentitiesOnly yes' -o 'StrictHostKeyChecking no'" git clone ssh://aur@aur.archlinux.org/mlc.git aur
|
||||
chmod 777 -R aur
|
||||
cd aur
|
||||
git config user.name ${{ secrets.DEPLOY_TO_AUR_USER_NAME }}
|
||||
git config user.email ${{ secrets.DEPLOY_TO_AUR_EMAIL }}
|
||||
|
||||
|
||||
- name: Copy PKGBUILD to the directory
|
||||
run: cp mlc/packaging/Archlinux/PKGBUILD aur/
|
||||
|
||||
- name: Put SHA256 sum to PKGBUILD file, and generate .SRCINFO
|
||||
working-directory: aur
|
||||
run: |
|
||||
sed -i "/sha256sums=/c\sha256sums=('${{ env.tbSum }}')" PKGBUILD
|
||||
sudo -u build makepkg --printsrcinfo > .SRCINFO
|
||||
|
||||
- name: Commit package to aur
|
||||
working-directory: aur
|
||||
run: |
|
||||
git add PKGBUILD .SRCINFO
|
||||
git commit -m "${{ gitea.event.release.body }}"
|
||||
GIT_SSH_COMMAND="ssh -i ../key -o 'IdentitiesOnly yes' -o 'StrictHostKeyChecking no'" git push
|
||||
18
CHANGELOG.md
18
CHANGELOG.md
@ -1,21 +1,5 @@
|
||||
# Changelog
|
||||
|
||||
## MLC 1.3.4 (UNRELEASED)
|
||||
- Build fixes
|
||||
|
||||
## MLC 1.3.3 (October 13, 2023)
|
||||
- Regex to specify non-music files to copy
|
||||
- Encoding settings (VBR/CBR, encoding quality, output quality)
|
||||
|
||||
## MLC 1.3.2 (October 10, 2023)
|
||||
- A release purely for CI
|
||||
|
||||
## MLC 1.3.1 (October 10, 2023)
|
||||
- Release build with optimizations
|
||||
- Removed unused files from build
|
||||
- Suppressed warnings
|
||||
- CI to release to AUR
|
||||
|
||||
## MLC 1.3.0 (October 09, 2023)
|
||||
- Config file to control the process
|
||||
- First help page
|
||||
@ -26,7 +10,7 @@
|
||||
|
||||
## MLC 1.1.0 (July 23, 2023)
|
||||
- New logging system
|
||||
- Artist, Album artist, Album and Title are now utf16 encoded, should fix broken titles
|
||||
- Artist, Album artist, Album and Title are now utf16 encoded, should fix broten titles
|
||||
- BPM tag is now rounded, as it supposed to be by spec
|
||||
- Lyrics is not set now for USLT tag for unsychronized lyrics is not supported in LAME
|
||||
- Date bug fix, it was MMDD instead of standard DDMM
|
||||
|
||||
@ -1,49 +1,33 @@
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
project(
|
||||
mlc
|
||||
VERSION 1.3.4
|
||||
DESCRIPTION "Media Library Compiler: converts your media library to a lossy compilation"
|
||||
VERSION 1.3.0
|
||||
DESCRIPTION "Media Library Compiler: rips your media library to a lossy compilation"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
cmake_policy(SET CMP0076 NEW)
|
||||
cmake_policy(SET CMP0079 NEW)
|
||||
|
||||
if (NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE Debug)
|
||||
endif ()
|
||||
|
||||
if (CMAKE_BUILD_TYPE STREQUAL "Release")
|
||||
list(APPEND COMPILE_OPTIONS -O3)
|
||||
elseif (CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
list(APPEND COMPILE_OPTIONS -g)
|
||||
list(APPEND COMPILE_OPTIONS -Wall)
|
||||
list(APPEND COMPILE_OPTIONS -Wextra)
|
||||
endif()
|
||||
|
||||
message("Compilation options: " ${COMPILE_OPTIONS})
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
|
||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||
|
||||
find_package(PkgConfig REQUIRED)
|
||||
find_package(FLAC REQUIRED)
|
||||
find_package(JPEG REQUIRED)
|
||||
find_package(LAME REQUIRED)
|
||||
find_package(TAGLIB REQUIRED)
|
||||
find_package(Threads REQUIRED)
|
||||
|
||||
add_executable(${PROJECT_NAME})
|
||||
target_compile_options(${PROJECT_NAME} PRIVATE ${COMPILE_OPTIONS})
|
||||
pkg_check_modules(LAME REQUIRED IMPORTED_TARGET lame)
|
||||
pkg_check_modules(TAGLIB REQUIRED IMPORTED_TARGET taglib)
|
||||
|
||||
add_executable(mlc)
|
||||
|
||||
add_subdirectory(src)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
target_link_libraries(mlc
|
||||
FLAC::FLAC
|
||||
LAME::LAME
|
||||
PkgConfig::LAME
|
||||
JPEG::JPEG
|
||||
TAGLIB::TAGLIB
|
||||
Threads::Threads
|
||||
PkgConfig::TAGLIB
|
||||
)
|
||||
|
||||
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
|
||||
install(TARGETS mlc RUNTIME DESTINATION bin)
|
||||
|
||||
50
README.md
50
README.md
@ -1,8 +1,6 @@
|
||||
# MLC - Music Library Compiler
|
||||
|
||||
[](https://aur.archlinux.org/packages/mlc/)
|
||||
|
||||
This is a program to compile your local lossless music library to lossy formats
|
||||
This is a program for compilation of your loseless music library to lossy formats
|
||||
|
||||
### Prerequisites
|
||||
|
||||
@ -13,7 +11,7 @@ This is a program to compile your local lossless music library to lossy formats
|
||||
|
||||
### Building
|
||||
|
||||
```sh
|
||||
```
|
||||
$ git clone https://git.macaw.me/blue/mlc
|
||||
$ cd mlc
|
||||
$ mkdir build
|
||||
@ -24,48 +22,12 @@ $ cmake --build .
|
||||
|
||||
### Usage
|
||||
|
||||
Just to compile lossless library to lossy you can use this command
|
||||
assuming you are in the same directory you have just built `MLC`:
|
||||
|
||||
```
|
||||
./mlc path/to/lossless/library path/to/store/lossy/library
|
||||
./mlc path/to/loseless/library path/to/store/lossy/library
|
||||
```
|
||||
|
||||
There are more ways to use `MLC`, please refer to help for more options:
|
||||
For now the program is very primitive, it only works to convert `.flac` files (it trusts the suffix) to `.mp3` VBR best possible quality slowest possible conversion algorithm.
|
||||
|
||||
```sh
|
||||
$ ./mlc help
|
||||
# or
|
||||
$ ./mlc --help
|
||||
#
|
||||
# or
|
||||
$ ./mlc -h
|
||||
```
|
||||
MLC keeps file structure, copies all the non `.flac` files, tries to adapt some `.flac` (vorbis) tags to id3v1 and id3v2 of destination `.mp3` file.
|
||||
|
||||
`MLC` has a way to configure conversion process, it will generate global for you user config on the first launch.
|
||||
It will be located in `~/.config/mlc.conf` and `MLC` will notify you when it's generated.
|
||||
|
||||
You can also make local configs for each directory you launch mlc from.
|
||||
|
||||
To output the default config run the following, assuming you are in the same directory you have just built `MLC`:
|
||||
|
||||
```sh
|
||||
$ ./mlc config
|
||||
```
|
||||
|
||||
To use non default config run the following, assuming you are in the same directory you have just built `MLC`:
|
||||
|
||||
```sh
|
||||
$ ./mlc path/to/lossless/library path/to/store/lossy/library -c path/to/config/file
|
||||
```
|
||||
|
||||
### About
|
||||
|
||||
For now the program is very primitive, it only works to convert `.flac` files (it trusts the suffix) to `.mp3`.
|
||||
I'm planing to add more lossy formats first then, may be, more lossless.
|
||||
|
||||
`MLC` keeps file structure, copies all the non `.flac` files, tries to adapt some `.flac` (vorbis) tags to id3v1 and id3v2 of destination `.mp3` file.
|
||||
You can set up output format and quality and which kind of files should it skip in the config.
|
||||
|
||||
By default `MLC` runs on as many threads as your system can provide to speed up conversion process.
|
||||
You can set up correct amount of threads in the config.
|
||||
For now it's siglethread, no interrupt controll, not even sure converted files are valid, no exotic cases handled, no conversion options can be passed. May be will improve in the futer.
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
find_path(FLAC_INCLUDE_DIR FLAC/stream_decoder.h)
|
||||
find_library(FLAC_LIBRARIES FLAC NAMES flac)
|
||||
|
||||
if(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
|
||||
set(FLAC_FOUND TRUE)
|
||||
endif()
|
||||
|
||||
if(FLAC_FOUND)
|
||||
add_library(FLAC::FLAC SHARED IMPORTED)
|
||||
set_target_properties(FLAC::FLAC PROPERTIES
|
||||
IMPORTED_LOCATION "${FLAC_LIBRARIES}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${FLAC_INCLUDE_DIR}/FLAC"
|
||||
INTERFACE_LINK_LIBRARIES "${FLAC_LIBRARIES}"
|
||||
)
|
||||
if (NOT FLAC_FIND_QUIETLY)
|
||||
message(STATUS "Found FLAC includes: ${FLAC_INCLUDE_DIR}/FLAC")
|
||||
message(STATUS "Found FLAC library: ${FLAC_LIBRARIES}")
|
||||
endif ()
|
||||
else()
|
||||
if (FLAC_FIND_REQUIRED)
|
||||
message(FATAL_ERROR "Could NOT find FLAC development files")
|
||||
endif ()
|
||||
endif()
|
||||
@ -1,26 +1,20 @@
|
||||
#copied from here, thank you
|
||||
#https://github.com/sipwise/sems/blob/master/cmake/FindLame.cmake
|
||||
|
||||
find_path(LAME_INCLUDE_DIR lame/lame.h)
|
||||
find_library(LAME_LIBRARIES lame NAMES mp3lame)
|
||||
FIND_PATH(LAME_INCLUDE_DIR lame/lame.h)
|
||||
FIND_LIBRARY(LAME_LIBRARIES NAMES mp3lame)
|
||||
|
||||
if(LAME_INCLUDE_DIR AND LAME_LIBRARIES)
|
||||
set(LAME_FOUND TRUE)
|
||||
endif(LAME_INCLUDE_DIR AND LAME_LIBRARIES)
|
||||
IF(LAME_INCLUDE_DIR AND LAME_LIBRARIES)
|
||||
SET(LAME_FOUND TRUE)
|
||||
ENDIF(LAME_INCLUDE_DIR AND LAME_LIBRARIES)
|
||||
|
||||
if(LAME_FOUND)
|
||||
add_library(LAME::LAME SHARED IMPORTED)
|
||||
set_target_properties(LAME::LAME PROPERTIES
|
||||
IMPORTED_LOCATION "${LAME_LIBRARIES}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${LAME_INCLUDE_DIR}/lame"
|
||||
INTERFACE_LINK_LIBRARIES "${LAME_LIBRARIES}"
|
||||
)
|
||||
if (NOT Lame_FIND_QUIETLY)
|
||||
message(STATUS "Found lame includes: ${LAME_INCLUDE_DIR}/lame")
|
||||
message(STATUS "Found lame library: ${LAME_LIBRARIES}")
|
||||
endif (NOT Lame_FIND_QUIETLY)
|
||||
else(LAME_FOUND)
|
||||
if (Lame_FIND_REQUIRED)
|
||||
message(FATAL_ERROR "Could NOT find lame development files")
|
||||
endif (Lame_FIND_REQUIRED)
|
||||
endif(LAME_FOUND)
|
||||
IF(LAME_FOUND)
|
||||
IF (NOT Lame_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found lame includes: ${LAME_INCLUDE_DIR}/lame/lame.h")
|
||||
MESSAGE(STATUS "Found lame library: ${LAME_LIBRARIES}")
|
||||
ENDIF (NOT Lame_FIND_QUIETLY)
|
||||
ELSE(LAME_FOUND)
|
||||
IF (Lame_FIND_REQUIRED)
|
||||
MESSAGE(FATAL_ERROR "Could NOT find lame development files")
|
||||
ENDIF (Lame_FIND_REQUIRED)
|
||||
ENDIF(LAME_FOUND)
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
find_path(TAGLIB_INCLUDE_DIR taglib/id3v2tag.h)
|
||||
find_library(TAGLIB_LIBRARIES taglib NAMES TAGLIB tag)
|
||||
|
||||
if(TAGLIB_INCLUDE_DIR AND TAGLIB_LIBRARIES)
|
||||
set(TAGLIB_FOUND TRUE)
|
||||
endif()
|
||||
|
||||
if(TAGLIB_FOUND)
|
||||
add_library(TAGLIB::TAGLIB SHARED IMPORTED)
|
||||
set_target_properties(TAGLIB::TAGLIB PROPERTIES
|
||||
IMPORTED_LOCATION "${TAGLIB_LIBRARIES}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${TAGLIB_INCLUDE_DIR}/taglib"
|
||||
INTERFACE_LINK_LIBRARIES "${TAGLIB_LIBRARIES}"
|
||||
)
|
||||
if (NOT TAGLIB_FIND_QUIETLY)
|
||||
message(STATUS "Found TAGLIB includes: ${TAGLIB_INCLUDE_DIR}/taglib")
|
||||
message(STATUS "Found TAGLIB library: ${TAGLIB_LIBRARIES}")
|
||||
endif ()
|
||||
else()
|
||||
if (TAGLIB_FIND_REQUIRED)
|
||||
message(FATAL_ERROR "Could NOT find TAGLIB development files")
|
||||
endif ()
|
||||
endif()
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
# Maintainer: Yury Gubich <blue@macaw.me>
|
||||
pkgname=mlc
|
||||
pkgver=1.3.4
|
||||
pkgrel=1
|
||||
pkgdesc="Media Library Compiler: rips your media library to a lossy compilation"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://git.macaw.me/blue/mlc"
|
||||
license=('GPL3')
|
||||
depends=('flac' 'lame' 'libjpeg' 'taglib')
|
||||
makedepends=('cmake>=3.5' 'gcc>=7.0')
|
||||
optdepends=()
|
||||
|
||||
source=("$pkgname-$pkgver.tar.gz::https://git.macaw.me/blue/$pkgname/archive/$pkgver.tar.gz")
|
||||
sha256sums=('SKIP')
|
||||
build() {
|
||||
cd "$srcdir/$pkgname"
|
||||
cmake . -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release
|
||||
cmake --build .
|
||||
}
|
||||
package() {
|
||||
cd "$srcdir/$pkgname"
|
||||
DESTDIR="$pkgdir/" cmake --install .
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ endfunction(make_includable)
|
||||
set(SOURCES
|
||||
main.cpp
|
||||
help.cpp
|
||||
#decoded.cpp
|
||||
decoded.cpp
|
||||
flactomp3.cpp
|
||||
collection.cpp
|
||||
taskmanager.cpp
|
||||
@ -17,7 +17,7 @@ set(SOURCES
|
||||
|
||||
set(HEADERS
|
||||
help.h
|
||||
#decoded.h
|
||||
decoded.h
|
||||
flactomp3.h
|
||||
collection.h
|
||||
taskmanager.h
|
||||
|
||||
@ -6,16 +6,23 @@ namespace fs = std::filesystem;
|
||||
|
||||
static const std::string flac(".flac");
|
||||
|
||||
Collection::Collection(const std::filesystem::path& path, TaskManager* tm) :
|
||||
path(path),
|
||||
Collection::Collection(const std::string& path, TaskManager* tm) :
|
||||
path(fs::canonical(path)),
|
||||
countMusical(0),
|
||||
counted(false),
|
||||
taskManager(tm)
|
||||
{}
|
||||
|
||||
Collection::~Collection()
|
||||
Collection::Collection(const std::filesystem::path& path, TaskManager* tm):
|
||||
path(fs::canonical(path)),
|
||||
countMusical(0),
|
||||
counted(false),
|
||||
taskManager(tm)
|
||||
{}
|
||||
|
||||
Collection::~Collection() {
|
||||
}
|
||||
|
||||
void Collection::list() const {
|
||||
if (fs::is_regular_file(path))
|
||||
return;
|
||||
@ -64,10 +71,13 @@ void Collection::convert(const std::string& outPath) {
|
||||
switch (entry.status().type()) {
|
||||
case fs::file_type::regular: {
|
||||
fs::path sourcePath = entry.path();
|
||||
fs::path dstPath = out / sourcePath.stem();
|
||||
if (isMusic(sourcePath))
|
||||
taskManager->queueConvert(sourcePath, out / sourcePath.stem());
|
||||
taskManager->queueJob(sourcePath, dstPath);
|
||||
else
|
||||
taskManager->queueCopy(sourcePath, out / sourcePath.filename());
|
||||
fs::copy_file(sourcePath, dstPath, fs::copy_options::overwrite_existing);
|
||||
|
||||
//std::cout << sourcePath << " => " << dstPath << std::endl;
|
||||
} break;
|
||||
case fs::file_type::directory: {
|
||||
fs::path sourcePath = entry.path();
|
||||
|
||||
@ -10,6 +10,7 @@ class TaskManager;
|
||||
|
||||
class Collection {
|
||||
public:
|
||||
Collection(const std::string& path, TaskManager* tm = nullptr);
|
||||
Collection(const std::filesystem::path& path, TaskManager* tm = nullptr);
|
||||
~Collection();
|
||||
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
#
|
||||
# Use # sign for comments
|
||||
#
|
||||
# All printed commented out values are default values
|
||||
# All printed comented out values are default values
|
||||
#
|
||||
# You should have one of this files as ~/.config/mlc.conf,
|
||||
# if you have started mlc at least once.
|
||||
# This is going to be used every time you launch mlc,
|
||||
# so, edit it if you wish to change default behavior.
|
||||
# so, edit it if you wish to change default behaviour.
|
||||
#
|
||||
# Alternatively, you can launch `mlc -c customConfig.conf`
|
||||
# if you wish to override ~/.config/mlc.conf file
|
||||
@ -20,79 +20,27 @@
|
||||
#level info
|
||||
|
||||
# Output type
|
||||
# Allowed values are: [mp3] (more coming soon)
|
||||
# Allowed values are: [mp3] (more comming soon)
|
||||
#type mp3
|
||||
|
||||
# Source collection path
|
||||
# This is a default path to your music collection source.
|
||||
# It's useful to set it when you always encode the same collection
|
||||
# It's usefull to set it when you always encode the same collection
|
||||
# Leaving this empty (as it is by default) will make you always
|
||||
# specify source in the command line
|
||||
#source
|
||||
|
||||
# Destination path
|
||||
# Destingation path
|
||||
# This is a default path for your encoding destination
|
||||
# It's useful to set it when you often encode your collection
|
||||
# It's usefull to set it when you often encode your collection
|
||||
# to the same output
|
||||
# Leaving this empty (as it is by default) will make you always
|
||||
# specify destination in the command line
|
||||
#destination
|
||||
|
||||
# Parallel tasks
|
||||
# Defines how many threads are going to be started in parallel
|
||||
# Defines how many threads are going to be started in parralel
|
||||
# Allowed values are [0, 1, 2, 3 ...] etc
|
||||
# If it's set to 0 - amount of threads is going to be
|
||||
# as high as your processor can effectively handle
|
||||
#parallel 0
|
||||
|
||||
# Non music files
|
||||
# MLC copies any non-music file it finds in source directory
|
||||
# if it matches the following regex
|
||||
# Allowed value are: [all, none] or regex without any additional syntax,
|
||||
# for example: filesToCopy cover\.jpe?g
|
||||
#filesToCopy all
|
||||
|
||||
# Encoding quality
|
||||
# Sets up encoding quality (NOT OUTPUT QUALITY)
|
||||
# The higher quality the slower the encoding process
|
||||
# 0 is the highest quality and slowest process
|
||||
# 9 is the lowest quality and the fastest process fastest
|
||||
# Allowed values are: [0, 1, 2, ... 9]
|
||||
#encodingQuality 0
|
||||
|
||||
# Output quality
|
||||
# Sets up output quality
|
||||
# The higher quality the less information is lost in compression
|
||||
# 0 is the highest possible quality for selected mode and type and results in the biggest file
|
||||
# 9 is the lowest quality but results in the smallest file
|
||||
# Allowed values are [0, 1, 2, ... 9]
|
||||
# For the constant bitrate modes (CBR) the following table is valid
|
||||
# Quality | MP3 |
|
||||
# --------+-----+--
|
||||
# 0 | 320 |
|
||||
# --------+-----+--
|
||||
# 1 | 288 |
|
||||
# --------+-----+--
|
||||
# 2 | 256 |
|
||||
# --------+-----+--
|
||||
# 3 | 224 |
|
||||
# --------+-----+--
|
||||
# 4 | 192 |
|
||||
# --------+-----+--
|
||||
# 5 | 160 |
|
||||
# --------+-----+--
|
||||
# 6 | 128 |
|
||||
# --------+-----+--
|
||||
# 7 | 96 |
|
||||
# --------+-----+--
|
||||
# 8 | 64 |
|
||||
# --------+-----+--
|
||||
# 9 | 32 |
|
||||
#outputQuality 0
|
||||
|
||||
# Variable bitrate
|
||||
# Switches on or off variable bitrate
|
||||
# VBR files are usually smaller, but not supped to be worse
|
||||
# in terms of quality. VBR files might be a bit more tricky for the player
|
||||
# Allowed values are: [true, false]
|
||||
#vbr true
|
||||
|
||||
@ -12,18 +12,6 @@ constexpr std::string_view jpeg ("image/jpeg");
|
||||
const std::map<std::string, std::string> textIdentificationReplacements({
|
||||
{"PUBLISHER", "TPUB"}
|
||||
});
|
||||
constexpr std::array<int, 10> bitrates({
|
||||
320,
|
||||
288,
|
||||
256,
|
||||
224,
|
||||
192,
|
||||
160,
|
||||
128,
|
||||
96,
|
||||
64,
|
||||
32
|
||||
});
|
||||
|
||||
FLACtoMP3::FLACtoMP3(Logger::Severity severity, uint8_t size) :
|
||||
logger(severity),
|
||||
@ -58,7 +46,7 @@ bool FLACtoMP3::run() {
|
||||
if (pcmCounter > 0)
|
||||
flush();
|
||||
|
||||
int nwrite = lame_encode_flush(encoder, outputBuffer, outputBufferSize);
|
||||
int nwrite = lame_encode_flush(encoder, outputBuffer, pcmSize * 2);
|
||||
fwrite((char*)outputBuffer, nwrite, 1, output);
|
||||
|
||||
|
||||
@ -110,21 +98,9 @@ void FLACtoMP3::setOutputFile(const std::string& path) {
|
||||
|
||||
outPath = path;
|
||||
|
||||
}
|
||||
|
||||
void FLACtoMP3::setParameters(unsigned char encodingQuality, unsigned char outputQuality, bool vbr) {
|
||||
if (vbr) {
|
||||
logger.info("Encoding to VBR with quality " + std::to_string(outputQuality));
|
||||
lame_set_VBR(encoder, vbr_default);
|
||||
lame_set_VBR_quality(encoder, outputQuality);
|
||||
} else {
|
||||
int bitrate = bitrates[outputQuality];
|
||||
logger.info("Encoding to CBR " + std::to_string(bitrate));
|
||||
lame_set_VBR(encoder, vbr_off);
|
||||
lame_set_brate(encoder, bitrate);
|
||||
}
|
||||
|
||||
lame_set_quality(encoder, encodingQuality);
|
||||
lame_set_VBR_quality(encoder, 0);
|
||||
lame_set_quality(encoder, 0);
|
||||
}
|
||||
|
||||
bool FLACtoMP3::initializeOutput() {
|
||||
@ -330,7 +306,7 @@ bool FLACtoMP3::flush() {
|
||||
nwrite = lame_encode_buffer_interleaved(
|
||||
encoder,
|
||||
pcm,
|
||||
pcmCounter / 2,
|
||||
pcmCounter,
|
||||
outputBuffer,
|
||||
outputBufferSize
|
||||
);
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <stream_decoder.h>
|
||||
#include <FLAC/stream_decoder.h>
|
||||
#include <lame.h>
|
||||
#include <jpeglib.h>
|
||||
#include <id3v2tag.h>
|
||||
@ -8,7 +8,6 @@
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
#include <map>
|
||||
#include <array>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "logger/accumulator.h"
|
||||
@ -20,7 +19,6 @@ public:
|
||||
|
||||
void setInputFile(const std::string& path);
|
||||
void setOutputFile(const std::string& path);
|
||||
void setParameters(unsigned char encodingQuality, unsigned char outputQuality, bool vbr);
|
||||
bool run();
|
||||
|
||||
std::list<Logger::Message> getHistory() const;
|
||||
|
||||
16
src/help
16
src/help
@ -20,23 +20,23 @@ Flags:
|
||||
- sets action to help, and prints this page
|
||||
|
||||
Examples:
|
||||
`mlc ~/Music compile/latest`
|
||||
`mlc ~/Music comile/latest`
|
||||
- reads config file from `~/.config/mlc.conf`
|
||||
- if there was not - creates default that changes nothing
|
||||
- creates directory `compile` in the CURRENT directory if it was not created before
|
||||
- create `latest` directory in `compile` directory if it was not created before
|
||||
- creates directory `conpile` in the CURRENT directory if it was not created before
|
||||
- create `latest` directory in `compile` dirrectory if it was not created before
|
||||
- searches for music in `~/Music` directory
|
||||
- converts all music to `compile/latest` directory
|
||||
- copies all other files found in `~/Music` to `compile/latest`
|
||||
- any file name overlap will be overridden
|
||||
- converts all music to `comile/latest` directory
|
||||
- copies all other files found in `~/Music` to `comile/latest`
|
||||
- any file name overlap will be overriden
|
||||
|
||||
`mlc config > myConfig.conf`
|
||||
- prints default config to standard output
|
||||
- unix operator `>` redirects output to a file `myConfig.conf`
|
||||
|
||||
`mlc convert -c myConfig.conf`
|
||||
`mlc rip -c myConfig.conf`
|
||||
- reads file `myConfig.conf` from current directory
|
||||
- if `myConfig.conf` has a valid `source` entry - uses it and uses `rip` as destination
|
||||
- if `myConfig.conf` has a valid `destination` entry - uses it and uses `rip` as source
|
||||
- if both present (don't do this way) - it depends on the order, who comes first - defines behavior
|
||||
- if both present (don't do this way) - it depends on the order, who comes first - defines behaviour
|
||||
- the rest is the same from the first example apart from default config
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#include <string_view>
|
||||
#include <algorithm>
|
||||
|
||||
constexpr std::array<std::string_view, static_cast<int>(Logger::Severity::_severitySize)> levels({
|
||||
constexpr std::array<std::string_view, static_cast<int>(Logger::Severity::_sevetirySize)> levels({
|
||||
"debug",
|
||||
"info",
|
||||
"minor",
|
||||
@ -46,8 +46,8 @@ void Logger::fatal(const std::string& comment, bool colored) const {
|
||||
|
||||
Logger::Severity Logger::stringToSeverity(const std::string& line) {
|
||||
unsigned char dist = std::distance(levels.begin(), std::find(levels.begin(), levels.end(), line));
|
||||
if (dist < static_cast<unsigned char>(Severity::_severitySize))
|
||||
if (dist < static_cast<unsigned char>(Severity::_sevetirySize))
|
||||
return static_cast<Severity>(dist);
|
||||
|
||||
return Severity::_severitySize;
|
||||
return Severity::_sevetirySize;
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@ public:
|
||||
warning,
|
||||
error,
|
||||
fatal,
|
||||
_severitySize
|
||||
_sevetirySize
|
||||
};
|
||||
using Message = std::pair<Severity, std::string>;
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#include <string_view>
|
||||
#include <iostream>
|
||||
|
||||
constexpr const std::array<std::string_view, static_cast<int>(Logger::Severity::_severitySize)> logSettings({
|
||||
constexpr const std::array<std::string_view, static_cast<int>(Logger::Severity::_sevetirySize)> logSettings({
|
||||
/*debug*/ "\e[90m",
|
||||
/*info*/ "\e[32m",
|
||||
/*minor*/ "\e[34m",
|
||||
@ -14,7 +14,7 @@ constexpr const std::array<std::string_view, static_cast<int>(Logger::Severity::
|
||||
/*fatal*/ "\e[91m"
|
||||
});
|
||||
|
||||
constexpr const std::array<std::string_view, static_cast<int>(Logger::Severity::_severitySize)> logHeaders({
|
||||
constexpr const std::array<std::string_view, static_cast<int>(Logger::Severity::_sevetirySize)> logHeaders({
|
||||
/*debug*/ "DEBUG: ",
|
||||
/*info*/ "INFO: ",
|
||||
/*minor*/ "MINOR: ",
|
||||
|
||||
@ -16,10 +16,6 @@ enum class Option {
|
||||
source,
|
||||
destination,
|
||||
parallel,
|
||||
filesToCopy,
|
||||
encodingQuality,
|
||||
outputQuality,
|
||||
vbr,
|
||||
_optionsSize
|
||||
};
|
||||
|
||||
@ -40,26 +36,19 @@ constexpr std::array<std::string_view, static_cast<int>(Option::_optionsSize)> o
|
||||
"type",
|
||||
"source",
|
||||
"destination",
|
||||
"parallel",
|
||||
"filesToCopy",
|
||||
"encodingQuality",
|
||||
"outputQuality",
|
||||
"vbr"
|
||||
"parallel"
|
||||
});
|
||||
|
||||
constexpr std::array<std::string_view, Settings::_typesSize> types({
|
||||
"mp3"
|
||||
});
|
||||
|
||||
constexpr unsigned int maxQuality = 9;
|
||||
constexpr unsigned int minQuality = 0;
|
||||
|
||||
bool is_space(char ch){
|
||||
return std::isspace(static_cast<unsigned char>(ch));
|
||||
}
|
||||
|
||||
Flag getFlag(const std::string_view arg) {
|
||||
for (unsigned char i = 0; i < flags.size(); ++i) {
|
||||
for (int i = 0; i < flags.size(); ++i) {
|
||||
const Literals& lit = flags[i];
|
||||
unsigned char dist = std::distance(lit.begin(), std::find(lit.begin(), lit.end(), arg));
|
||||
if (dist < lit.size())
|
||||
@ -83,13 +72,7 @@ Settings::Settings(int argc, char ** argv):
|
||||
outputType(std::nullopt),
|
||||
input(std::nullopt),
|
||||
output(std::nullopt),
|
||||
logLevel(std::nullopt),
|
||||
configPath(std::nullopt),
|
||||
threads(std::nullopt),
|
||||
nonMusic(std::nullopt),
|
||||
encodingQuality(std::nullopt),
|
||||
outputQuality(std::nullopt),
|
||||
vbr(std::nullopt)
|
||||
logLevel(std::nullopt)
|
||||
{
|
||||
for (int i = 1; i < argc; ++i)
|
||||
arguments.push_back(argv[i]);
|
||||
@ -99,7 +82,7 @@ Settings::Settings(int argc, char ** argv):
|
||||
|
||||
void Settings::parseArguments() {
|
||||
Flag flag = Flag::none;
|
||||
for (unsigned int i = 0; i < arguments.size(); ++i) {
|
||||
for (int i = 0; i < arguments.size(); ++i) {
|
||||
const std::string_view& arg = arguments[i];
|
||||
if (i == 0) {
|
||||
Action act = stringToAction(arg);
|
||||
@ -199,27 +182,6 @@ unsigned int Settings::getThreads() const {
|
||||
return 0;
|
||||
}
|
||||
|
||||
unsigned char Settings::getOutputQuality() const {
|
||||
if (outputQuality.has_value())
|
||||
return outputQuality.value();
|
||||
else
|
||||
return minQuality; //it means max possible quality, min is for min enum value
|
||||
}
|
||||
|
||||
unsigned char Settings::getEncodingQuality() const {
|
||||
if (encodingQuality.has_value())
|
||||
return encodingQuality.value();
|
||||
else
|
||||
return minQuality; //it means max possible quality, min is for min enum value
|
||||
}
|
||||
|
||||
bool Settings::getVBR() const {
|
||||
if (vbr.has_value())
|
||||
return vbr.value();
|
||||
else
|
||||
return true;
|
||||
}
|
||||
|
||||
void Settings::strip(std::string& line) {
|
||||
line.erase(line.begin(), std::find_if(line.begin(), line.end(), std::not_fn(is_space)));
|
||||
line.erase(std::find_if(line.rbegin(), line.rend(), std::not_fn(is_space)).base(), line.end());
|
||||
@ -269,7 +231,7 @@ void Settings::readConfigLine(const std::string& line) {
|
||||
std::string lv;
|
||||
if (!logLevel.has_value() && stream >> lv) {
|
||||
Logger::Severity level = Logger::stringToSeverity(lv);
|
||||
if (level < Logger::Severity::_severitySize)
|
||||
if (level < Logger::Severity::_sevetirySize)
|
||||
logLevel = level;
|
||||
}
|
||||
} break;
|
||||
@ -302,32 +264,6 @@ void Settings::readConfigLine(const std::string& line) {
|
||||
if (!threads.has_value() && stream >> count)
|
||||
threads = count;
|
||||
} break;
|
||||
case Option::filesToCopy: {
|
||||
std::string regex;
|
||||
if (!nonMusic.has_value() && stream >> regex) {
|
||||
if (regex == "all")
|
||||
regex = "";
|
||||
else if (regex == "none")
|
||||
regex = "a^";
|
||||
|
||||
nonMusic = regex;
|
||||
}
|
||||
} break;
|
||||
case Option::outputQuality: {
|
||||
unsigned int value;
|
||||
if (!outputQuality.has_value() && stream >> value)
|
||||
outputQuality = std::clamp(value, minQuality, maxQuality);
|
||||
} break;
|
||||
case Option::encodingQuality: {
|
||||
unsigned int value;
|
||||
if (!encodingQuality.has_value() && stream >> value)
|
||||
encodingQuality = std::clamp(value, minQuality, maxQuality);
|
||||
} break;
|
||||
case Option::vbr: {
|
||||
bool value;
|
||||
if (!vbr.has_value() && stream >> std::boolalpha >> value)
|
||||
vbr = value;
|
||||
} break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@ -363,11 +299,3 @@ std::string Settings::resolvePath(const std::string& line) {
|
||||
else
|
||||
return line;
|
||||
}
|
||||
|
||||
bool Settings::matchNonMusic(const std::string& fileName) const {
|
||||
if (nonMusic.has_value())
|
||||
return std::regex_search(fileName, nonMusic.value());
|
||||
else
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
#include <functional>
|
||||
#include <cctype>
|
||||
#include <sstream>
|
||||
#include <regex>
|
||||
|
||||
#include "logger/logger.h"
|
||||
|
||||
@ -39,10 +38,6 @@ public:
|
||||
Type getType() const;
|
||||
Action getAction() const;
|
||||
unsigned int getThreads() const;
|
||||
bool matchNonMusic(const std::string& fileName) const;
|
||||
unsigned char getEncodingQuality() const;
|
||||
unsigned char getOutputQuality() const;
|
||||
bool getVBR() const;
|
||||
|
||||
bool readConfigFile();
|
||||
void readConfigLine(const std::string& line);
|
||||
@ -68,8 +63,4 @@ private:
|
||||
std::optional<Logger::Severity> logLevel;
|
||||
std::optional<std::string> configPath;
|
||||
std::optional<unsigned int> threads;
|
||||
std::optional<std::regex> nonMusic;
|
||||
std::optional<unsigned char> encodingQuality;
|
||||
std::optional<unsigned char> outputQuality;
|
||||
std::optional<bool> vbr;
|
||||
};
|
||||
|
||||
@ -21,9 +21,9 @@ TaskManager::TaskManager(const std::shared_ptr<Settings>& settings, const std::s
|
||||
TaskManager::~TaskManager() {
|
||||
}
|
||||
|
||||
void TaskManager::queueConvert(const std::filesystem::path& source, const std::filesystem::path& destination) {
|
||||
void TaskManager::queueJob(const std::filesystem::path& source, const std::filesystem::path& destination) {
|
||||
std::unique_lock<std::mutex> lock(queueMutex);
|
||||
jobs.emplace(Job::convert, source, destination);
|
||||
jobs.emplace(source, destination);
|
||||
|
||||
++maxTasks;
|
||||
logger->setStatusMessage(std::to_string(completeTasks) + "/" + std::to_string(maxTasks));
|
||||
@ -32,19 +32,6 @@ void TaskManager::queueConvert(const std::filesystem::path& source, const std::f
|
||||
loopConditional.notify_one();
|
||||
}
|
||||
|
||||
void TaskManager::queueCopy(const std::filesystem::path& source, const std::filesystem::path& destination) {
|
||||
if (!settings->matchNonMusic(source.filename()))
|
||||
return;
|
||||
|
||||
std::unique_lock<std::mutex> lock(queueMutex);
|
||||
jobs.emplace(Job::copy, source, destination);
|
||||
++maxTasks;
|
||||
logger->setStatusMessage(std::to_string(completeTasks) + "/" + std::to_string(maxTasks));
|
||||
|
||||
lock.unlock();
|
||||
loopConditional.notify_one();
|
||||
}
|
||||
|
||||
bool TaskManager::busy() const {
|
||||
std::lock_guard lock(queueMutex);
|
||||
return !jobs.empty();
|
||||
@ -74,16 +61,28 @@ void TaskManager::loop() {
|
||||
if (terminate)
|
||||
return;
|
||||
|
||||
Job job = jobs.front();
|
||||
std::pair<std::string, std::string> pair = jobs.front();
|
||||
++busyThreads;
|
||||
jobs.pop();
|
||||
lock.unlock();
|
||||
|
||||
JobResult result = execute(job);
|
||||
JobResult result;
|
||||
switch (settings->getType()) {
|
||||
case Settings::mp3:
|
||||
result = mp3Job(pair.first, pair.second + ".mp3", settings->getLogLevel());
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
lock.lock();
|
||||
++completeTasks;
|
||||
printResilt(job, result);
|
||||
logger->printNested(
|
||||
result.first ? "Encoding complete but there are messages about it" : "Encoding failed!",
|
||||
{"Source: \t" + pair.first, "Destination: \t" + pair.second},
|
||||
result.second,
|
||||
std::to_string(completeTasks) + "/" + std::to_string(maxTasks)
|
||||
);
|
||||
--busyThreads;
|
||||
lock.unlock();
|
||||
waitConditional.notify_all();
|
||||
@ -119,72 +118,14 @@ unsigned int TaskManager::getCompleteTasks() const {
|
||||
return completeTasks;
|
||||
}
|
||||
|
||||
TaskManager::JobResult TaskManager::execute(Job& job) {
|
||||
switch (job.type) {
|
||||
case Job::copy:
|
||||
return copyJob(job, settings);
|
||||
case Job::convert:
|
||||
switch (settings->getType()) {
|
||||
case Settings::mp3:
|
||||
job.destination.replace_extension("mp3");
|
||||
return mp3Job(job, settings);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return {false, {
|
||||
{Logger::Severity::error, "Unknown job type: " + std::to_string(job.type)}
|
||||
}};
|
||||
}
|
||||
|
||||
void TaskManager::printResilt(const TaskManager::Job& job, const TaskManager::JobResult& result) {
|
||||
std::string msg;
|
||||
switch (job.type) {
|
||||
case Job::copy:
|
||||
if (result.first)
|
||||
msg = "File copy complete, but there are messages about it:";
|
||||
else
|
||||
msg = "File copy failed!";
|
||||
break;
|
||||
case Job::convert:
|
||||
if (result.first)
|
||||
msg = "Encoding complete but there are messages about it:";
|
||||
else
|
||||
msg = "Encoding failed!";
|
||||
break;
|
||||
}
|
||||
|
||||
logger->printNested(
|
||||
msg,
|
||||
{"Source: \t" + job.source.string(), "Destination: \t" + job.destination.string()},
|
||||
result.second,
|
||||
std::to_string(completeTasks) + "/" + std::to_string(maxTasks)
|
||||
);
|
||||
}
|
||||
|
||||
TaskManager::JobResult TaskManager::mp3Job(const TaskManager::Job& job, const std::shared_ptr<Settings>& settings) {
|
||||
FLACtoMP3 convertor(settings->getLogLevel());
|
||||
convertor.setInputFile(job.source);
|
||||
convertor.setOutputFile(job.destination);
|
||||
convertor.setParameters(settings->getEncodingQuality(), settings->getOutputQuality(), settings->getVBR());
|
||||
TaskManager::JobResult TaskManager::mp3Job(
|
||||
const std::filesystem::path& source,
|
||||
const std::filesystem::path& destination,
|
||||
Logger::Severity logLevel)
|
||||
{
|
||||
FLACtoMP3 convertor(logLevel);
|
||||
convertor.setInputFile(source);
|
||||
convertor.setOutputFile(destination);
|
||||
bool result = convertor.run();
|
||||
|
||||
return {result, convertor.getHistory()};
|
||||
}
|
||||
|
||||
TaskManager::JobResult TaskManager::copyJob(const TaskManager::Job& job, const std::shared_ptr<Settings>& settings) {
|
||||
(void)(settings);
|
||||
bool success = std::filesystem::copy_file(
|
||||
job.source,
|
||||
job.destination,
|
||||
std::filesystem::copy_options::overwrite_existing
|
||||
);
|
||||
|
||||
return {success, {}};
|
||||
}
|
||||
|
||||
TaskManager::Job::Job(Type type, const std::filesystem::path& source, std::filesystem::path destination):
|
||||
type(type),
|
||||
source(source),
|
||||
destination(destination) {}
|
||||
|
||||
@ -18,15 +18,13 @@
|
||||
#include "logger/printer.h"
|
||||
|
||||
class TaskManager {
|
||||
using JobResult = std::pair<bool, std::list<Logger::Message>>;
|
||||
struct Job;
|
||||
typedef std::pair<bool, std::list<Logger::Message>> JobResult;
|
||||
public:
|
||||
TaskManager(const std::shared_ptr<Settings>& settings, const std::shared_ptr<Printer>& logger);
|
||||
~TaskManager();
|
||||
|
||||
void start();
|
||||
void queueConvert(const std::filesystem::path& source, const std::filesystem::path& destination);
|
||||
void queueCopy(const std::filesystem::path& source, const std::filesystem::path& destination);
|
||||
void queueJob(const std::filesystem::path& source, const std::filesystem::path& destination);
|
||||
void stop();
|
||||
bool busy() const;
|
||||
void wait();
|
||||
@ -35,11 +33,7 @@ public:
|
||||
|
||||
private:
|
||||
void loop();
|
||||
JobResult execute(Job& job);
|
||||
void printResilt(const Job& job, const JobResult& result);
|
||||
static JobResult mp3Job(const Job& job, const std::shared_ptr<Settings>& settings);
|
||||
static JobResult copyJob(const Job& job, const std::shared_ptr<Settings>& settings);
|
||||
|
||||
static JobResult mp3Job(const std::filesystem::path& source, const std::filesystem::path& destination, Logger::Severity logLevel);
|
||||
private:
|
||||
std::shared_ptr<Settings> settings;
|
||||
std::shared_ptr<Printer> logger;
|
||||
@ -52,17 +46,7 @@ private:
|
||||
std::condition_variable loopConditional;
|
||||
std::condition_variable waitConditional;
|
||||
std::vector<std::thread> threads;
|
||||
std::queue<Job> jobs;
|
||||
std::queue<std::pair<std::filesystem::path, std::filesystem::path>> jobs;
|
||||
|
||||
};
|
||||
|
||||
struct TaskManager::Job {
|
||||
enum Type {
|
||||
copy,
|
||||
convert
|
||||
};
|
||||
Job(Type type, const std::filesystem::path& source, std::filesystem::path destination);
|
||||
Type type;
|
||||
std::filesystem::path source;
|
||||
std::filesystem::path destination;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user