Commit Graph

275 Commits

Author SHA1 Message Date
Joe Rogers 3205e97e1e
Strip out external file fuzzy matching
Convert MediaFlagDelimiter back to char
2022-03-04 10:52:21 +01:00
Shadowghost a36e34fbd2 fix(external-media): implement review suggestions 2022-02-18 22:19:33 +01:00
Shadowghost 719b707281 feat(external-media): refactor to generic provider, extend tests and file recognition, consolidate and extend NamingOptions 2022-02-18 22:19:33 +01:00
Shadowghost ca5112f45a feat(external-media): refactor external subtitle and audio provider 2022-02-18 22:19:24 +01:00
Bond_009 2dcb2f8a9f Ban the usage of Task.Result
If the calling function can't be made async easily you can still use
.GetAwaiter().GetResult(), which is way easier to find in the future
2022-01-22 16:48:31 +01:00
Joe Rogers 8b706cebef
Add alternate resolver test, generate extra folder names 2022-01-16 23:00:30 +01:00
Joe Rogers 19b9646d72
Add -extra suffix for consistency 2022-01-15 15:43:06 +01:00
Joe Rogers f11fa59b15
Order rules so directory takes precedence over naming 2022-01-15 15:16:11 +01:00
Bond-009 11d0c6827f
Merge pull request #7058 from cvium/the_most_important_feature 2022-01-02 12:31:20 +01:00
cvium 2749509f00 Use dedicated resolvers for extras 2021-12-28 00:37:40 +01:00
Cody Robibero 7bfc6b5679 Remove more warnings 2021-12-27 07:38:06 -07:00
Bond_009 ea8f40e84a More cleanup 2021-12-27 14:20:05 +00:00
Cody Robibero a615f87680
Merge pull request #7044 from 1337joe/fix-trailers-v2
Fix trailers v2
2021-12-25 23:31:46 +00:00
Joe Rogers cf29aae690 Add rule to pick up theme videos 2021-12-24 21:21:19 +00:00
Bond_009 cbfa355e31 Update StyleCop 2021-12-24 18:28:27 +01:00
Cody Robibero 076a13abeb
Merge pull request #7029 from cvium/allocations_maybe 2021-12-24 01:59:25 +00:00
cvium b880dc8a4a Use our own Contains extension 2021-12-20 13:31:07 +01:00
cvium 91292b8ea5 Fix build 2021-12-20 12:34:16 +01:00
cvium 83a94aa612 Fix extras folders 2021-12-20 12:15:20 +01:00
cvium c3c4dc6839 Review 2021-12-14 23:05:45 +01:00
cvium 9e665ff520 Fix usage of RegexOptions.Compiled 2021-12-13 08:27:20 +01:00
Claus Vium 5c3d0b5510
Update Emby.Naming/Video/ExtraResolver.cs
Co-authored-by: Bond-009 <bond.009@outlook.com>
2021-12-13 08:22:17 +01:00
cvium 6d6fb1bba3 Rename unknown parttype to "unknown" 2021-12-11 16:02:51 +01:00
cvium 681bfbd535 Remove duplication 2021-12-10 14:34:46 +01:00
cvium 220443eca1 Simplify StackResolver 2021-12-10 14:23:31 +01:00
cvium fde84a1e00 Refactor extras parsing 2021-12-07 15:24:57 +01:00
dependabot[bot] bd32cecf7a
Bump Microsoft.SourceLink.GitHub from 1.1.0 to 1.1.1
Bumps [Microsoft.SourceLink.GitHub](https://github.com/dotnet/sourcelink) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/dotnet/sourcelink/releases)
- [Commits](https://github.com/dotnet/sourcelink/compare/1.1.0...1.1.1)

---
updated-dependencies:
- dependency-name: Microsoft.SourceLink.GitHub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-15 12:01:08 +00:00
dependabot[bot] c2d99dc3f0
Bump Microsoft.SourceLink.GitHub from 1.0.0 to 1.1.0
Bumps [Microsoft.SourceLink.GitHub](https://github.com/dotnet/sourcelink) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/dotnet/sourcelink/releases)
- [Commits](https://github.com/dotnet/sourcelink/compare/1.0.0...1.1.0)

---
updated-dependencies:
- dependency-name: Microsoft.SourceLink.GitHub
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-09 13:11:42 +00:00
Bond_009 5726535a26 Fix some warnings
609 left
2021-11-09 13:14:31 +01:00
Claus Vium 2c42d75288
Merge pull request #6027 from fredriklindberg/improve-series-matching 2021-11-02 20:17:49 +01:00
Claus Vium a9c38870f9
Merge pull request #6379 from dearjoey/master 2021-11-02 20:12:42 +01:00
Claus Vium 39d5bdac96
Change ReadOnlySpan to string following PR 6383 (#6734) 2021-10-26 14:47:34 +02:00
Claus Vium dc72d90703
Merge pull request #6383 from sushilicious/master
Made default parser a tiny bit mroe robust
2021-10-26 12:10:57 +02:00
Bond-009 a01f9775ff
Merge pull request #6667 from Bond-009/warn53 2021-10-08 15:43:38 +02:00
Bond_009 f7ae3c6a85 Set AnalysisMode to AllEnabledByDefault 2021-10-06 11:39:54 +02:00
Bond_009 67147400bf Fix issue #6123 2021-10-05 21:47:59 +02:00
Bond_009 13fbfe6091 Target net6.0 2021-09-24 20:15:46 +02:00
Fredrik Lindberg ea439c5ccf Improve series name matching
Add a series path resolver that attempts to extract only the series
name from a path that contains more information that just the name.
2021-09-13 17:59:33 +02:00
Bond-009 e5a29824e5
Merge branch 'master' into minor15 2021-08-13 00:33:18 +02:00
Bond-009 971c2bc7de
Merge pull request #6328 from Bond-009/epparser
Improve episode parser
2021-08-06 17:29:34 +02:00
sushilicious 6bc7d78f6f
Update Emby.Naming/Video/CleanStringParser.cs
Cleaned up code a bit

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2021-08-05 13:09:42 -07:00
sushilicious b2a10609af Made CleanStringParser go through regexps only once 2021-08-04 23:25:54 -07:00
sushilicious 7fdef4b82b Merge branch 'master' of https://github.com/jellyfin/jellyfin into HEAD 2021-08-04 23:15:48 -07:00
Bond_009 f1f72c3060 Minor improvements 2021-08-04 14:40:09 +02:00
sushilicious 26f8b501e7 Made CleanStringParser more robust
Now it can handle [...] at beginning of string
2021-08-03 14:19:36 -07:00
joey 0c9b64de4b optimize episode parser 2021-08-03 13:25:23 +08:00
Rich Lander c07e83fdf8
Invert code and style analysis configuration (#6334)
Co-authored-by: Bond-009 <bond.009@outlook.com>
2021-07-30 09:49:28 +02:00
Bond_009 ef3b651aad Improve episode parser 2021-07-20 00:25:30 +02:00
Claus Vium d55b152e86
Merge pull request #6297 from Bond-009/parser
Fix episode parser
2021-07-19 17:46:40 +02:00
Bond_009 b9b4f3aa85 Add h265 to CleanStrings 2021-07-15 16:20:50 +02:00
Bond_009 b202bfebce Fix episode parser 2021-07-15 16:05:57 +02:00
Bond_009 1f99c9b90c Minor fixes 2021-07-06 00:01:33 +02:00
Bond_009 6f8ccab788 Move non-jellyfin extensions to separate project 2021-06-19 18:04:46 +02:00
cvium 66de842896 Use stackalloc in Format3DParser.Parse 2021-06-12 00:16:33 +02:00
Claus Vium 3b5214e595
Update Emby.Naming/Video/VideoListResolver.cs
Co-authored-by: Bond-009 <bond.009@outlook.com>
2021-05-28 19:01:29 +02:00
cvium 42a2cc1747 Remove some unnecessary allocations 2021-05-24 00:30:41 +02:00
cvium 1027792b16 Review changes 2021-05-19 08:51:46 +02:00
cvium 415e8fc0f3 Forward 2021-05-16 14:54:36 +02:00
cvium 1b49435a0e Reduce some allocations 2021-05-16 14:49:11 +02:00
cvium 381db60ed3 fix test 2021-04-09 15:05:39 +02:00
cvium 457229c56d Simplification 2021-04-09 13:43:40 +02:00
cvium 23c3188501 revert underscore as a multiversion separator 2021-03-15 23:24:59 +01:00
Bond-009 d7f0aaaec1
Merge pull request #5417 from Bond-009/codeanal
Add code analysis attributes where appropriate
2021-03-12 00:15:12 +01:00
cvium b0af11c34e make the eligibility check more strict wrt. brackets 2021-03-10 19:29:52 +01:00
cvium 3824c09e77 fix multiversion eligibility check for complex folder names 2021-03-10 10:47:35 +01:00
Bond_009 9ed7f429c0 FxCop -> Net Analyzers (part 1) 2021-03-09 03:04:47 +01:00
Bond_009 5241bd41ef Add code analysis attributes where appropriate 2021-03-09 01:28:21 +01:00
cvium fcacae8cde return empty span instead of null for backwards compat 2021-03-07 22:59:08 +01:00
cvium e0db17a935 do not throw ArgumentNullException in TryCleanString 2021-03-07 22:49:31 +01:00
dkanada 13d65318eb
Merge pull request #5223 from Bond-009/minor10
Minor improvements
2021-02-20 10:56:55 +09:00
Bond_009 8a6242826f 100% branch coverage for Emby.Naming 2021-02-13 11:38:17 +01:00
Bond_009 65bab55ca0 Minor improvements 2021-02-13 00:39:18 +01:00
dkanada 995b370017
Merge pull request #4663 from joshuaboniface/bump-version-10.8.0
Bump version to 10.8.0 for next release
2021-02-09 11:38:31 +09:00
Bond_009 88f37833df Remove last usage of \d 2021-02-08 16:33:37 +01:00
dkanada aea1c4f310
Merge pull request #5142 from M0ssTee/updateRegex
Replaced /d with [0-9], see issue #2923
2021-02-08 22:52:58 +09:00
dkanada 2e9661c415
Merge pull request #5043 from senritsu/improve-episode-number-parsing-with-digits-in-names
adjust episode path expression to allow digits in series names
2021-02-05 11:43:32 +09:00
Troy 8c640a1492 Replaced /d with [0-9], see issue #2923 2021-02-01 02:49:23 +00:00
Bond_009 956ca0e5aa 100% branch coverage for Jellyfin.Naming 2021-01-21 15:46:10 +01:00
senritsu 4e21b49994 adjust episode path expression to allow digits in series names
The previous expression was too greedy to consume digits, because the hyphen was optional. This lead to incorrect episode numbers for certain series with digits in their names, in those cases each episode was recognized as the same episode number (the digit from the series name).

The rule, which matches most standard  anime filenames, also had a lower priority than one of the Kodi rules, leading to incorrect recognition for absolute numbered episodes with triple digits and higher (first digit was used as season number, rest of digits as episode number). This also resolves one of the TODO test cases.

Additional test cases were added to ensure that both hyphens in different parts of the filename, as well as names without hyphens, still work correctly. All previous test cases still pass.

Unfortunately another TODO (EpisodeNumberTests.cs@L76, Uchuu Senkan Yamato 2199) with the same issue (digits in the series name) could not be trivially fixed in the same change, due to the significantly different formatting. Attempts to resolve this case did not work out for now.
2021-01-17 20:24:23 +01:00
Joshua M. Boniface 5f2cd11199 Bump version to 10.8.0 for next release 2020-12-04 21:56:24 -05:00
crobibero 20251e670f Fix tests 2020-11-22 14:39:34 -07:00
crobibero 2aefe9ed5a Only trim file name if folder name is shorter 2020-11-22 14:17:42 -07:00
Greenback e51ddd326c Fixes spelling. 2020-11-18 13:23:45 +00:00
martinek-stepan 04a712ab1d
Update Emby.Naming/Video/VideoFileInfo.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-11-17 15:11:32 +01:00
Stepan d481c35cad Merge fix 2020-11-17 13:06:56 +01:00
BaronGreenback 2bbfcc264d
Merge branch 'master' into emby-namig-nullable 2020-11-16 19:47:36 +00:00
martinek-stepan 4bfcc8b0d1
Update Emby.Naming/AudioBook/AudioBookListResolver.cs
Use StringComparison.OrdinalIgnoreCase when comparing names

Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
2020-11-12 16:51:52 +01:00
Stepan b66239fd52 One more missed suggestions (removing commented out code) 2020-11-12 13:18:22 +01:00
Stepan 3bca1181b3 Taken suggestions from code review and created test for ExtraRuleType.Regex instead of throwing exception there. 2020-11-12 13:16:33 +01:00
martinek-stepan 496923719c
Apply suggestions from code review
Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
2020-11-12 12:54:55 +01:00
Stepan 158eff62d7 Xml-doc part2 2020-11-10 19:23:10 +01:00
crobibero 83629ab6f2 Update packages to net5 2020-11-10 09:52:34 -07:00
Stepan 693760e38a Xml-doc part1 2020-11-10 17:11:48 +01:00
Stepan c0747512d6 Merge remote-tracking branch 'jellyfin/master' into emby-namig-nullable 2020-11-10 12:42:49 +01:00
crobibero 78551d166a Don't throw exception if name is null 2020-11-09 06:10:16 -07:00
Stepan f22e0800e2 Episode parsing coverage 2020-11-07 11:02:12 +01:00
Stepan e96e480f01 Add comment with match cases for weir EpisodeExpression and named group for some date EpisodeExpressions 2020-11-06 15:52:01 +01:00
Stepan 3466dc5581 Finish coverage for Emby.Naming.Video 2020-11-05 16:59:15 +01:00
Stepan 5741150367 Enable MultiVersion video tests and added support for naming based on tests 11 & 8 2020-11-05 14:51:27 +01:00
Stepan c060ed1a18 Added resolving of alternative files and extras for audibooks. 2020-11-03 16:24:04 +01:00