Commit Graph

175 Commits

Author SHA1 Message Date
Benjamin Porter
c289c10cd7 Fix typo in comment: FFMGEP -> FFMPEG 2022-06-10 18:03:41 -06:00
Ryan Johnson
cab6394c02 Fixes for jq command generating chapters.txt
Fixes #184

Adds a reduce + flatten step to generate a flat list of chapters.

Fixes #206

Support for emitting timestamps greater than 24 hours.
2022-03-01 21:45:28 -08:00
jcat
c103d4899b feat: Use ffmpeg for cover art on non mpeg-4 containers instead of mp4art from deprecated mp4v2-utils package
Closes: https://github.com/KrumpetPirate/AAXtoMP3/issues/203
2022-02-09 21:24:22 +00:00
jcat
be8473ffba Revert "feat: Use ffmpeg to cover add instead of mp4art from deprecated mp4v2-utils package"
This reverts commit 72794b6785.

This broke cover art addition for MPEG-4 containers
2022-02-09 21:06:47 +00:00
Krumpet Pirate
6d659ade72
Merge pull request #202 from nysasounds/front-cover-typo
fix: video stream metadata for front cover comment should be lower ca…
2022-02-06 21:10:42 -05:00
jcat
b07737f5c4 fix: video stream metadata for front cover comment should be lower case _front_ 2022-02-06 20:29:20 +00:00
Krumpet Pirate
9a1f0fae49
Merge pull request #201 from nysasounds/ffmpeg-from-snap
feat: Add support for ffmpeg via snap package
2022-02-06 14:25:20 -05:00
jcat
1ce836f5a2 feat: Add support for ffmpeg via snap package, requires ability to specify custom ffmpeg binary names if required
closes: https://github.com/KrumpetPirate/AAXtoMP3/issues/200
2022-02-06 00:06:54 +00:00
jcat
72794b6785 feat: Use ffmpeg to cover add instead of mp4art from deprecated mp4v2-utils package
closes: https://github.com/KrumpetPirate/AAXtoMP3/issues/198
2022-02-05 23:31:12 +00:00
Krumpet Pirate
c9bcf2326b
Merge pull request #192 from bensaufley/fix/single_cover_art
Attempt to fix missing cover art for single output
2022-01-21 17:17:06 -05:00
Krumpet Pirate
bee00b9c58
Merge pull request #196 from Muxelmann/patch-2
Fixing `,000` issue with mp4chaps
2022-01-21 17:15:56 -05:00
Ben Saufley
aa702cb97a
Remove redundant loglevel check 2022-01-21 17:09:43 -05:00
Max Zangs
2272d9ce99
Fixing ,000 issue with mp4chaps
Replaces the `,000` in the chapters.txt file with `.000` to allow processing with `mp4chaps`
2022-01-20 11:59:10 +01:00
Ben Saufley
4dd095da2a
Attempt to fix missing cover art for single output
Solves #191 for me anecdotaly, but I don't know if there's a better solution or a different way to go about it.
2022-01-12 09:34:59 -05:00
Ben Saufley
20289a1774
One sed/gsed as well 2022-01-12 00:28:52 -05:00
Ben Saufley
048e15a476
Use GREP variable everywhere 2022-01-12 00:15:14 -05:00
Jerome Küttner
5010927559 fix "syntax error in expression" 2022-01-08 21:45:03 +01:00
Jerome Küttner
b87b08ee6a fix continuing for existing files 2022-01-08 21:13:28 +01:00
Jerome Küttner
7f1f3df020 Add possibility to read the series from the audible library 2022-01-08 16:38:29 +01:00
Krumpet Pirate
fb56087a72
Merge pull request #182 from Natrinicle/extra-crop-cover-check
Add extra_crop_cover to All Odd Cover Widths
2022-01-07 18:13:35 -05:00
Jerome Küttner
45fd0d4852 remove temp metadata_file on continue 2022-01-07 20:58:54 +01:00
Jerome Küttner
12435d3e24 Continue if target directory already exists 2022-01-07 17:48:04 +01:00
Nate Bohman
ab91343dd5
Add extra_crop_cover to All Odd Cover Widths
When attempting to convert
https://www.audible.com/pd/Stephen-Fry-Presents-a-Selection-of-Anton-Chekhovs-Short-Stories-Audiobook/B0036GPPWS
using this tool and chaptered mode, ffmpeg fails out with

[libx264 @ 0x5588ef28d780] width not divisible by 2 (483x500)
Error initializing output stream 0:1 -- Error while opening encoder
for output stream #0:1 - maybe incorrect parameters such as bit_rate,
rate, width or height
Conversion failed!

This is because the cover file embedded in the downloaded mp4 file
from Audible has the dimensions 483x500. Found the extra_crop_cover
that's currently being used only for covers from the Audible CLI
tool and extended the script to instead check the dimensions of the
cover file and include the extra_crop_cover anytime the cover has an
odd width.
2021-11-09 11:36:23 -07:00
fabh2o
a45c6245fe delete '/' and ':' from chapter names 2021-11-08 10:50:52 +01:00
Krumpet Pirate
9b24aa1be3
Merge pull request #177 from fabh2o/fix-176
Fix 176
2021-09-28 19:15:11 -04:00
fabh2o
bf1f384341 fix tmp_chapter_file: unbound variable 2021-09-28 19:56:14 +02:00
fabh2o
f1c4b97bc1 use custom path for ffmpeg/ffprobe binaries 2021-09-28 19:55:16 +02:00
fabh2o
68a91bbbbb --aac is identical to -e:m4a 2021-09-26 18:30:44 +02:00
fabh2o
58ecfbc72b remove useless / in output_folder definition 2021-09-26 18:28:59 +02:00
Stefan Weiberg
e76b5442c1
Apply suggestions from code review
Remove padding for chapter number

Co-authored-by: fabh2o <fabrice.h2o@gmail.com>
2021-09-16 11:47:20 +02:00
Stefan Weiberg
aab2045959
Remove padding for chapter number
Co-authored-by: fabh2o <fabrice.h2o@gmail.com>
2021-09-16 11:46:43 +02:00
Stefan Weiberg
56ca165063 Fix #172 by adding parsing step to save_metadata
* creates a correctly formatted chapter.txt file
  with titles from audible-cli .json
* uses this chapter.txt instead of ffprobe output
  in case audible-cli data should be used
2021-09-16 10:40:57 +02:00
KrumpetPirate
5ea4bd10a4 Update for GNU find, README cleanup 2021-09-03 13:25:30 -04:00
fabh2o
63ffc47aa5 use the var $decrypt_param with all ffmpeg and ffprobe call 2021-09-02 20:11:12 +02:00
fabh2o
b78e4b59b9 auto format selection, fix typo 2021-09-02 19:13:02 +02:00
fabh2o
e9b111aa8a fully support aaxc 2021-09-02 17:49:36 +02:00
fabh2o
3d062fdba7 --aaxc flag, validate voucher and get key and id 2021-09-02 16:16:14 +02:00
fabh2o
64713e23ea Merge branch 'master' of github.com:fabh2o/AAXtoMP3 into all-in-one 2021-07-09 22:45:04 +02:00
KrumpetPirate
0f2180da3c
Merge pull request #162 from Nicko98/master
Call AAXtoMP3 interactively
2021-03-09 17:38:10 -05:00
KrumpetPirate
c6c5b5ee97
Merge pull request #157 from katyavera/patch-1
Use the current filename scheme
2021-03-02 08:56:21 -05:00
KrumpetPirate
1d225d7fe2
Merge pull request #158 from katyavera/patch-2
Allow spaces in the .aax filename
2021-03-02 08:55:43 -05:00
Nicko98
4537c7d01d
Just a little correction regarding sed 2021-03-02 01:51:12 +01:00
Katya Vera
951146022f
Fix typo, reword 2021-02-28 18:36:01 +01:00
Katya Vera
f9b855ea1d
Allow spaces in the .aax filename 2021-02-28 15:29:02 +01:00
Katya Vera
2aa1d05040
Use the current filename scheme
The `fileNameScheme` is empty by default, so the file generated is named only `.chapters.txt` if -F is not specified.
Provided with the filename `mp4file`, mp4chaps searches for a file named `<mp4file>.chapters.txt`.
2021-02-28 15:25:40 +01:00
Nicko98
a68353f4eb
Fix for issue KrumpetPirate#155 2021-02-25 23:21:29 +01:00
Nicko98
9058cf144e
Fix for KrumpetPirate/AAXtoMP3 issue #145
This reverses pull request #139 if ffmpeg version is below 4.
2021-02-21 23:17:17 +01:00
fabh2o
af880305dd Merge branch 'custom-output-folder' of github.com:fabh2o/AAXtoMP3 into all-in-one 2021-02-11 11:11:58 +01:00
fabh2o
ab5d7c7f7c Merge branch 'posix-filenames' of github.com:fabh2o/AAXtoMP3 into all-in-one 2021-02-11 10:47:44 +01:00
fabh2o
96d9d4aa9d Merge branch 'fix-log-level-time-as-octal' of github.com:fabh2o/AAXtoMP3 into audible-cli-integration 2021-02-11 10:38:54 +01:00