batchmp 1.0__tar.gz → 1.4__tar.gz

{batchmp-1.0/batchmp.egg-info → batchmp-1.4}/PKG-INFO

@@ -1,14 +1,13 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: batchmp
-Version: 1.0
+Version: 1.4
 Summary: Command-line tools for batch media processing
 Home-page: https://github.com/akpw/batch-mp-tools
 Author: Arseniy Kuznetsov
 Author-email: k.arseniy@gmail.com
-License: GNU General Public License v2 (GPLv2)
+License: GPL-2.0-or-later
 Keywords: batch processing media video audio CLI rename tags ID3
 Classifier: Development Status :: 4 - Beta
-Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3 :: Only
@@ -26,6 +25,21 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: mutagen>=1.27
+Requires-Dist: pygtrie>=2.3.2
+Requires-Dist: filetype>=1.0.7
+Requires-Dist: mediafile>=0.13.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 
 **Status:**
@@ -39,10 +53,11 @@ A rainy weekends project under occasional development :)
 - latest from source repository: `$ pip install git+https://github.com/akpw/batch-mp-tools.git`
 
 #### Blogs:
-- [Practical BatchMP](http://www.akpdev.com/tags.html#BatchMP+Tools)
-- [BatchMP Tools Tutorial](http://www.akpdev.com/articles/2015/04/10/batchmp-tutorial-part-i.html)
-- [The BatchMP Tools Project](http://www.akpdev.com/articles/2015/03/21/the-batchmp-project.html)
-- [Parallel batch media processing with FFmpeg and Python](http://www.akpdev.com/articles/2014/11/24/batch-media-processing-ffmpeg-python.html)
+- [Practical BatchMP](https://akpw.github.io//tags.html#BatchMP+Tools)
+- [Renamer Organize & Virtual Views](https://akpw.github.io/articles/2025/09/22/Print-and-Organize.html)
+- [BatchMP Tools Tutorial](https://akpw.github.io//articles/2015/04/10/batchmp-tutorial-part-i.html)
+- [The BatchMP Tools Project](https://akpw.github.io//articles/2015/03/21/the-batchmp-project.html)
+- [Parallel batch media processing with FFmpeg and Python](https://akpw.github.io//articles/2014/11/24/batch-media-processing-ffmpeg-python.html)
 
 ## Description
 
@@ -62,7 +77,7 @@ By default the tools always visualize targeted changes (whenever possible) befor
 
 A little bit more details on each utility:
 
-[**Renamer**](https://github.com/akpw/batch-mp-tools#renamer) is a multi-platform batch rename tool. In addition to common operations such as regexp-based replace, adding text / dates, etc. it also supports advanced operations such as expandable template processing during replace, multi-level indexing across nested directories, flattening folders, and cleaning up non-media files.
+[**Renamer**](https://github.com/akpw/batch-mp-tools#renamer) is a multi-platform batch rename tool. In addition to common operations such as regexp-based replace, adding text / dates, etc. it also supports advanced operations such as expandable template processing during replace, multi-level indexing across nested directories, flattening folders, organizing files by type or date, etc. The enhanced print command now supports virtual views to preview organization without moving files.
 At its simplest, Renamer can be used to print out the content of current directory:
 ```
     $ renamer
@@ -91,6 +106,34 @@ For multi-level indexing of all M4A files in all sub-directories of the current
 ```
 Sequential indexing is supported as well using the `-sq` switch.  An important detail here, by default Renamer is visualizing the targeted changes and asking for permission to proceed before actually doing anything.
 
+For organizing files by media type:
+```
+    $ renamer organize -b type
+    ~/Downloads
+      |- image/
+        |- photo1.jpg
+        |- screenshot.png  
+      |- video/
+        |- movie.mp4
+      |- audio/
+        |- song.mp3
+    
+    Proceed? [y/n]:
+```
+
+Or preview how files would look organized by date without moving them:
+```
+    $ renamer print -b date --date-format "%Y/%m"
+    Virtual view by date:
+    ~/Downloads
+      |- 2025/
+        |- 01/
+          |- document.pdf
+          |- photo.jpg
+        |- 02/
+          |- video.mp4
+```
+
 
 
 [**Tagger**](https://github.com/akpw/batch-mp-tools#tagger) manages media metadata, such as tags and artwork. Setting those in selected media file over multiple nested directories now becomes a breeze, with just a few simple commands working uniformly over almost any practically imaginable audio / video media formats. While easy to use, Tagger supports advanced metadata manipulation such as regexp-based replace, expandable template processing, etc. For example, to set the title tag to respective file names followed by the values of track and tracktotal tags:
@@ -178,7 +221,9 @@ I will follow up with more examples and common use-cases in future blogs.
       . display sorting:
           .. by size/date, ascending/descending
       . action commands:
-          .. print      Prints source directory
+          .. print      Prints source directory. Enhanced with virtual organization views:
+                          $ renamer print -b type          # Preview organize by media type
+                          $ renamer print -b date -df "%Y/%m"  # Preview organize by date
           .. flatten    Flatten all folders below target level, moving the
                         files up at the target level. By default, deletes all empty flattened folders
           .. index      Adds index to files and directories names
@@ -191,6 +236,10 @@ I will follow up with more examples and common use-cases in future blogs.
           .. remove     Removes n characters from files and directories names
           .. capitalize Capitalizes words in files / directories names
           .. delete     Delete selected files and directories
+          .. organize   Organizes files into subdirectories based on their attributes:
+                          $ renamer organize -b type                    # By media type (image/, video/, audio/)
+                          $ renamer organize -b date -df "%Y-%m"         # By date (2025-01/, 2025-02/)
+                          $ renamer organize -b date -df "%Y/%m" -td ~/Sorted  # To target directory
 
     Usage: renamer [-h] [-d DIR] [-f FILE] [Global Options] {Commands} [Commands Options]
     Global Options:
@@ -215,7 +264,7 @@ I will follow up with more examples and common use-cases in future blogs.
         [-q, --quiet]               Do not visualise changes / show messages during processing
 
       Commands:
-        {print, index, add_date, add_text, remove, replace, capitalize, flatten, delete, version, info}
+        {print, index, add_date, add_text, remove, replace, capitalize, flatten, delete, organize, version, info}
         $ renamer {command} -h  #run this for detailed help on individual commands
 
 ### tagger
@@ -324,7 +373,7 @@ Support via FFmpeg: 'AVI', 'FLV', 'MKV', 'MKA'
                                       (shows hidden files excluded by default)
 
         Target output Directory     Target output directory. When omitted, will be
-        [-td, --target-dir]         automatically created at the parent level of
+        [-td, --target-dir]         automatically created inside the parent level of
                                     the input source. For recursive processing,
                                     the processed files directory structure there
                                     will be the same as for the original files.
@@ -348,8 +397,23 @@ Support via FFmpeg: 'AVI', 'FLV', 'MKV', 'MKA'
 ## Installing Development version
 - Clone the repo, then run: `$ python -m pip install .`
 
-**Running Tests**
-- Run via: `$ python setup.py test`
+## Running Tests
+
+**Using pytest (recommended):**
+```bash
+$ pytest -v --tb=short                              # Run all tests with verbose output
+$ pytest tests/                                     # Run all tests  
+$ pytest tests/fs/test_fs_organize.py              # Test organize functionality
+$ pytest tests/fs/test_fsutils.py                  # Test core filesystem utilities
+$ pytest tests/cli/test_renamer_cli.py             # Test renamer CLI
+$ pytest -k "test_organize"                        # Run tests matching pattern
+```
+
+**Using unittest (fallback):**
+```bash
+$ python -m unittest discover tests -v             # Run all tests with verbose output
+$ python -m unittest tests.fs.test_fs_organize     # Run specific test module
+```
 
 
 

batchmp-1.0/PKG-INFO → batchmp-1.4/README.md

@@ -1,32 +1,3 @@
-Metadata-Version: 2.1
-Name: batchmp
-Version: 1.0
-Summary: Command-line tools for batch media processing
-Home-page: https://github.com/akpw/batch-mp-tools
-Author: Arseniy Kuznetsov
-Author-email: k.arseniy@gmail.com
-License: GNU General Public License v2 (GPLv2)
-Keywords: batch processing media video audio CLI rename tags ID3
-Classifier: Development Status :: 4 - Beta
-Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: System Administrators
-Classifier: Intended Audience :: Information Technology
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Multimedia :: Sound/Audio
-Classifier: Topic :: Multimedia :: Sound/Audio :: Analysis
-Classifier: Topic :: Multimedia :: Sound/Audio :: Conversion
-Classifier: Topic :: Multimedia :: Video
-Classifier: Topic :: Multimedia :: Video :: Conversion
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: Utilities
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
 
 **Status:**
 A rainy weekends project under occasional development :)
@@ -39,10 +10,11 @@ A rainy weekends project under occasional development :)
 - latest from source repository: `$ pip install git+https://github.com/akpw/batch-mp-tools.git`
 
 #### Blogs:
-- [Practical BatchMP](http://www.akpdev.com/tags.html#BatchMP+Tools)
-- [BatchMP Tools Tutorial](http://www.akpdev.com/articles/2015/04/10/batchmp-tutorial-part-i.html)
-- [The BatchMP Tools Project](http://www.akpdev.com/articles/2015/03/21/the-batchmp-project.html)
-- [Parallel batch media processing with FFmpeg and Python](http://www.akpdev.com/articles/2014/11/24/batch-media-processing-ffmpeg-python.html)
+- [Practical BatchMP](https://akpw.github.io//tags.html#BatchMP+Tools)
+- [Renamer Organize & Virtual Views](https://akpw.github.io/articles/2025/09/22/Print-and-Organize.html)
+- [BatchMP Tools Tutorial](https://akpw.github.io//articles/2015/04/10/batchmp-tutorial-part-i.html)
+- [The BatchMP Tools Project](https://akpw.github.io//articles/2015/03/21/the-batchmp-project.html)
+- [Parallel batch media processing with FFmpeg and Python](https://akpw.github.io//articles/2014/11/24/batch-media-processing-ffmpeg-python.html)
 
 ## Description
 
@@ -62,7 +34,7 @@ By default the tools always visualize targeted changes (whenever possible) befor
 
 A little bit more details on each utility:
 
-[**Renamer**](https://github.com/akpw/batch-mp-tools#renamer) is a multi-platform batch rename tool. In addition to common operations such as regexp-based replace, adding text / dates, etc. it also supports advanced operations such as expandable template processing during replace, multi-level indexing across nested directories, flattening folders, and cleaning up non-media files.
+[**Renamer**](https://github.com/akpw/batch-mp-tools#renamer) is a multi-platform batch rename tool. In addition to common operations such as regexp-based replace, adding text / dates, etc. it also supports advanced operations such as expandable template processing during replace, multi-level indexing across nested directories, flattening folders, organizing files by type or date, etc. The enhanced print command now supports virtual views to preview organization without moving files.
 At its simplest, Renamer can be used to print out the content of current directory:
 ```
     $ renamer
@@ -91,6 +63,34 @@ For multi-level indexing of all M4A files in all sub-directories of the current
 ```
 Sequential indexing is supported as well using the `-sq` switch.  An important detail here, by default Renamer is visualizing the targeted changes and asking for permission to proceed before actually doing anything.
 
+For organizing files by media type:
+```
+    $ renamer organize -b type
+    ~/Downloads
+      |- image/
+        |- photo1.jpg
+        |- screenshot.png  
+      |- video/
+        |- movie.mp4
+      |- audio/
+        |- song.mp3
+    
+    Proceed? [y/n]:
+```
+
+Or preview how files would look organized by date without moving them:
+```
+    $ renamer print -b date --date-format "%Y/%m"
+    Virtual view by date:
+    ~/Downloads
+      |- 2025/
+        |- 01/
+          |- document.pdf
+          |- photo.jpg
+        |- 02/
+          |- video.mp4
+```
+
 
 
 [**Tagger**](https://github.com/akpw/batch-mp-tools#tagger) manages media metadata, such as tags and artwork. Setting those in selected media file over multiple nested directories now becomes a breeze, with just a few simple commands working uniformly over almost any practically imaginable audio / video media formats. While easy to use, Tagger supports advanced metadata manipulation such as regexp-based replace, expandable template processing, etc. For example, to set the title tag to respective file names followed by the values of track and tracktotal tags:
@@ -178,7 +178,9 @@ I will follow up with more examples and common use-cases in future blogs.
       . display sorting:
           .. by size/date, ascending/descending
       . action commands:
-          .. print      Prints source directory
+          .. print      Prints source directory. Enhanced with virtual organization views:
+                          $ renamer print -b type          # Preview organize by media type
+                          $ renamer print -b date -df "%Y/%m"  # Preview organize by date
           .. flatten    Flatten all folders below target level, moving the
                         files up at the target level. By default, deletes all empty flattened folders
           .. index      Adds index to files and directories names
@@ -191,6 +193,10 @@ I will follow up with more examples and common use-cases in future blogs.
           .. remove     Removes n characters from files and directories names
           .. capitalize Capitalizes words in files / directories names
           .. delete     Delete selected files and directories
+          .. organize   Organizes files into subdirectories based on their attributes:
+                          $ renamer organize -b type                    # By media type (image/, video/, audio/)
+                          $ renamer organize -b date -df "%Y-%m"         # By date (2025-01/, 2025-02/)
+                          $ renamer organize -b date -df "%Y/%m" -td ~/Sorted  # To target directory
 
     Usage: renamer [-h] [-d DIR] [-f FILE] [Global Options] {Commands} [Commands Options]
     Global Options:
@@ -215,7 +221,7 @@ I will follow up with more examples and common use-cases in future blogs.
         [-q, --quiet]               Do not visualise changes / show messages during processing
 
       Commands:
-        {print, index, add_date, add_text, remove, replace, capitalize, flatten, delete, version, info}
+        {print, index, add_date, add_text, remove, replace, capitalize, flatten, delete, organize, version, info}
         $ renamer {command} -h  #run this for detailed help on individual commands
 
 ### tagger
@@ -324,7 +330,7 @@ Support via FFmpeg: 'AVI', 'FLV', 'MKV', 'MKA'
                                       (shows hidden files excluded by default)
 
         Target output Directory     Target output directory. When omitted, will be
-        [-td, --target-dir]         automatically created at the parent level of
+        [-td, --target-dir]         automatically created inside the parent level of
                                     the input source. For recursive processing,
                                     the processed files directory structure there
                                     will be the same as for the original files.
@@ -348,8 +354,23 @@ Support via FFmpeg: 'AVI', 'FLV', 'MKV', 'MKA'
 ## Installing Development version
 - Clone the repo, then run: `$ python -m pip install .`
 
-**Running Tests**
-- Run via: `$ python setup.py test`
+## Running Tests
+
+**Using pytest (recommended):**
+```bash
+$ pytest -v --tb=short                              # Run all tests with verbose output
+$ pytest tests/                                     # Run all tests  
+$ pytest tests/fs/test_fs_organize.py              # Test organize functionality
+$ pytest tests/fs/test_fsutils.py                  # Test core filesystem utilities
+$ pytest tests/cli/test_renamer_cli.py             # Test renamer CLI
+$ pytest -k "test_organize"                        # Run tests matching pattern
+```
+
+**Using unittest (fallback):**
+```bash
+$ python -m unittest discover tests -v             # Run all tests with verbose output
+$ python -m unittest tests.fs.test_fs_organize     # Run specific test module
+```
 
 
 

{batchmp-1.0 → batchmp-1.4}/batchmp/cli/base/bmp_dispatch.py

@@ -12,7 +12,7 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 
-import pkg_resources
+from importlib import metadata
 import batchmp.cli.base.vchk
 from batchmp.cli.base.bmp_options import BatchMPArgParser, BatchMPBaseCommands
 
@@ -43,7 +43,7 @@ class BatchMPDispatcher:
     def print_version(self):
         ''' Prints BatchMP version info
         '''
-        version = pkg_resources.require("batchmp")[0].version
+        version = metadata.version("batchmp")
         print('BatchMP tools version {}'.format(version))
 
     def print_info(self):

{batchmp-1.0 → batchmp-1.4}/batchmp/cli/bmfp/bmfp_dispatch.py

@@ -94,7 +94,9 @@ class BMFPDispatcher(BatchMPDispatcher):
         ff_entry_params = FFEntryParamsExt(args)
         Fragmenter().fragment(ff_entry_params,
                 fragment_starttime = args['fragment_starttime'].total_seconds(),
-                fragment_duration = args['fragment_duration'].total_seconds())
+                fragment_duration = args['fragment_duration'].total_seconds(),
+                fragment_trim = args['fragment_trim'].total_seconds(),
+                )
 
     def segment(self, args):
         ff_entry_params = FFEntryParamsExt(args)

{batchmp-1.0 → batchmp-1.4}/batchmp/cli/bmfp/bmfp_options.py

@@ -146,8 +146,9 @@ class BMFPArgParser(BatchMPArgParser):
         target_output_group = parser.add_argument_group('Target Output Directory')
         target_output_group.add_argument("-td", "--target-dir", dest = "target_dir",
                     type = lambda d: self._is_valid_dir_path(parser, d),
+                    default = '.',
                     help = "Target output directory. When omitted, will be automatically "
-                            "created at the parent level of the input source. "
+                            "created inside the parent level of the input source. "
                             "For recursive processing, the processed files directory structure there "
                             "will be the same as for the original files.")
 
@@ -246,14 +247,18 @@ class BMFPArgParser(BatchMPArgParser):
                                             description = 'Extracts a fragment via specified start time & duration',
                                             formatter_class = BatchMPHelpFormatter)
         group = fragment_parser.add_argument_group('Fragment parameters')
-        group.add_argument('-fs', '--starttime', dest='fragment_starttime',
+        group.add_argument('-fs', '--start', dest='fragment_starttime',
                 help = 'Fragment start time, in seconds or in the "hh:mm:ss[.xxx]" format',
                 type = lambda f: self._is_timedelta(parser, f),
                 required = True)
         group.add_argument('-fd', '--duration', dest='fragment_duration',
-                help = 'Fragment duration, in seconds or in the "hh:mm:ss[.xxx]" format',
+                help = 'Fragment duration (default is full media length), in seconds or in the "hh:mm:ss[.xxx]" format',
                 type = lambda f: self._is_timedelta(parser, f),
                 default = timedelta(days = 380))
+        group.add_argument('-ft', '--trim', dest='fragment_trim',
+                help = 'Fragment trimming at the end (optional), in seconds or in the "hh:mm:ss[.xxx]" format',
+                type = lambda f: self._is_timedelta(parser, f),
+                default = timedelta(0))
 
         # Segment
         segment_parser = subparsers.add_parser(BMFPCommands.SEGMENT,

{batchmp-1.0 → batchmp-1.4}/batchmp/cli/renamer/renamer_dispatch.py

@@ -16,7 +16,7 @@ from batchmp.cli.base.bmp_dispatch import BatchMPDispatcher
 from batchmp.cli.renamer.renamer_options import RenameArgParser, RenamerCommands
 from batchmp.fstools.dirtools import DHandler
 from batchmp.fstools.rename import Renamer
-from batchmp.fstools.builders.fsprms import FSEntryParamsBase, FSEntryParamsExt, FSEntryParamsFlatten
+from batchmp.fstools.builders.fsprms import FSEntryParamsBase, FSEntryParamsExt, FSEntryParamsFlatten, FSEntryParamsOrganize
 from batchmp.fstools.builders.fsb import FSEntryBuilderBase
 
 class RenameDispatcher(BatchMPDispatcher):
@@ -61,6 +61,9 @@ class RenameDispatcher(BatchMPDispatcher):
             elif args['sub_cmd'] == RenamerCommands.STATS:
                 self.stats(args)
 
+            elif args['sub_cmd'] == RenamerCommands.ORGANIZE:
+                self.organize(args)
+
             else:
                 print('Nothing to dispatch')
                 return False
@@ -69,8 +72,13 @@ class RenameDispatcher(BatchMPDispatcher):
 
     # Dispatched Methods
     def print_dir(self, args):
-        fs_entry_params = FSEntryParamsBase(args)
-        DHandler.print_dir(fs_entry_params)
+        # Check if organize view is requested
+        if args.get('by'):
+            fs_entry_params = FSEntryParamsOrganize(args)
+            DHandler.print_organized_view(fs_entry_params)
+        else:
+            fs_entry_params = FSEntryParamsBase(args)
+            DHandler.print_dir(fs_entry_params)
 
     def stats(self, args):
         fs_entry_params = FSEntryParamsBase(args)
@@ -117,7 +125,10 @@ class RenameDispatcher(BatchMPDispatcher):
         fs_entry_params = FSEntryParamsExt(args)
         Renamer.delete(fs_entry_params)
 
-
+    def organize(self, args):
+        fs_entry_params = FSEntryParamsOrganize(args)
+        DHandler.organize(fs_entry_params)
+    
 def main():
     ''' Renamer entry point
     '''

{batchmp-1.0 → batchmp-1.4}/batchmp/cli/renamer/renamer_options.py

@@ -74,6 +74,7 @@ class RenamerCommands(BatchMPBaseCommands):
     FLATTEN = 'flatten'
     DELETE = 'delete'
     STATS = 'stats'
+    ORGANIZE = 'organize'
 
     @classmethod
     def commands_meta(cls):
@@ -89,7 +90,8 @@ class RenamerCommands(BatchMPBaseCommands):
                         '{}, '.format(cls.DELETE),
                         '{}, '.format(cls.STATS),                        
                         '{}, '.format(cls.INFO),
-                        '{}'.format(cls.VERSION),
+                        '{}, '.format(cls.VERSION),
+                        '{}'  .format(cls.ORGANIZE),
                         '}'))
 
 
@@ -142,6 +144,14 @@ class RenameArgParser(BatchMPArgParser):
         print_parser.add_argument('-ss', '--show-size', dest = 'show_size',
                 help ='Show files size',
                 action = 'store_true')
+        print_parser.add_argument('-b', '--by', dest = 'by',
+                help = 'Show organized virtual view by type or date',
+                type = str,
+                choices = ['type', 'date'])
+        print_parser.add_argument('-df', '--date-format', dest = 'date_format',
+                help = 'Date format for subdirectories when using -b date (e.g., %%Y/%%m)',
+                type = str,
+                default = '%Y-%m-%d')
 
         # Stats
         stats_parser = subparsers.add_parser(RenamerCommands.STATS,
@@ -299,6 +309,27 @@ class RenameArgParser(BatchMPArgParser):
         self._add_arg_display_curent_state_mode(delete_parser)
 
 
+        # Organize
+        organize_parser = subparsers.add_parser(RenamerCommands.ORGANIZE,
+                                            description='Organize selected files into directories by specified attributes',
+                                            formatter_class=BatchMPHelpFormatter)
+        organize_parser.add_argument('-b', '--by', dest='by',
+                                     help='Organization strategy: by type or by date',
+                                     type=str,
+                                     choices=['type', 'date'],
+                                     required=True)
+        organize_parser.add_argument('-df', '--date-format', dest='date_format',
+                                     help='Date format for subdirectories (e.g., %%Y/%%m)',
+                                     type=str,
+                                     default='%Y-%m-%d')
+        organize_parser.add_argument('-td', '--target-dir', dest='target_dir',
+                                     help='Target directory to organize files into',
+                                     type=str)
+        _add_include_mode_group(organize_parser)
+        self._add_arg_display_curent_state_mode(organize_parser)
+
+
+
     # Args Checking
     def default_command(self, args, parser):
         args['sub_cmd'] = RenamerCommands.PRINT

{batchmp-1.0 → batchmp-1.4}/batchmp/ffmptools/ffcommands/cuesplit.py

@@ -99,7 +99,7 @@ class CueSplitterTask(ConvertorTask):
         with temp_dir() as tmp_dir:
             # prepare the tmp output path
             conv_fname = '{0:02d} {1}'.format(self.track_number, self.track_title)
-            conv_fname = re.sub('[^\w\-_\. ]', '_', conv_fname)
+            conv_fname = re.sub(r'[^\w\-_\. ]', '_', conv_fname)
             conv_fname = ''.join((conv_fname, self.target_format))
             conv_fpath = os.path.join(tmp_dir, conv_fname)
 
@@ -198,12 +198,12 @@ class CueSplitter(FFMPRunner):
                     if cue_sheet.rem:
                         for rem_item in cue_sheet.rem:
                             if not tag_holder.year:
-                                match = re.match('DATE.+(\d{4})', rem_item)
+                                match = re.match(r'DATE.+(\d{4})', rem_item)
                                 if match:
                                     tag_holder.year = match.group(1)
                                     continue
                             if not tag_holder.genre:
-                                match = re.match('GENRE\s+(.+)$', rem_item)
+                                match = re.match(r'GENRE\s+(.+)$', rem_item)
                                 if match:
                                     tag_holder.genre = match.group(1)
                         tag_holder.comments = ', '.join(cue_sheet.rem)

{batchmp-1.0 → batchmp-1.4}/batchmp/ffmptools/ffcommands/fragment.py

@@ -19,6 +19,7 @@ from batchmp.commons.utils import temp_dir
 from batchmp.ffmptools.ffrunner import FFMPRunner, FFMPRunnerTask, LogLevel
 from batchmp.commons.taskprocessor import TaskResult
 from batchmp.ffmptools.ffcommands.cmdopt import FFmpegCommands, FFmpegBitMaskOptions
+from batchmp.ffmptools.ffcommands.segment import Segmenter
 from batchmp.commons.utils import (
     timed,
     run_cmd,
@@ -30,10 +31,11 @@ class FragmenterTask(FFMPRunnerTask):
     '''
     def __init__(self, fpath, target_dir, log_level,
                             ff_general_options, ff_other_options, preserve_metadata,
-                            fragment_starttime, fragment_duration):
+                            fragment_starttime, fragment_duration, fragment_trim):
 
         self.fragment_starttime = fragment_starttime
         self.fragment_duration = fragment_duration
+        self.fragment_trim = fragment_trim
 
         super().__init__(fpath, target_dir, log_level,
                                 ff_general_options, ff_other_options, preserve_metadata)
@@ -42,6 +44,9 @@ class FragmenterTask(FFMPRunnerTask):
     def ff_cmd(self):
         ''' Fragment command builder
         '''
+        if self.fragment_trim:
+            media_duration = Segmenter._media_duration(self.fpath)
+            self.fragment_duration = media_duration - self.fragment_trim - self.fragment_starttime
         return ''.join((super().ff_cmd,
                             ' -ss {}'.format(self.fragment_starttime),
                             ' -t {}'.format(self.fragment_duration)
@@ -65,6 +70,11 @@ class FragmenterTask(FFMPRunnerTask):
 
             # run ffmpeg command as a subprocess
             try:
+                if self.fragment_duration < 0:
+                    raise CmdProcessingError('A problem while processing media file {0}: \
+                                            Negative media duration {1}s, check your input parameters to add up correctly'\
+                                            .format(self.fpath, int(self.fragment_duration)))                
+
                 _, task_elapsed = run_cmd(p_in)
                 task_result.add_task_step_duration(task_elapsed)
             except CmdProcessingError as e:
@@ -87,7 +97,7 @@ class FragmenterTask(FFMPRunnerTask):
 
 class Fragmenter(FFMPRunner):
     def fragment(self, ff_entry_params,
-                    fragment_starttime = None, fragment_duration = None):
+                    fragment_starttime = None, fragment_duration = None, fragment_trim = None):
 
         ''' Fragment media file by specified starttime & duration
         '''
@@ -99,7 +109,7 @@ class Fragmenter(FFMPRunner):
             # build tasks
             tasks_params = [(media_file, target_dir_path, ff_entry_params.log_level,
                                 ff_entry_params.ff_general_options, ff_entry_params.ff_other_options, ff_entry_params.preserve_metadata,
-                                fragment_starttime, fragment_duration)
+                                fragment_starttime, fragment_duration, fragment_trim)
                                     for media_file, target_dir_path in zip(media_files, target_dirs)]
             for task_param in tasks_params:
                 task = FragmenterTask(*task_param)

{batchmp-1.0 → batchmp-1.4}/batchmp/ffmptools/ffcommands/segment.py

@@ -120,15 +120,15 @@ class Segmenter(FFMPRunner):
         '''
         tasks = []
         if segment_size_MB or segment_length_secs:
-            if segment_length_secs:
-                # here need to determine media length
-                pass_filter = lambda fpath: self._media_duration(fpath) > segment_length_secs
-            elif segment_size_MB:
-                # simple media selection by size
-                pass_filter = lambda fpath: FFH.ffmpeg_supported_media(fpath) and (self._media_size_MB(fpath) > segment_size_MB)
+#           if segment_length_secs:
+#               # here need to determine media length
+#               pass_filter = lambda fpath: self._media_duration(fpath) > segment_length_secs
+#           elif segment_size_MB:
+#               # simple media selection by size
+#               pass_filter = lambda fpath: FFH.ffmpeg_supported_media(fpath) and (self._media_size_MB(fpath) > segment_size_MB)
 
             ff_entry_params.target_dir_prefix = 'segmented'
-            media_files, target_dirs = self._prepare_files(ff_entry_params, pass_filter = pass_filter)
+            media_files, target_dirs = self._prepare_files(ff_entry_params)
 
             # build tasks
             tasks_params = [(media_file, target_dir_path, ff_entry_params.log_level,

{batchmp-1.0 → batchmp-1.4}/batchmp/ffmptools/ffutils.py

@@ -239,8 +239,8 @@ class FFH:
         except CmdProcessingError as e:
             return None
         else:
-            silence_starts = re.findall('(?<=silence_start:)(?:\D*)(\d*\.?\d+)', output)
-            silence_ends = re.findall('(?<=silence_end:)(?:\D*)(\d*\.?\d+)', output)
+            silence_starts = re.findall(r'(?<=silence_start:)(?:\D*)(\d*\.?\d+)', output)
+            silence_ends = re.findall(r'(?<=silence_end:)(?:\D*)(\d*\.?\d+)', output)
 
             SilenceEntry = namedtuple('SilenceEntry', ['silence_start', 'silence_end'])
             silence_entries = []
@@ -250,7 +250,7 @@ class FFH:
             if len(silence_entries) < len(silence_starts):
                 # matched non-balanced silence at the end
                 # try to parse output audio duration and use it as the silence_end value
-                found = re.findall('(?<=Duration:)(?:\D*)([\d:\.]*)', output)
+                found = re.findall(r'(?<=Duration:)(?:\D*)([\d:\.]*)', output)
                 if found:
                     duration = MiscHelpers.time_delta(found[0]).total_seconds()
                 else:
@@ -282,12 +282,12 @@ class FFH:
             mean_volume = max_volume = 0
 
             # mean volume
-            found = re.findall('(?<=mean_volume:)(?:\D*)(\d*\.?\d+)', output)
+            found = re.findall(r'(?<=mean_volume:)(?:\D*)(\d*\.?\d+)', output)
             if found:
                 mean_volume = float(found[0])
 
             # max volume
-            found = re.findall('(?<=max_volume:)(?:\D*)(\d*\.?\d+)', output)
+            found = re.findall(r'(?<=max_volume:)(?:\D*)(\d*\.?\d+)', output)
             if found:
                 max_volume = float(found[0])