Merge pull request #5 from Nigh/add-regexp

Add regular expression support for time range setup

Author: Nigh

Makefile

@@ -1,5 +1,5 @@
 
-VERSION?=v1.1.0
+VERSION?=v1.2.0
 
 DIR 		= dist
 EXECUTABLE 	= ass-shifter

Makefile_windows

@@ -1,5 +1,5 @@
 
-VERSION?=v1.1.0
+VERSION?=v1.2.0
 
 DIR 		= dist
 EXECUTABLE 	= ass-shifter

README.md

@@ -2,7 +2,8 @@
 Shift Subtitle of [`.ass`, `.srt`] format
 
 > [!CAUTION]
-> It will replace your subtitle, **backup** your subtitle files before run.
+> It will replace your subtitle, **backup** your subtitle files before run. Use `--dry` for test.  
+> From version `v1.2.0`, the program will automatically convert subtitle files to UTF8 encoding.
 
 
 ## Usage
@@ -12,34 +13,70 @@ ass-shifter [path] -t [shift ms]
   Positional Variables:
     path   the subtitle path to shift (Required)
   Flags:
-       --version   Displays the program version string.
-    -h --help      Displays help with available flag, subcommand, and positional value parameters.
-    -t --shift     shift ms (default: 0)
-    -s --start     start from HH:MM:SS
-    -e --end       end at HH:MM:SS
+       --version       Displays the program version string.
+    -h --help          Displays help with available flag, subcommand, and positional value parameters.
+    -t --shift         shift ms (default: 0)
+    -s --start         start from HH:MM:SS
+    -e --end           end at HH:MM:SS
+    -sr --startRegexp  start from regular expression
+    -er --endRegexp    end at regular expression
+    -d --dry           dry run
 ```
 
+The `--start` and `--end` parameters can be used to qualify the time range of the subtitle offset.   
+The `--startRegexp` and `--endRegexp` parameters can be used to match the content of the subtitle with a regular expression as the start and end of the offset time range.  
+The time and regular expression parameters can be used together.
+
 ## Example
 The `start` and `end` parameters are optional. They can also be used together.
 ```bash
-ass-shifter ../Better.Call.Saul/S03 -t -3200
-ass-shifter ../Better.Call.Saul/S03 -t -3200 -s 0:06:13
+ass-shifter ../Better.Call.Saul/S03 -t 3200
+ass-shifter ../Better.Call.Saul/S03 -t 3200 -s 0:06:13
 ass-shifter ../Better.Call.Saul/S03 -t -3200 -s 0:06:13 -e 0:24:12
+ass-shifter ../Better.Call.Saul/S06 -sr "第.季\s*第.+集" -t 3200
+ass-shifter ../Better.Call.Saul/S06 -sr "第.季\s*第.+集" -e 0:24:12 -t 3200
 ```
 
 The program prints the result of the execution like the following.
 ```bash
-ass-shifter ../Better.Call.Saul/S03 -t -3200 -s 0:06:13
-
-[SUCCESS] Better.Call.Saul.S03E01.2017.1080p.BluRay.x265.10bit.ass
-[SUCCESS] Better.Call.Saul.S03E02.2017.1080p.BluRay.x265.10bit.ass
-[SUCCESS] Better.Call.Saul.S03E03.2017.1080p.BluRay.x265.10bit.ass
-[SUCCESS] Better.Call.Saul.S03E04.2017.1080p.BluRay.x265.10bit.ass
-[SUCCESS] Better.Call.Saul.S03E05.2017.1080p.BluRay.x265.10bit.ass
-[SUCCESS] Better.Call.Saul.S03E06.2017.1080p.BluRay.x265.10bit.ass
-[SUCCESS] Better.Call.Saul.S03E07.2017.1080p.BluRay.x265.10bit.ass
-[SUCCESS] Better.Call.Saul.S03E08.2017.1080p.BluRay.x265.10bit.ass
-[SUCCESS] Better.Call.Saul.S03E09.2017.1080p.BluRay.x265.10bit.ass
-[SUCCESS] Better.Call.Saul.S03E10.2017.1080p.BluRay.x265.10bit.ass
-Total 10 files shifted -3200ms from 0:06:13 to end
+ass-shifter ../Better.Call.Saul/S06 -t -3200 -s 0:06:13
+Better.Call.Saul.S06E01.2022.1080p.WEB-DL.x265.10bit.ass
+From 0:06:13.00 to end, 1152 lines shifted 3200ms
+
+Better.Call.Saul.S06E02.2022.1080p.WEB-DL.x265.10bit.ass
+From 0:06:13.00 to end, 1222 lines shifted 3200ms
+
+...
+
+Better.Call.Saul.S06E12.2022.1080p.WEB-DL.x265.10bit.ass
+From 0:06:13.00 to end, 1035 lines shifted 3200ms
+
+Better.Call.Saul.S06E13.2022.1080p.WEB-DL.x265.10bit.ass
+From 0:06:13.00 to end, 1629 lines shifted 3200ms
+
+[Info] 13 subtitle files updated.
+```
+
+Dry run would NOT change your file. Good for test.
+```bash
+ass-shifter ../Better.Call.Saul/S06 -sr "第.季\s*第.+集" -t 3234 --dry
+
+Better.Call.Saul.S06E01.2022.1080p.WEB-DL.x265.10bit.ass
+From 0:05:32.87 to end, 1155 lines shifted 3234ms
+
+Better.Call.Saul.S06E02.2022.1080p.WEB-DL.x265.10bit.ass
+From 0:07:20.77 to end, 1221 lines shifted 3234ms
+
+...
+
+Better.Call.Saul.S06E11.2022.1080p.WEB-DL.x265.10bit.ass
+From 0:01:39.00 to end, 1387 lines shifted 3234ms
+
+Better.Call.Saul.S06E12.2022.1080p.WEB-DL.x265.10bit.ass
+From 0:02:50.43 to end, 1145 lines shifted 3234ms
+
+Better.Call.Saul.S06E13.2022.1080p.WEB-DL.x265.10bit.ass
+From 0:05:17.70 to end, 1651 lines shifted 3234ms
+
+[Info] Dry run, no file changes.
 ```

go.mod

@@ -2,4 +2,8 @@ module github.com/Nigh/subtitle-ass-shifter
 
 go 1.22.1
 
-require github.com/integrii/flaggy v1.5.2
+require (
+	github.com/integrii/flaggy v1.5.2
+	golang.org/x/net v0.33.0
+	golang.org/x/text v0.21.0
+)

go.sum

@@ -2,4 +2,8 @@ github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/integrii/flaggy v1.5.2 h1:bWV20MQEngo4hWhno3i5Z9ISPxLPKj9NOGNwTWb/8IQ=
 github.com/integrii/flaggy v1.5.2/go.mod h1:dO13u7SYuhk910nayCJ+s1DeAAGC1THCMj1uSFmwtQ8=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=