Reinhard Pointner
|
4354dc2fd6
|
+ copy files with attributes
* xattr will only be set on destination files, not source files
|
2014-01-08 17:23:04 +00:00 |
|
Reinhard Pointner
|
4b15736faf
|
* {bitrate} and {duration} as float type for convenience
|
2014-01-08 14:30:35 +00:00 |
|
Reinhard Pointner
|
32f119756b
|
* {bitrate} binding
|
2014-01-08 14:26:39 +00:00 |
|
Reinhard Pointner
|
af0f4892f7
|
* slight refactoring
|
2014-01-08 10:01:37 +00:00 |
|
Reinhard Pointner
|
a920dc59a7
|
* docs/notes
|
2014-01-08 09:34:59 +00:00 |
|
Reinhard Pointner
|
ef2a64003b
|
* use TV Series index only for TV-mode and Anime index only for Anime-mode
|
2014-01-08 09:28:04 +00:00 |
|
Reinhard Pointner
|
c4ab4e8382
|
* fine-tune exclude patterns
|
2014-01-08 08:36:32 +00:00 |
|
Reinhard Pointner
|
0800bc5eb0
|
* update local db files
|
2014-01-07 15:21:38 +00:00 |
|
Reinhard Pointner
|
d3f3d9054d
|
* defensive programming
|
2014-01-07 13:19:56 +00:00 |
|
Reinhard Pointner
|
6746fc8b26
|
* generate CollationKey objects as needed to improved perceived performance
|
2014-01-07 13:01:49 +00:00 |
|
Reinhard Pointner
|
36747c4ea6
|
* make local movie/series lookup as blazing fast as possible
|
2014-01-07 12:26:44 +00:00 |
|
Reinhard Pointner
|
dc58ae1954
|
* fix matching issues, esp for movies and shows with many aliases
|
2014-01-07 06:09:38 +00:00 |
|
Reinhard Pointner
|
284d53bee5
|
+ make movie matching properly aware of alias names
|
2014-01-06 23:22:31 +00:00 |
|
Reinhard Pointner
|
d1a880ba64
|
* XmlRpcFault is thrown by the client via XML-RPC
@see http://xmlrpc.sourceforge.net/javadoc/redstone/xmlrpc/XmlRpcFault.html
|
2014-01-06 20:45:32 +00:00 |
|
Reinhard Pointner
|
f902b04dee
|
* make OpenSubtitlesClient fault tolerant via automatic retries
* try for exact matches in internal movie index first before running a query
|
2014-01-06 20:41:59 +00:00 |
|
Reinhard Pointner
|
fede643336
|
* not tested
|
2014-01-06 18:17:19 +00:00 |
|
Reinhard Pointner
|
5391bdd810
|
* bug fix for when listFiles returns null for folders due to permission issues
|
2014-01-06 18:15:37 +00:00 |
|
Reinhard Pointner
|
7cb21d824a
|
+ meta attribute viewer
|
2014-01-05 19:26:33 +00:00 |
|
Reinhard Pointner
|
fea363c67d
|
* make sure the the original args array is available during runtime for debugging purposes
|
2014-01-05 06:58:31 +00:00 |
|
Reinhard Pointner
|
7d814d7b77
|
* make it easier to reference the original database in the format expression
|
2014-01-04 20:18:47 +00:00 |
|
Reinhard Pointner
|
54854d3098
|
* easy to get episode key
|
2014-01-04 19:31:38 +00:00 |
|
Reinhard Pointner
|
29253af34d
|
* use filter icon for analyze panel
|
2014-01-04 13:10:47 +00:00 |
|
Reinhard Pointner
|
4f3c709d17
|
* support SubtitleNaming options for subtitle file naming
|
2014-01-02 19:22:05 +00:00 |
|
Reinhard Pointner
|
a61fb4e70a
|
* support guessing idx/sub language from .idx file contents
|
2014-01-02 15:49:20 +00:00 |
|
Reinhard Pointner
|
9e4b38ea9a
|
* optimize subtitle collection
|
2014-01-02 14:56:10 +00:00 |
|
Reinhard Pointner
|
060229757a
|
* make sure FileSize can't slow us down due to slow network filesystems
|
2014-01-02 11:28:28 +00:00 |
|
Reinhard Pointner
|
826f42eb51
|
* support for checking ServerInfo and client download limits
|
2014-01-02 06:45:28 +00:00 |
|
Reinhard Pointner
|
9f568625fb
|
* make sure to display language name not just ISO3
|
2014-01-02 05:10:35 +00:00 |
|
Reinhard Pointner
|
b5461fbf3c
|
* slightly improved movie-set auto-detection for better {pi} bindings
|
2014-01-02 02:18:17 +00:00 |
|
Reinhard Pointner
|
23cff2321c
|
* pre-cluster by folder before using the nm-Matcher as to to avoid exponential time increase problems
|
2014-01-01 09:30:38 +00:00 |
|
Reinhard Pointner
|
85953f2753
|
+ allow user to define subtitle naming patterns
|
2014-01-01 08:46:29 +00:00 |
|
Reinhard Pointner
|
c3682f5d32
|
* fix some interaction issues
|
2013-12-31 09:12:28 +00:00 |
|
Reinhard Pointner
|
b2b0610579
|
* {lang} binding returns Language object now because Locale has compatibility issues with the various standards
|
2013-12-31 07:59:58 +00:00 |
|
Reinhard Pointner
|
b9f76c407c
|
* include 3-letter language codes in Language config file
|
2013-12-31 07:28:30 +00:00 |
|
Reinhard Pointner
|
e1409b5c30
|
* convenience binding for time expressions
|
2013-12-31 03:51:59 +00:00 |
|
Reinhard Pointner
|
6927a6f7b8
|
* make sure to read fpcalc output with UTF-8 in case default charset isn't UTF-8 ... I'm looking at you Windows!
|
2013-12-31 01:55:07 +00:00 |
|
Reinhard Pointner
|
f5c8a4efd0
|
* order function panels by importance
|
2013-12-30 07:37:01 +00:00 |
|
Reinhard Pointner
|
7aa15fb6a7
|
* call devel scripts via dev:name
|
2013-12-29 13:59:00 +00:00 |
|
Reinhard Pointner
|
5c705427be
|
* make {episodelist} binding reference back to the original datasource
|
2013-12-28 04:34:11 +00:00 |
|
Reinhard Pointner
|
3a1eada102
|
* fine-tune anime matching
|
2013-12-27 22:49:56 +00:00 |
|
Reinhard Pointner
|
2232576c1d
|
* account for AniDB entries that simply don't have any episode data
|
2013-12-27 18:16:08 +00:00 |
|
Reinhard Pointner
|
d56fc9b368
|
* fix issues with cmdline on headless systems
|
2013-12-24 03:24:02 +00:00 |
|
Reinhard Pointner
|
0827fda189
|
* fix NPE issue
@see http://www.filebot.net/forums/viewtopic.php?f=6&t=1199&p=7243#p7243
|
2013-12-23 13:42:56 +00:00 |
|
Reinhard Pointner
|
69e1ab5b55
|
* document {mediaType} binding
|
2013-12-23 05:53:44 +00:00 |
|
Reinhard Pointner
|
a2a897843b
|
* update bindings sample dialog
|
2013-12-23 05:35:24 +00:00 |
|
Reinhard Pointner
|
e6331f1116
|
* revert folder-by-folder change because movies my very well be sorted into different CDn folders
|
2013-12-23 05:33:24 +00:00 |
|
Reinhard Pointner
|
56d1892e24
|
* replace multiple replacement pairs
|
2013-12-23 02:12:36 +00:00 |
|
Reinhard Pointner
|
878f311cae
|
* make new part sets per folder
|
2013-12-22 09:14:15 +00:00 |
|
Reinhard Pointner
|
30d3134f81
|
* expose file media.types entry as {mediaType} binding
|
2013-12-22 08:33:19 +00:00 |
|
Reinhard Pointner
|
1525623ccd
|
* display errors correctly
|
2013-12-21 06:51:59 +00:00 |
|
Reinhard Pointner
|
8211902ca0
|
* print result
|
2013-12-21 06:47:36 +00:00 |
|
Reinhard Pointner
|
16facbde0c
|
* make sure people don't confuse --output with --format
|
2013-12-21 06:26:29 +00:00 |
|
Reinhard Pointner
|
9e5bdf7773
|
* misc. UI
|
2013-12-20 22:27:44 +00:00 |
|
Reinhard Pointner
|
9f6d01c7be
|
* easter-egg Groovy Editor (with FileBot extensions) if you press F5
|
2013-12-20 21:38:22 +00:00 |
|
Reinhard Pointner
|
a7b0920d33
|
* empty string binding values will be considered undefined
* convenience global functions any and allOf to we can easily evaluate many closures in one go
|
2013-12-20 13:27:22 +00:00 |
|
Reinhard Pointner
|
dffcf5aa2b
|
* rename 'development' Git branch to 'devel' (naming it HEAD is a bad idea)
|
2013-12-20 09:30:59 +00:00 |
|
Reinhard Pointner
|
e999fb34e9
|
* my need duration filter in the future, not used yet though
|
2013-12-20 05:32:28 +00:00 |
|
Reinhard Pointner
|
960b1bd9f8
|
* adjust default dialog sizes to make it work better on OSX
|
2013-12-19 11:40:44 +00:00 |
|
Reinhard Pointner
|
7756019568
|
* update preferences icon (was the same as the Rename Options icon)
|
2013-12-19 10:59:01 +00:00 |
|
Reinhard Pointner
|
6c5730dd7d
|
* fix issues reported by Ithiel
@see http://www.filebot.net/forums/viewtopic.php?f=6&t=1192&p=7177#p7177
|
2013-12-19 06:32:01 +00:00 |
|
Reinhard Pointner
|
f0616effc3
|
+ added {duration} and {minutes} bindings
|
2013-12-19 06:21:45 +00:00 |
|
Reinhard Pointner
|
ec818a921d
|
* fixed title for FormatDialog Window
|
2013-12-19 06:20:30 +00:00 |
|
Reinhard Pointner
|
e6b8ce0607
|
* add {y} sample format for AudioTrack
|
2013-12-18 16:00:45 +00:00 |
|
Reinhard Pointner
|
1c46ed1809
|
* try to grab more optional ID3 tags if available
|
2013-12-18 15:42:42 +00:00 |
|
Reinhard Pointner
|
0d6ae94ae9
|
+ usability enhancements regarding FormatEditor
|
2013-12-18 05:53:59 +00:00 |
|
Reinhard Pointner
|
f81e2fa9ea
|
* add getRelativePathTail function
|
2013-12-18 04:17:16 +00:00 |
|
Reinhard Pointner
|
1f3f73b505
|
* fine-tune query auto-selection
|
2013-12-16 09:40:00 +00:00 |
|
Reinhard Pointner
|
1c6d0cd5f7
|
* if files can't be override just revert to skip behaviour as a fail-safe
|
2013-12-16 02:01:42 +00:00 |
|
Reinhard Pointner
|
cdc4a94daa
|
* fix the "law.and.order.svu" special-fuckin-corner-case
|
2013-12-15 18:35:41 +00:00 |
|
Reinhard Pointner
|
5289227d2b
|
* fine-tune cache times
|
2013-12-15 16:01:26 +00:00 |
|
Reinhard Pointner
|
442b996f2a
|
* improved support for abbreviated series aliases
|
2013-12-14 10:49:16 +00:00 |
|
Reinhard Pointner
|
59138a3581
|
* cache compiled patterns
|
2013-12-14 04:11:44 +00:00 |
|
Reinhard Pointner
|
14c5821afb
|
* some hacks to make pb/pob "Brazilian Portuguese" work as expected even though it's not officially a language according to the ISO standards
|
2013-12-14 02:22:31 +00:00 |
|
Reinhard Pointner
|
8f483feeb5
|
* Have "ID3 Tag" datasource only accept audio files that are sufficiently tagged
|
2013-12-07 08:05:35 +00:00 |
|
Reinhard Pointner
|
cd4362291f
|
* make sure we don't have false-positive excludes
|
2013-12-07 06:05:58 +00:00 |
|
Reinhard Pointner
|
7a2b792e08
|
* make series detection of aware of structure root folders and ignore them
|
2013-12-06 06:01:58 +00:00 |
|
Reinhard Pointner
|
2c30728e61
|
* replace warnings with user guidance
|
2013-12-05 02:13:05 +00:00 |
|
Reinhard Pointner
|
35d343425a
|
* fix history spooler memory issues
|
2013-12-04 02:37:56 +00:00 |
|
Reinhard Pointner
|
16d7ad513a
|
* fix format capability issues
|
2013-12-03 15:24:57 +00:00 |
|
Reinhard Pointner
|
1dd6f6e3dd
|
* account for TVDB entries being removed sometimes because of duplicates
|
2013-12-02 18:25:06 +00:00 |
|
Reinhard Pointner
|
aca8be2620
|
* fix potential NPE
|
2013-12-02 15:21:05 +00:00 |
|
Reinhard Pointner
|
f89ee90f72
|
* make auto-selection aware of alias titles
|
2013-12-02 14:41:15 +00:00 |
|
Reinhard Pointner
|
b4dd50b73b
|
* make sure people that have already donated know that only donating once is perfectly fine
|
2013-12-01 07:16:08 +00:00 |
|
Reinhard Pointner
|
90b8a7be2d
|
* short-hand for calling master and head branches from github repo
|
2013-11-29 17:36:12 +00:00 |
|
Reinhard Pointner
|
4843bb55d2
|
* move shared scripts to github
|
2013-11-29 17:08:47 +00:00 |
|
Reinhard Pointner
|
4c59484f3c
|
* update blacklist terms
* fine-tune tvs/mov differentiation
|
2013-11-29 11:32:17 +00:00 |
|
Reinhard Pointner
|
198b8b0e06
|
* separate long-term caches that have different update frequencies
|
2013-11-29 04:29:56 +00:00 |
|
Reinhard Pointner
|
e7668f2c5c
|
+ support .vob as video type
|
2013-11-29 03:31:12 +00:00 |
|
Reinhard Pointner
|
b40647ddf2
|
* ignore sample/trailer files also automatically in simple -rename calls as well
|
2013-11-28 17:36:27 +00:00 |
|
Reinhard Pointner
|
6ede531e7f
|
* exclude 0ee patterns from last-resort matcher
|
2013-11-28 03:13:24 +00:00 |
|
Reinhard Pointner
|
ccfe94f49b
|
* cache compiled patterns
|
2013-11-27 19:19:01 +00:00 |
|
Reinhard Pointner
|
9e41373f43
|
* set foundation for possible future fine-tuning of SxE pattern matching combined with release info knowledge
|
2013-11-27 18:49:15 +00:00 |
|
Reinhard Pointner
|
eff07ec40f
|
* make sure cache is big enough for all the people abusing filebot can't actually abuse the datasources via filebot due to heavy-caching
|
2013-11-27 17:24:12 +00:00 |
|
Reinhard Pointner
|
9588603206
|
* extra last-resort SxE pattern for space-less naming
@see
http://www.filebot.net/forums/viewtopic.php?f=4&t=1138
|
2013-11-27 17:09:19 +00:00 |
|
Reinhard Pointner
|
2f7df0bf4f
|
* grab extra fields just in case
|
2013-11-27 15:38:23 +00:00 |
|
Reinhard Pointner
|
beacccdeeb
|
* add file.dir.path rules to AMC to separate Movies/TV.Shows/Anime by folder names
|
2013-11-23 04:53:59 +00:00 |
|
Reinhard Pointner
|
49d644db55
|
* donations make me happy :)
|
2013-11-22 08:58:17 +00:00 |
|
Reinhard Pointner
|
385373daef
|
* make -clear-cache delete all APPDATA temp folders
|
2013-11-22 08:54:40 +00:00 |
|
Reinhard Pointner
|
e1b6af2616
|
* Not-Modified requests also count towards the rate limit
|
2013-11-22 06:54:25 +00:00 |
|
Reinhard Pointner
|
a49a5cc248
|
* final fixes for new moviedb index
|
2013-11-21 16:31:09 +00:00 |
|
Reinhard Pointner
|
2040417f57
|
* make sure to keep ETag at least as long as cached data
|
2013-11-21 08:52:55 +00:00 |
|
Reinhard Pointner
|
75c897bae5
|
+ rebuild movie index with imdb AND tmdb IDs
|
2013-11-20 10:07:25 +00:00 |
|
Reinhard Pointner
|
28df8ff69a
|
* fully support ETag caching mechanism in TheMovieDB client
|
2013-11-20 02:53:36 +00:00 |
|
Reinhard Pointner
|
f85d706dce
|
* fix tricky internal DB override TMDb response issue when using non-English language preferences
@see http://www.filebot.net/forums/viewtopic.php?f=6&t=1106&p=6797#p6797
|
2013-11-18 14:41:19 +00:00 |
|
Reinhard Pointner
|
68c89ef01a
|
* better account for large history files
|
2013-11-17 19:07:02 +00:00 |
|
Reinhard Pointner
|
f4070a4c07
|
* better account for large history files
|
2013-11-17 19:05:45 +00:00 |
|
Reinhard Pointner
|
1c89f8c3ef
|
* add structure root logic for the different filesystem layouts of different OSes
|
2013-11-16 12:10:23 +00:00 |
|
Reinhard Pointner
|
27f272077d
|
* add some stop-folder logic for movie structures
|
2013-11-16 05:37:41 +00:00 |
|
Reinhard Pointner
|
2b09bd1414
|
* remove DnD reminders
|
2013-11-15 09:55:08 +00:00 |
|
Reinhard Pointner
|
0a99a8f93d
|
* warn the noobs about MISSING EXTENSION issues with AbsolutePath mode before renaming
|
2013-11-15 02:54:33 +00:00 |
|
Reinhard Pointner
|
9ba3e36d23
|
* optimize open subtitles hash matches to make sure invalid uploads (that don't match at all) get 1st place
|
2013-11-14 13:45:31 +00:00 |
|
Reinhard Pointner
|
64c3d77100
|
* enable use ID3 Tags as datasource in GUI
|
2013-11-14 13:24:30 +00:00 |
|
Reinhard Pointner
|
e2e4ee240e
|
* make Match button "Smart" again so it'll suggest fetching data if names is list empty... i guess people have been doing it wrong too long to change that now...
|
2013-11-13 01:44:07 +00:00 |
|
Reinhard Pointner
|
5fc9a342a1
|
* make sure long/int overflow issues are resolved
|
2013-11-12 12:51:03 +00:00 |
|
Reinhard Pointner
|
9eee85909b
|
* fix long-term cache issues... int overflow... WTF!?!?
|
2013-11-12 12:29:24 +00:00 |
|
Reinhard Pointner
|
43eb696e7b
|
* better error messages (for the n00bz)
|
2013-11-08 12:29:37 +00:00 |
|
Reinhard Pointner
|
ecb9fac822
|
* ignore trailing (1) patterns for TITLE metrics
|
2013-11-07 07:45:30 +00:00 |
|
Reinhard Pointner
|
b7a9d524cb
|
* exit on -clear-cache or -clear-prefs
|
2013-11-07 07:43:58 +00:00 |
|
Reinhard Pointner
|
41f08070e0
|
* JSON type changes
|
2013-11-03 20:42:20 +00:00 |
|
Reinhard Pointner
|
5eb3e73120
|
* increase cache intervals
|
2013-11-03 16:32:40 +00:00 |
|
Reinhard Pointner
|
2bf9f96ea1
|
* consider equally all SxE patterns with high false-positive rates
|
2013-11-03 13:08:50 +00:00 |
|
Reinhard Pointner
|
8720d13378
|
* try to set metadata first so if it fails the exception is about metadata xattr
|
2013-11-03 09:42:58 +00:00 |
|
Reinhard Pointner
|
13a694aa6f
|
* fine-tune PartX patterns
|
2013-11-03 09:20:35 +00:00 |
|
Reinhard Pointner
|
64b74ac417
|
* update SxE patterns and sanity metrics
@see http://www.filebot.net/forums/viewtopic.php?f=5&t=1059
|
2013-11-02 17:24:11 +00:00 |
|
Reinhard Pointner
|
3457def998
|
* improved error handling
|
2013-10-30 05:56:12 +00:00 |
|
Reinhard Pointner
|
6bbcef9779
|
* better matching for shows with region hint (UK) etc or year hint (2006) etc
|
2013-10-29 18:34:39 +00:00 |
|
Reinhard Pointner
|
3d1dbf26e1
|
* update clutter patterns
|
2013-10-29 05:55:30 +00:00 |
|
Reinhard Pointner
|
f76c31e4d6
|
* more user guidance
|
2013-10-28 05:49:00 +00:00 |
|
Reinhard Pointner
|
b09fbaa3a6
|
* support basic testing of {model} binding
|
2013-10-27 07:25:08 +00:00 |
|
Reinhard Pointner
|
f33510a5c7
|
* prefer "Channel(s)_Original" mediainfo field
@see http://www.filebot.net/forums/viewtopic.php?f=8&t=1038
|
2013-10-25 18:14:24 +00:00 |
|
Reinhard Pointner
|
d623c07373
|
* fix issue with args not being passed in
|
2013-10-22 09:15:46 +00:00 |
|
Reinhard Pointner
|
3ad6b1f55d
|
* less clutter in error reporting
|
2013-10-21 02:30:11 +00:00 |
|
Reinhard Pointner
|
d054c50c18
|
* better error reporting
|
2013-10-20 13:10:21 +00:00 |
|
Reinhard Pointner
|
c7e25998fb
|
* fine-tune series detection and SxE matching
@see http://www.filebot.net/forums/viewtopic.php?f=6&p=6353
|
2013-10-20 13:06:58 +00:00 |
|
Reinhard Pointner
|
86d448a5d8
|
* short-hand for "Put the The|A|An at the end
|
2013-10-20 04:21:22 +00:00 |
|
Reinhard Pointner
|
f7a99a2ede
|
* defensive programming for old json data
|
2013-10-18 11:42:04 +00:00 |
|
Reinhard Pointner
|
d421a0f55f
|
* better support for web-scraping in format expressions
|
2013-10-18 11:11:15 +00:00 |
|
Reinhard Pointner
|
0db73ef38f
|
* use gzip compression for all sourceforge project-web responses
|
2013-10-17 07:39:12 +00:00 |
|
Reinhard Pointner
|
5b839d1ca8
|
* update samples
|
2013-10-17 07:11:32 +00:00 |
|
Reinhard Pointner
|
02cd92d842
|
* always display update notifications for outdated filebot installs
|
2013-10-17 07:11:03 +00:00 |
|
Reinhard Pointner
|
492c5b31b3
|
* better messages
|
2013-10-16 10:30:19 +00:00 |
|
Reinhard Pointner
|
f6e4f1bb8f
|
* optimize TheTVDB network requests (and make sure gzipped compression is used at all times)
|
2013-10-16 10:29:51 +00:00 |
|
Reinhard Pointner
|
1145a1f16b
|
* update data
|
2013-10-16 04:02:53 +00:00 |
|
Reinhard Pointner
|
1fea44ad9e
|
* use extensive caching for all TheTVDB data and request resources only if modified
|
2013-10-15 07:12:42 +00:00 |
|
Reinhard Pointner
|
a130725d74
|
* improved support for crappy short-hand numbering styles
@see http://www.filebot.net/forums/viewtopic.php?f=6&t=1013
|
2013-10-15 03:22:47 +00:00 |
|
Reinhard Pointner
|
4ef6b02903
|
* make sure to print out the TMDb invalid data error messages
|
2013-10-14 03:31:24 +00:00 |
|
Reinhard Pointner
|
2c91a3be2e
|
* replace TheTVDB online search with local search as best as possible to improve search result ranking
|
2013-10-13 14:50:45 +00:00 |
|
Reinhard Pointner
|
071ee0f1b0
|
* flatten execute args for convenience
|
2013-10-13 10:38:31 +00:00 |
|
Reinhard Pointner
|
983c65fc58
|
* if history.xml is invalid xml for some reason just ignore and override the next time it's written to file
|
2013-10-09 21:25:21 +00:00 |
|
Reinhard Pointner
|
19f69c9fbc
|
* set "fpcalc" executable via system property net.sourceforge.filebot.AcoustID.fpcalc
|
2013-10-09 06:31:05 +00:00 |
|
Reinhard Pointner
|
9e07634b79
|
* new fpcalc seems to work with video files, so we magically get music video support !! :D
|
2013-10-08 17:32:12 +00:00 |
|
Reinhard Pointner
|
6b5b757cfa
|
* exclude trailer/sample files from processing as is done for movies already in episode mode as well
|
2013-10-07 18:52:57 +00:00 |
|
Reinhard Pointner
|
7a11589bc4
|
* disable java.util.prefs.WindowsPreferences warnings
|
2013-10-07 06:20:44 +00:00 |
|
Reinhard Pointner
|
6519e872c2
|
* improve on FormatDialog usability
|
2013-10-06 14:54:43 +00:00 |
|
Reinhard Pointner
|
eff52af83f
|
* make format editor auto-scroll properly
|
2013-10-06 11:54:38 +00:00 |
|
Reinhard Pointner
|
2f5d3af715
|
+ update to 3.8
|
2013-10-06 06:46:34 +00:00 |
|
Reinhard Pointner
|
07173fabf0
|
+ use RSyntaxTextArea as Groovy editor so we get neat highlighting and bracket matching :)
|
2013-10-03 19:44:33 +00:00 |
|
Reinhard Pointner
|
0408a17ddb
|
* put error messages into tooltip and explain by hash / by name subtitle matching
|
2013-10-03 12:52:04 +00:00 |
|
Reinhard Pointner
|
a6814d6b80
|
* make things more intuitive by telling the noobs they're doing things wrong, and what to do instead
|
2013-10-02 16:47:09 +00:00 |
|
Reinhard Pointner
|
ee4e373eb1
|
* actively discourage people from using the "Load" button and tell them to use Drag-and-Drop instead
|
2013-10-02 16:42:52 +00:00 |
|
Reinhard Pointner
|
ffc629943b
|
* remove "Save as..." button so noob users can't use manual mode (and thus be completely ignorant that there is the super advanced auto-matching mode)
|
2013-10-02 16:13:38 +00:00 |
|
Reinhard Pointner
|
edfd04a6a9
|
* allow changing of mapped video files for subtitle upload
|
2013-10-01 02:35:54 +00:00 |
|
Reinhard Pointner
|
e29b07c186
|
* make things more idiot-proof
|
2013-09-30 04:46:33 +00:00 |
|
Reinhard Pointner
|
20aef4e385
|
* more messages to help users know what to do next if they're just clicking around trying to figure out things work
|
2013-09-29 19:46:41 +00:00 |
|
Reinhard Pointner
|
7560ba048f
|
* exclude leading The or A from the acronym
|
2013-09-27 13:01:00 +00:00 |
|
Reinhard Pointner
|
787b3e241a
|
* fine-tuning
|
2013-09-27 09:08:20 +00:00 |
|
Reinhard Pointner
|
b6ebdfa49f
|
* some fine-tuning for the episode metrics
@see http://www.filebot.net/forums/viewtopic.php?f=6&t=972
|
2013-09-27 08:50:41 +00:00 |
|
Reinhard Pointner
|
daea42d918
|
* fix subtitle upload
|
2013-09-24 12:16:26 +00:00 |
|
Reinhard Pointner
|
e1b57ed5d5
|
* {vf} fine-tuning
|
2013-09-23 20:01:11 +00:00 |
|
Reinhard Pointner
|
e1b63c7b96
|
* accept default dimension even if one only one of h or w is good enough
@see http://www.filebot.net/forums/viewtopic.php?f=6&t=959&p=5998#p5998
|
2013-09-23 18:52:13 +00:00 |
|
Reinhard Pointner
|
7e1a8bb5c7
|
* fine-tune movie ranking
|
2013-09-23 15:47:14 +00:00 |
|
Reinhard Pointner
|
3f3c341af3
|
* Added 720x576 as valid video format for {vf}
@see http://www.filebot.net/forums/viewtopic.php?f=6&t=959
|
2013-09-23 05:19:34 +00:00 |
|
Reinhard Pointner
|
23219a3001
|
* upload subtitles required valid login... duh
|
2013-09-23 05:17:51 +00:00 |
|
Reinhard Pointner
|
edc0c2417a
|
* more user messages telling DAUs what to do
|
2013-09-22 09:32:24 +00:00 |
|
Reinhard Pointner
|
dc1ef24ad9
|
* don't allow empty searches
|
2013-09-22 05:29:11 +00:00 |
|
Reinhard Pointner
|
2ffd53a60a
|
* allow Folder selection
|
2013-09-22 05:28:37 +00:00 |
|
Reinhard Pointner
|
e6ce4b63f4
|
* make sure we don't clean up relative paths ../ or ./ by mistake
|
2013-09-21 21:18:20 +00:00 |
|
Reinhard Pointner
|
ae57b4e541
|
* save loads of bandwith simply by enabling gzip compression for xmlrpc requests :D
@see http://forum.opensubtitles.org/viewtopic.php?f=8&t=14246#p27901
|
2013-09-21 08:48:43 +00:00 |
|
Reinhard Pointner
|
2fa1ca6dc2
|
+ Subtitle Upload Support !!!
|
2013-09-21 07:29:57 +00:00 |
|
Reinhard Pointner
|
fae437f780
|
* SxE matching: take folder name into consideration as much as file name but put priority on file name
@see http://www.filebot.net/forums/viewtopic.php?f=6&t=954
|
2013-09-21 05:10:27 +00:00 |
|
Reinhard Pointner
|
db11b488c5
|
* try improving support for multi-episodes while trying to not break anything else
|
2013-09-18 05:02:55 +00:00 |
|
Reinhard Pointner
|
92a9eadf1c
|
* support probing .ISO files for video disk hints to check if an .ISO file is a video disk or not
|
2013-09-17 17:32:38 +00:00 |
|
Reinhard Pointner
|
2bdf60d19b
|
* helpers for creating a MediaBindingBean objects to make it easy to access extended metadata
|
2013-09-15 15:21:30 +00:00 |
|
Reinhard Pointner
|
f68170c243
|
* more resilient just in case, probably not necessary
|
2013-09-15 03:36:23 +00:00 |
|
Reinhard Pointner
|
5b9ab0826a
|
* make cache more resilient and fail-safe even if the key class structure changes
|
2013-09-15 01:38:56 +00:00 |
|
Reinhard Pointner
|
9551767595
|
* exit with error code if nothing can be renamed (all modes)
@see http://www.filebot.net/forums/viewtopic.php?f=4&t=941
|
2013-09-13 06:56:30 +00:00 |
|
Reinhard Pointner
|
a6519d7e68
|
* added .nuv to video-types
|
2013-09-12 01:58:55 +00:00 |
|
Reinhard Pointner
|
169959c813
|
* Organize Imports
|
2013-09-11 17:22:00 +00:00 |
|
Reinhard Pointner
|
3a8d8d22d5
|
* support --filter in -rename movie-mode on query-based detection logic
|
2013-09-11 15:52:35 +00:00 |
|
Reinhard Pointner
|
a9969668cc
|
* clean up
|
2013-09-08 03:17:22 +00:00 |
|
Reinhard Pointner
|
c227ec4bd9
|
+ support n-alias data files
|
2013-09-07 15:48:24 +00:00 |
|
Reinhard Pointner
|
3a7769ea2f
|
* revert accidentally committed local changes
|
2013-09-07 02:18:11 +00:00 |
|
Reinhard Pointner
|
1058484593
|
+ experimental support for alias titles
|
2013-09-06 07:55:13 +00:00 |
|
Reinhard Pointner
|
c43c8a0581
|
* remove logging
|
2013-09-04 20:55:57 +00:00 |
|
Reinhard Pointner
|
7305b0f939
|
* fall back to year field if exact release date in unavailable
|
2013-09-03 12:24:43 +00:00 |
|
Reinhard Pointner
|
d1b80b825c
|
* Fix corner-case that leads to mismatch if DB says a movie doesn't exist while at the same time there is an RG of the same name
@see http://www.filebot.net/forums/viewtopic.php?f=4&t=920
|
2013-09-03 12:07:55 +00:00 |
|
Reinhard Pointner
|
5ef33f236c
|
* added .strm as video extension
@see http://www.filebot.net/forums/viewtopic.php?f=4&t=918
|
2013-09-03 07:07:51 +00:00 |
|
Reinhard Pointner
|
a8029ce0f8
|
* should be the primary title
|
2013-08-31 08:04:54 +00:00 |
|
Reinhard Pointner
|
9ff34da4cf
|
* allow 0000-2999 SSEE patterns
@see http://www.filebot.net/forums/viewtopic.php?f=6&t=907
|
2013-08-31 06:51:30 +00:00 |
|
Reinhard Pointner
|
4066124dff
|
* fix AMC-BASELINE tests => Smash (2012)
|
2013-08-15 18:05:40 +00:00 |
|
Reinhard Pointner
|
be22317f41
|
* symlink using relative link targets if possible but default to absolute paths for cross-volume absolute symlinks if necessary
|
2013-08-15 10:51:39 +00:00 |
|
Reinhard Pointner
|
ee3c1d25d7
|
* Better support for Name AKA Name YEAR naming scheme
@see http://www.filebot.net/forums/viewtopic.php?f=6&t=882
|
2013-08-13 04:48:13 +00:00 |
|
Reinhard Pointner
|
0341ba3608
|
* make sure to print proper warnings if filebot straight-out ignores certain movies because of insufficient data available
|
2013-08-12 08:38:00 +00:00 |
|
Reinhard Pointner
|
09d2dc24af
|
* use XZ Utils for packing online database files
|
2013-08-10 07:56:11 +00:00 |
|
Reinhard Pointner
|
c0498185d1
|
* work around server-side url encoding issues
|
2013-08-10 07:54:39 +00:00 |
|
Reinhard Pointner
|
2e2ba454d4
|
* push 3.62
|
2013-08-07 10:18:12 +00:00 |
|
Reinhard Pointner
|
7b9896b67e
|
* make TheTVDB default episode list provider for filebot -list ...
|
2013-08-07 02:55:43 +00:00 |
|
Reinhard Pointner
|
c9006f3c69
|
* fix compile issues
|
2013-08-04 13:18:38 +00:00 |
|
Reinhard Pointner
|
1804d12def
|
--- remove Subscene/Sublight from codebase
|
2013-08-04 13:09:06 +00:00 |
|
Reinhard Pointner
|
326d397784
|
* internal support for grabbing trailer data with TheMovieDB client
|
2013-07-31 19:40:59 +00:00 |
|
Reinhard Pointner
|
3f6487b621
|
* improved subtitle auto-detection
|
2013-07-30 17:54:10 +00:00 |
|
Reinhard Pointner
|
d851e941c9
|
* -no-xattr switch
|
2013-07-25 11:16:28 +00:00 |
|
Reinhard Pointner
|
27575e411e
|
amc and movie detection fine-tuning
@see http://www.filebot.net/forums/viewtopic.php?f=4&p=5379#p5375
|
2013-07-24 12:05:12 +00:00 |
|
Reinhard Pointner
|
e83de902ee
|
* improved user-interaction if manual query input is required for movie search
|
2013-07-24 11:53:16 +00:00 |
|
Reinhard Pointner
|
97c0b369f3
|
* imdb page scraper helper for people that really need it
|
2013-07-24 05:06:04 +00:00 |
|
Reinhard Pointner
|
6217589f82
|
* imdb page scraper helper for people that really need it
|
2013-07-24 04:59:13 +00:00 |
|
Reinhard Pointner
|
f33c01be94
|
* basic internal OSDB subtitle-upload support
|
2013-07-23 19:28:24 +00:00 |
|
Reinhard Pointner
|
4581f2221f
|
* lots of fine-tuning and adjustments for fully-automated movie detection and episode matching
@see http://www.filebot.net/forums/viewtopic.php?f=4&t=832&p=5360#p5360
|
2013-07-23 19:06:49 +00:00 |
|
Reinhard Pointner
|
5b454832a5
|
* executeScript function for include without _guarded{}
|
2013-07-19 13:07:36 +00:00 |
|
Reinhard Pointner
|
d0fa1578e8
|
* update media data
|
2013-07-16 09:50:52 +00:00 |
|
Reinhard Pointner
|
a8f31ffc9c
|
* remove debug logging
|
2013-07-14 12:14:13 +00:00 |
|
Reinhard Pointner
|
483d5d3e76
|
* use ASO bindings for the multi-stream objects to make it easier to use
|
2013-07-13 17:13:07 +00:00 |
|
Reinhard Pointner
|
ccd96ae5be
|
* fine-tune SeriesRating episode differentiation metric
|
2013-07-13 10:40:47 +00:00 |
|
Reinhard Pointner
|
e771cf39a5
|
+ store series info with each episode object and add new bindings {series} {primaryTitle} and {json} for debugging the info object
|
2013-07-13 10:01:33 +00:00 |
|
Reinhard Pointner
|
5d30c78dff
|
* added some audio extensions
|
2013-07-12 21:37:07 +00:00 |
|
Reinhard Pointner
|
da6da29c7b
|
* with the latest revision i'm giving you {videos} {audios} {texts} so you can access all streams and not just stream 0 as with the default bindings
|
2013-07-10 09:18:28 +00:00 |
|
Reinhard Pointner
|
83f0dbe0dd
|
* set timestamp before xattr since timestamp should work even if xattr later throws an exception
|
2013-07-09 15:42:32 +00:00 |
|
Reinhard Pointner
|
1027aac904
|
* matching: big penalty for episodes not yet aired
|
2013-07-09 08:08:50 +00:00 |
|
Reinhard Pointner
|
a3791d3af4
|
* update rules
|
2013-07-09 08:07:54 +00:00 |
|
Reinhard Pointner
|
08cf9720e8
|
* simplify csv lookup and replacement of values based on csv mappings
|
2013-06-25 02:40:19 +00:00 |
|
Reinhard Pointner
|
4c07edb65b
|
* remove Sublight/Subscene related visible components
|
2013-06-24 09:58:37 +00:00 |
|
Reinhard Pointner
|
c2d6e157c6
|
+ bump to 3.61
|
2013-06-24 09:43:40 +00:00 |
|
Reinhard Pointner
|
ba6dc024e7
|
+ remove broken Sublight/Subscene subtitle clients
|
2013-06-24 09:25:04 +00:00 |
|
Reinhard Pointner
|
2eb8e84d59
|
* try fix the OSX / libmediainfo issues with accented characters. Using NFD is start but doesn't seem to work.
@see http://www.filebot.net/forums/viewtopic.php?f=8&t=766
|
2013-06-24 09:23:14 +00:00 |
|
Reinhard Pointner
|
10f314ff7c
|
* added status indicators for files that can't be renamed because target already exists or because source and target are the same path
@see http://www.filebot.net/forums/viewtopic.php?f=6&t=751#p4881
|
2013-06-16 01:09:48 +00:00 |
|
Reinhard Pointner
|
6d46fbf314
|
* get rid of invalid trailing spaces as well when forcing valid filenames
|
2013-05-30 20:30:38 +00:00 |
|
Reinhard Pointner
|
dbabcdcb7d
|
* trailing "..." in filenames are not allowed on windows so ake sure we sanitize that as well
|
2013-05-24 05:05:35 +00:00 |
|
Reinhard Pointner
|
0d569a88bc
|
* try fixing things up for the "thekilling" corner case
|
2013-05-21 17:17:19 +00:00 |
|
Reinhard Pointner
|
ec83540afa
|
* bit more broad series-name query detection
|
2013-05-21 08:44:26 +00:00 |
|
Reinhard Pointner
|
9f7c628890
|
* make -non-strict less strict so it never aborts when the options a fairly reasonable even though there is no apparent good match
|
2013-05-19 16:37:52 +00:00 |
|
Reinhard Pointner
|
3fefe2ce73
|
* replace non-ascii chars with space rather than question mark
|
2013-05-19 16:34:38 +00:00 |
|
Reinhard Pointner
|
19bc3cbe2e
|
* fix corner case for show-equals-title fuzzy logic always tending towards the first episode where the title equals the series name
@see http://www.filebot.net/forums/viewtopic.php?f=6&t=701
|
2013-05-09 13:47:03 +00:00 |
|
Reinhard Pointner
|
fc1c8a26e2
|
* parse specials from anidb episode data
|
2013-05-06 08:21:20 +00:00 |
|
Reinhard Pointner
|
086863fb32
|
* update heuristics
|
2013-05-03 09:48:06 +00:00 |
|
Reinhard Pointner
|
a1451ca807
|
* fix unix argument parsing issues
@see
http://www.filebot.net/forums/viewtopic.php?f=4&p=4633
|
2013-04-30 13:33:09 +00:00 |
|
Reinhard Pointner
|
86723cb3bf
|
* make sure the user.home is never considered a movie folder
|
2013-04-30 11:20:28 +00:00 |
|
Reinhard Pointner
|
7cf2177f79
|
* check for series .nfo 2 folder levels deep
* update artwork.* scripts and generate tvdb links in series .nfo for future lookup
|
2013-04-25 19:23:22 +00:00 |
|
Reinhard Pointner
|
441f2fd2cf
|
* support single-argument cmdline usage for execute(...)
|
2013-04-24 15:17:02 +00:00 |
|
Reinhard Pointner
|
7c715af107
|
* exclude root folders from series name detection
|
2013-04-22 04:13:30 +00:00 |
|
Reinhard Pointner
|
6d0d7ca75e
|
* script bindings for MetaAttributes and added related auto-detection to amc script
* support Mar.adentro.2004.HDTVRip.720p => The Sea Inside 2004 (@see http://www.filebot.net/forums/viewtopic.php?f=6&t=680&p=4512#p4512)
|
2013-04-19 09:28:55 +00:00 |
|
Reinhard Pointner
|
50a917d645
|
* more strict season pattern matching
|
2013-04-19 09:19:49 +00:00 |
|
Reinhard Pointner
|
8fa0531f1b
|
* improved support for matching Season 05/01.avi naming patterns
|
2013-04-18 10:03:41 +00:00 |
|
Reinhard Pointner
|
444ddd8883
|
* improved series detection
e.g.
spincity/season5/01-episodename love in it
|
2013-04-18 09:15:58 +00:00 |
|
Reinhard Pointner
|
cb8aa8d7d6
|
* make -non-strict option more self-explanatory
|
2013-04-16 07:32:04 +00:00 |
|
Reinhard Pointner
|
776bf1bae2
|
* fix The|A thetvdb index lookup issues in BuildData.groovy
|
2013-04-15 14:40:50 +00:00 |
|
Reinhard Pointner
|
492e20ae8a
|
* improved support for derived files in cmdline -rename mode
@see
http://www.filebot.net/forums/viewtopic.php?f=8&t=668#p4448
|
2013-04-14 04:29:41 +00:00 |
|
Reinhard Pointner
|
17d1b6c4af
|
* better movie probing
|
2013-04-13 06:35:32 +00:00 |
|
Reinhard Pointner
|
fc8f6bc7ef
|
* don't allow file override so people can't mess up their stuff, but allow when src/dest path is the same, i.e. doesn't need any change, for usability reasons
|
2013-04-13 06:14:38 +00:00 |
|
Reinhard Pointner
|
41264f0045
|
* grab series name from folder in obvious cases of folder-per-episode naming schemes
@see
http://forum.xbmc.org/showthread.php?tid=110302&pid=1393844#pid1393844
|
2013-04-12 20:36:54 +00:00 |
|
Reinhard Pointner
|
7528f1d12a
|
+ Bump 3.6
|
2013-04-12 18:43:31 +00:00 |
|
Reinhard Pointner
|
d793c72d4e
|
* strip down single-panel mode and don't waste screen space
|
2013-04-11 11:25:08 +00:00 |
|
Reinhard Pointner
|
b21a5d46e8
|
* improved handling of disk folders in scripting
|
2013-04-10 10:55:44 +00:00 |
|
Reinhard Pointner
|
bb38864e69
|
* restoreWindowBounds not working
|
2013-04-09 18:20:52 +00:00 |
|
Reinhard Pointner
|
12cf2f7411
|
+ added --mode option to force a mode in the GUI (e.g. --mode rename) and only display a specified panel
|
2013-04-09 17:55:54 +00:00 |
|
Reinhard Pointner
|
02f714b6ab
|
* various movie detection refinement regarding issues with these kinda naming patterns
e.g.
The.Croods.2013.Custom.DKsubs.TS.PAL.DVDR-SUBLiME/sublime-thecroods_ts.iso
|
2013-04-08 05:29:12 +00:00 |
|
Reinhard Pointner
|
ed30ae0159
|
* cache series ratings internally for likely repeated usage
|
2013-04-07 08:22:41 +00:00 |
|
Reinhard Pointner
|
c506a22999
|
* rely less on error-prone webservices
|
2013-04-07 05:57:01 +00:00 |
|
Reinhard Pointner
|
e7d67b3ed7
|
* balance out misleading numbers in the series name
|
2013-04-06 18:37:46 +00:00 |
|
Reinhard Pointner
|
5b11e05619
|
* take series rating into consideration when matching episodes of multiple shows with the same name
|
2013-04-06 17:49:27 +00:00 |
|
Reinhard Pointner
|
da56397ce9
|
* use ALT+DELETE keybinding to only delete items from one of the stacks, rather then a line from both
|
2013-04-06 14:43:48 +00:00 |
|
Reinhard Pointner
|
a96a205393
|
* fixed issues where numeric matching would give shows names without numbers an advantage, e.g. Touch 1x02 would be matched to Touch instead of Touch (2012)
|
2013-04-06 10:31:38 +00:00 |
|
Reinhard Pointner
|
6ff2dbc171
|
* added data
|
2013-04-04 21:41:47 +00:00 |
|
Reinhard Pointner
|
cb5082c933
|
* set timestamp differentiation interval to a couple of years
|
2013-04-02 16:52:19 +00:00 |
|
Reinhard Pointner
|
f9df1098ab
|
* allow negative match for timestamp metric for when timestamp isn't defined in the episode data (prefer episodes with airdate over episodes without)
|
2013-04-02 16:41:22 +00:00 |
|
Reinhard Pointner
|
83054535e8
|
* improved support for very similar shownames, e.g. Being Human <=> Being Human (US)
|
2013-04-02 15:34:25 +00:00 |
|
Reinhard Pointner
|
efa024ccd2
|
* resolve relative log-file paths against {appdata}/logs
|
2013-04-02 12:32:45 +00:00 |
|
Reinhard Pointner
|
84075b35c8
|
* fix fix NPE
|
2013-04-01 15:05:46 +00:00 |
|
Reinhard Pointner
|
87c6648a03
|
* exclude obviously invalid "movie folders"
|
2013-04-01 14:56:36 +00:00 |
|
Reinhard Pointner
|
7702844976
|
* easy access to xattr metadata objects via naming scheme
|
2013-04-01 10:36:32 +00:00 |
|
Reinhard Pointner
|
95ff15d475
|
* fix various possible movie detection issues
TEST-DATA:
[www.Cpasbien.me] Django.Unchained.2012.FRENCH.BDRip.XviD-AYMO\[www.Cpasbien.me] aymo-django.xvid.cd1.avi
|
2013-04-01 10:17:20 +00:00 |
|
Reinhard Pointner
|
18df1820a7
|
* improved series lookup for series-name-without-spacing type naming, the worst of all naming styles... e.g. isd-thewalkingdead-s03e12.avi
|
2013-04-01 09:39:31 +00:00 |
|
Reinhard Pointner
|
2793321715
|
* fix performance / blocking issues
|
2013-03-31 11:36:28 +00:00 |
|
Reinhard Pointner
|
1f0efe713f
|
* don't keep history of --action test rename operations
|
2013-03-30 16:46:25 +00:00 |
|
Reinhard Pointner
|
ad2bbbdabb
|
* OSDB: also cache negative search results
|
2013-03-30 11:02:51 +00:00 |
|
Reinhard Pointner
|
db820647af
|
* enable 3x fetch-retry for important resources
|
2013-03-30 11:00:14 +00:00 |
|
Reinhard Pointner
|
86b7c9d482
|
+ allow single-instance mode via --log-lock yes
|
2013-03-30 04:20:56 +00:00 |
|
Reinhard Pointner
|
7542da7cf5
|
* respect anidb flood protection limits
|
2013-03-30 03:44:24 +00:00 |
|
Reinhard Pointner
|
fe0d152d8f
|
* better sample handling
|
2013-03-30 03:11:17 +00:00 |
|
Reinhard Pointner
|
c029e3ca8a
|
* fix detection for {n}/E{e} {t} type structure
|
2013-03-29 04:04:28 +00:00 |
|
Reinhard Pointner
|
beee3bce91
|
* improved clutter file handling
|
2013-03-28 09:04:35 +00:00 |
|
Reinhard Pointner
|
4f1ac07c67
|
* also account for sxe patterns in the series name
|
2013-03-27 12:33:23 +00:00 |
|
Reinhard Pointner
|
10fd18c15a
|
* try to take better into account numbers within series names
|
2013-03-27 09:05:52 +00:00 |
|
Reinhard Pointner
|
ac43c109c0
|
* account for misleading SxE patterns in the episode title
|
2013-03-27 06:06:10 +00:00 |
|
Reinhard Pointner
|
2f1e21c6a3
|
* use non-strict matcher as to force a result from the final top similarity set
|
2013-03-27 04:38:38 +00:00 |
|
Reinhard Pointner
|
c54c0895c3
|
* simplistic output redirection for logging purposes
|
2013-03-26 15:04:53 +00:00 |
|
Reinhard Pointner
|
0c9c9a2633
|
* remove unnecessary logging
|
2013-03-26 13:53:14 +00:00 |
|
Reinhard Pointner
|
7acc354a0c
|
* update
|
2013-03-26 08:52:07 +00:00 |
|
Reinhard Pointner
|
1cbdc1f32b
|
* properly lock history.xml file for reading and writing
* revise donation reminders
|
2013-03-26 08:43:02 +00:00 |
|
Reinhard Pointner
|
3d6578cbaf
|
* backwards-compatibility fixes
|
2013-03-25 09:35:17 +00:00 |
|
Reinhard Pointner
|
ca999c82a9
|
* 1080p/720p/etc values are defined now by height as well as width
|
2013-03-24 13:37:10 +00:00 |
|
Reinhard Pointner
|
9065429152
|
* better handling of rename sets where the destination file already exists
|
2013-03-23 12:34:15 +00:00 |
|
Reinhard Pointner
|
331ac63201
|
* fix analytics issue that cause it to be disabled always
|
2013-03-22 13:16:00 +00:00 |
|
Reinhard Pointner
|
5abb244218
|
* refinements
|
2013-03-21 02:43:34 +00:00 |
|
Reinhard Pointner
|
b160272e68
|
* don't copy attributes as to avoid possible permissions issues
|
2013-03-20 02:14:39 +00:00 |
|
Reinhard Pointner
|
d6c9c3ca7c
|
* various little adjustments
|
2013-03-19 11:17:36 +00:00 |
|
Reinhard Pointner
|
6110d6f73c
|
* delete items from both lists as to delete the whole row
|
2013-03-18 05:24:30 +00:00 |
|
Reinhard Pointner
|
140ecef1df
|
+ version bump to v3.5
|
2013-03-17 14:20:27 +00:00 |
|
Reinhard Pointner
|
4dc5e26ae9
|
* fix cache misconfig to stop anidb abuse
* build our own anidb index file like with thetvdb
|
2013-03-17 14:19:11 +00:00 |
|
Reinhard Pointner
|
5dbeb12e88
|
* prefer API search names over local index names
|
2013-03-16 16:29:48 +00:00 |
|
Reinhard Pointner
|
98fb65e088
|
* fine-tune movie/tvshow differentiation
|
2013-03-16 16:13:50 +00:00 |
|
Reinhard Pointner
|
ba1b3f5026
|
* fetch episode lists single-threaded and simple
|
2013-03-15 19:53:09 +00:00 |
|
Reinhard Pointner
|
1f713a3e5a
|
* fix issue with processing two shows with the same name, e.g. SMASH and Smash
|
2013-03-15 13:50:28 +00:00 |
|
Reinhard Pointner
|
17aa158a72
|
* auto-detect filelist-textfile vs normal-textfile and treat accordingly
|
2013-03-15 01:20:37 +00:00 |
|
Reinhard Pointner
|
332e4d1f93
|
* allow dropping in files by dropping in a text files containing paths
|
2013-03-15 01:08:40 +00:00 |
|
Reinhard Pointner
|
4deb39c84d
|
* make things very very easy to understand for all the loser users that keep overriding their extensions and not even then manage to find the clearly visible history/revert button
|
2013-03-14 21:51:28 +00:00 |
|
Reinhard Pointner
|
b55aaea15f
|
* .3DSBS files => video files
|
2013-03-14 17:42:15 +00:00 |
|
Reinhard Pointner
|
a902c00e46
|
* make the internal AcoustID api more flexible
|
2013-03-14 15:35:57 +00:00 |
|
Reinhard Pointner
|
f3e5ab574b
|
* allow AcoustID override mode that'll only use acoustid data as backup but prefer id3 tag if possible
|
2013-03-13 16:14:23 +00:00 |
|
Reinhard Pointner
|
d1f9f266ca
|
* whatever, lets treat .iso as any other video filetype
|
2013-03-13 15:47:20 +00:00 |
|
Reinhard Pointner
|
8d8774a3e8
|
* support .iso as video type
|
2013-03-13 13:11:01 +00:00 |
|
Reinhard Pointner
|
7226dd6fc4
|
* misc
|
2013-03-12 13:43:35 +00:00 |
|
Reinhard Pointner
|
a7d37d43e6
|
* prefer using creationDate over lastModified
|
2013-03-10 04:22:49 +00:00 |
|
Reinhard Pointner
|
53568deca9
|
* differentiate by airdate only into two groups
|
2013-03-09 21:43:18 +00:00 |
|
Reinhard Pointner
|
26bc859eda
|
+ use our own domain www.filebot.net :)
|
2013-03-09 17:15:46 +00:00 |
|
Reinhard Pointner
|
529e28b5d7
|
* enable proper processing of any .001 style raw multi-part archive 7zip can handle
|
2013-03-09 15:12:01 +00:00 |
|
Reinhard Pointner
|
6451c5f478
|
* support raw multi-part archives (as far passing it through to 7z anyway, native lib my not work though)
|
2013-03-09 14:12:13 +00:00 |
|
Reinhard Pointner
|
ffae3be997
|
* use the mirrors.xml server for search as well
|
2013-03-09 12:33:02 +00:00 |
|
Reinhard Pointner
|
173d5e95c6
|
* fix series detection regression issues
|
2013-03-09 12:29:49 +00:00 |
|
Reinhard Pointner
|
df12a4dda9
|
* more deep movie folder guessing
|
2013-03-06 09:19:16 +00:00 |
|
Reinhard Pointner
|
883c684bac
|
* update amc script and movie detection data
@see http://filebot.sourceforge.net/forums/viewtopic.php?f=4&t=566
|
2013-03-06 08:34:43 +00:00 |
|
Reinhard Pointner
|
b7da78c942
|
* clear name of punctuation, spacing, and leading 'The' or 'A' that are common causes for word-lookup to fail
|
2013-03-05 10:20:10 +00:00 |
|
Reinhard Pointner
|
3864ee5b86
|
* treat SxE and absolute numbers with equal weight and defer absolute re:numeric decision to the NumericSequence metric
|
2013-03-04 07:35:20 +00:00 |
|
Reinhard Pointner
|
cd41d45fd2
|
* 1/100 chance of donation reminder
|
2013-03-02 10:44:42 +00:00 |
|
Reinhard Pointner
|
2dd24e53a7
|
* make it look better (e.g. window shadows) by forcing heavy-weight windows
|
2013-03-02 10:36:01 +00:00 |
|
Reinhard Pointner
|
07f6bb9ec3
|
* support XBMC Frodo JSON-RPC calls: VideoLibrary.Scan, GUI.ShowNotification
|
2013-02-26 19:40:24 +00:00 |
|
Reinhard Pointner
|
2d672c17c7
|
* add format examples for moving things into a folder structure
|
2013-02-26 17:06:17 +00:00 |
|
Reinhard Pointner
|
e4c5db4c20
|
* fix AcoustID Json response processing
* show donation reminder to 1/1000 users
|
2013-02-26 11:15:15 +00:00 |
|
Reinhard Pointner
|
ae111086f8
|
+ GUI support for setting up osdb and sublight logins
|
2013-02-26 06:21:02 +00:00 |
|
Reinhard Pointner
|
a56c8bbc66
|
* 1/10000 chance for the donation reminder to popup
|
2013-02-25 18:06:50 +00:00 |
|
Reinhard Pointner
|
2ed4df6ed5
|
* added donation reminder for power users
|
2013-02-25 17:29:16 +00:00 |
|
Reinhard Pointner
|
346601acad
|
* added donation reminder for power users
|
2013-02-25 17:27:34 +00:00 |
|
Reinhard Pointner
|
4e8df5b005
|
* update json-io to 2.0.1
|
2013-02-22 19:24:40 +00:00 |
|
Reinhard Pointner
|
de9d326eb0
|
* fix video support in imdb scraper
|
2013-02-22 17:26:34 +00:00 |
|
Reinhard Pointner
|
46de54e213
|
* fix imdb scraper
|
2013-02-22 16:02:43 +00:00 |
|
Reinhard Pointner
|
ff156c69ba
|
* update query-blacklist to better support www.onlinetvrecorder.com movie naming schemes
|
2013-02-21 14:45:24 +00:00 |
|
Reinhard Pointner
|
cbb50a72a1
|
* exclude existing files from rename map
|
2013-02-21 08:00:42 +00:00 |
|
Reinhard Pointner
|
c58b3df754
|
* put less trust in absolute-number matches
|
2013-02-21 07:42:29 +00:00 |
|
Reinhard Pointner
|
6f5acab61f
|
* match longest possible sequence and not just the first one. should make sequence matching more reliable and work as expected
|
2013-02-20 10:18:35 +00:00 |
|
Reinhard Pointner
|
cdfafe0337
|
* cosmetics
|
2013-02-20 10:16:21 +00:00 |
|
Reinhard Pointner
|
59a2dbaf27
|
* set xattr only for episode/movie files
|
2013-02-15 10:49:34 +00:00 |
|
Reinhard Pointner
|
bb5ac66c98
|
* set xattr only for episode/movie files
|
2013-02-15 10:42:50 +00:00 |
|
Reinhard Pointner
|
24f9b8d92a
|
* fine-tune generic numberic sequence matching (e.g. Bones Staffel 1 Folge 5)
|
2013-02-15 09:50:23 +00:00 |
|
Reinhard Pointner
|
1e06994a59
|
* auto-disable xattr features when in test mode
|
2013-02-15 09:38:30 +00:00 |
|
Reinhard Pointner
|
fa55b68360
|
* added script for deleting xattr metadata
|
2013-02-15 08:48:11 +00:00 |
|
Reinhard Pointner
|
81f2adc49a
|
* sanity check in utorrent-postprocess for all those people messing up with passing cmdline parameters
|
2013-02-12 14:06:54 +00:00 |
|
Reinhard Pointner
|
bbf01f4799
|
* fix UnsupportedOperationException: Unsupported copy option Java 7 Files.move() issue
|
2013-02-12 08:08:48 +00:00 |
|
Reinhard Pointner
|
94f5929500
|
+ version bump 3.4
|
2013-02-12 05:31:42 +00:00 |
|
Reinhard Pointner
|
9caa77a0c0
|
* small adjustments
|
2013-02-11 09:02:17 +00:00 |
|
Reinhard Pointner
|
8a26af9e6a
|
* enable file override if forced by user
|
2013-02-11 04:17:56 +00:00 |
|
Reinhard Pointner
|
7b5e0f00f9
|
* better subtitle sanity
|
2013-02-09 16:24:12 +00:00 |
|
Reinhard Pointner
|
8b172432f9
|
* treat nfo/url files the same
|
2013-02-09 03:59:09 +00:00 |
|
Reinhard Pointner
|
a695c4df54
|
* improve texts
|
2013-02-08 15:41:27 +00:00 |
|
Reinhard Pointner
|
24044a434f
|
+ allow simple skipping of conflicting rename operations
|
2013-02-08 15:35:23 +00:00 |
|
Reinhard Pointner
|
4cb918af32
|
* added {i} model index and {di} model duplicate index bindings
|
2013-02-07 12:25:46 +00:00 |
|
Reinhard Pointner
|
44bd948156
|
* improved cache prefetch depending on distro
|
2013-02-07 08:34:08 +00:00 |
|
Reinhard Pointner
|
9de6d318c0
|
* ignore getters declared in java.* super classes
|
2013-02-07 07:58:04 +00:00 |
|
Reinhard Pointner
|
cc0e468659
|
* fix issue with extracting only certain files
|
2013-02-06 15:55:35 +00:00 |
|
Reinhard Pointner
|
18c422cda0
|
* fix artwork/nfo xml issues
* generate .url files along with artwork/nfo
|
2013-02-06 15:12:19 +00:00 |
|
Reinhard Pointner
|
8da694d0f6
|
* customize filebot user agent so it doesn't get blocked
|
2013-02-06 14:09:35 +00:00 |
|
Reinhard Pointner
|
75322276a9
|
{c{1/0} ?: 0}
|
2013-02-06 03:00:44 +00:00 |
|
Reinhard Pointner
|
1c8e1972b6
|
* added some extra sanity to series name detection
|
2013-02-05 16:24:22 +00:00 |
|
Reinhard Pointner
|
c722008d65
|
* possible fix for all these DBUS warnings on headless machines
|
2013-02-04 09:51:37 +00:00 |
|
Reinhard Pointner
|
70376e97f1
|
* start preparing special package for ubuntu software center
|
2013-02-03 10:15:36 +00:00 |
|
Reinhard Pointner
|
94013e2366
|
* avoid GVFS initialization issues
|
2013-02-03 06:50:54 +00:00 |
|
Reinhard Pointner
|
0c46748575
|
* save settings to user.home unless specified othervia via application.dir
|
2013-02-03 00:46:46 +00:00 |
|
Reinhard Pointner
|
93f2bd39de
|
* added syntax sugar for try{...}catch(){...}
|
2013-02-02 03:18:40 +00:00 |
|
Reinhard Pointner
|
823effbe40
|
* exclude VobSub from normal {lang} binding processing
|
2013-02-01 18:06:18 +00:00 |
|
Reinhard Pointner
|
e631641a0c
|
* support S0EP00 pattern
* added numeric sequence match differentiation step to improve support for generic season/episode patterns
|
2013-02-01 08:12:15 +00:00 |
|
Reinhard Pointner
|
12b277dacc
|
* make cache 2 days because of daily shows
|
2013-02-01 08:08:18 +00:00 |
|
Reinhard Pointner
|
e45b45a866
|
* fine-tune series differentiation
|
2013-01-31 00:39:47 +00:00 |
|
Reinhard Pointner
|
06edb22e5e
|
Fix matching issue causing "TerraNova/Terra.Nova.S01E01.mkv" to be matched to NOVA instead of Terra Nova
|
2013-01-30 11:50:58 +00:00 |
|
Reinhard Pointner
|
04cbcb62c2
|
* special handling for \\server UNC paths
|
2013-01-30 10:33:10 +00:00 |
|
Reinhard Pointner
|
75bd998408
|
* cache compiled script snippets since each new instance leaks into PermGen memory
|
2013-01-29 09:05:42 +00:00 |
|
Reinhard Pointner
|
5683b85d4b
|
* added File.diskSize that works even for paths that don't exist
|
2013-01-29 08:54:50 +00:00 |
|
Reinhard Pointner
|
5695b9b84f
|
* enable multi-line regex mode for match()
|
2013-01-29 05:32:00 +00:00 |
|
Reinhard Pointner
|
e90a076729
|
* better samples for format expression testing environment
|
2013-01-28 17:56:14 +00:00 |
|
Reinhard Pointner
|
e08539b264
|
* better subtitle<->video guessing
|
2013-01-27 16:41:33 +00:00 |
|
Reinhard Pointner
|
3f2499fbea
|
* fix scraper issues with (I) (II) etc tags
|
2013-01-27 12:02:28 +00:00 |
|
Reinhard Pointner
|
cc57b89840
|
* fix TV Movie Lookup
|
2013-01-27 09:56:40 +00:00 |
|
Reinhard Pointner
|
2e68365b6e
|
* support referencing match model from naming scheme
|
2013-01-27 08:17:12 +00:00 |
|
Reinhard Pointner
|
1280031dd2
|
* hi => hearing-impaired subtitles, NOT hindi language
|
2013-01-27 06:04:32 +00:00 |
|
Reinhard Pointner
|
c98557150d
|
* make sure to update episode data and everything else at least once a week so we don't work with outdated episodelist data
|
2013-01-24 06:43:37 +00:00 |
|
Reinhard Pointner
|
631a81ec4e
|
* added lots of extra metadata bindings for music processing
|
2013-01-23 18:15:53 +00:00 |
|
Reinhard Pointner
|
2a8e9a91b7
|
* disable pre-caching of data via -Dapplication.warmup=skip
|
2013-01-23 18:08:32 +00:00 |
|
Reinhard Pointner
|
f934efa111
|
* Expression Format: added getFileSystemAttributes permission
|
2013-01-22 09:26:24 +00:00 |
|
Reinhard Pointner
|
afb0d24c3b
|
* Support Pushover notifications
|
2013-01-22 08:14:21 +00:00 |
|
Reinhard Pointner
|
b1de604df8
|
* utorrent-postprocess: support fetching of subtitles in multiple languages using --def subtitles=en,de,...
|
2013-01-19 17:04:15 +00:00 |
|
Reinhard Pointner
|
bc2fcadedc
|
+ Clear cache via Ctrl+Shift+Delete
|
2013-01-19 06:50:48 +00:00 |
|
Reinhard Pointner
|
2cef5d6be2
|
* update data files
|
2013-01-19 05:16:20 +00:00 |
|
Reinhard Pointner
|
e656c9bdc7
|
* try to inherit stderr if possible (Java 7) to void lots of error output blocking the pipe
|
2013-01-18 18:06:05 +00:00 |
|
Reinhard Pointner
|
3c59cd5acd
|
+ Bump to 3.3
|
2013-01-18 18:03:06 +00:00 |
|
Reinhard Pointner
|
67f6dc63e1
|
* enforce heavy caching to save resources for the various webservices
|
2013-01-18 09:07:35 +00:00 |
|
Reinhard Pointner
|
d52ae6cab8
|
* better fix for the "3-digit SxE pattern with multiple files" issues
|
2013-01-17 06:32:58 +00:00 |
|
Reinhard Pointner
|
450e65dc0c
|
* allow grouping by absolute SxE patterns of the path not just the filename
|
2013-01-17 06:11:54 +00:00 |
|
Reinhard Pointner
|
6f27ff37a8
|
* use S01E01-E02 as default pattern for S00E00 multi-episodes
|
2013-01-16 18:10:55 +00:00 |
|
Reinhard Pointner
|
f2d0350a5b
|
* support S03E11-E12 double episode pattern
|
2013-01-16 16:36:23 +00:00 |
|
Reinhard Pointner
|
66cb0510ed
|
* don't just force SxE patterns -> consider movie mode
|
2013-01-16 14:24:08 +00:00 |
|
Reinhard Pointner
|
a45c86b94a
|
* make sure to ignore any file/subtitle SxE mismatches
|
2013-01-16 10:16:50 +00:00 |
|
Reinhard Pointner
|
e3ba7b79e3
|
* fix subscene scraper
|
2013-01-15 11:28:19 +00:00 |
|
Reinhard Pointner
|
6ee9ff101d
|
* improved logging for cmdline music mode
|
2013-01-14 18:08:13 +00:00 |
|
Reinhard Pointner
|
5fef14bedd
|
* fix imdb scraper issues
|
2013-01-13 03:15:05 +00:00 |
|
Reinhard Pointner
|
f7f41509e1
|
* extracted common MusicIdentificationService interface and added a dummy one that is only reading MediaInfo/ID3
|
2013-01-12 15:21:33 +00:00 |
|
Reinhard Pointner
|
f5572c655e
|
* support system property -DuseGVFS=true|false to turn on/off whether GIO is used in DnD
|
2013-01-12 02:19:47 +00:00 |
|
Reinhard Pointner
|
06ad9e710f
|
* fix music rename analytics
|
2013-01-11 18:13:57 +00:00 |
|
Reinhard Pointner
|
bd3652ff2d
|
* make music matching work properly and adjust build
|
2013-01-11 07:05:11 +00:00 |
|
Reinhard Pointner
|
ac372ca2cd
|
+ Integrated Music Mode with UI and cmdline interface
|
2013-01-10 18:28:46 +00:00 |
|
Reinhard Pointner
|
b8802bb2d3
|
+ preliminary support for audio identification via AcoustID
|
2013-01-10 16:38:17 +00:00 |
|
Reinhard Pointner
|
6ce7ee5cd7
|
* fix for 1e01 pattern problems => http://filebot.sourceforge.net/forums/viewtopic.php?f=6&t=428
|
2013-01-03 10:02:15 +00:00 |
|
Reinhard Pointner
|
1d3181bb9e
|
* put max priority on original filename for all kinds of info extracted from filename
|
2012-12-29 18:02:49 +00:00 |
|
Reinhard Pointner
|
618e566e3f
|
* make imdb binding return tt1234567 pattern values
* support {tmdbid} binding
|
2012-12-29 17:41:07 +00:00 |
|
Reinhard Pointner
|
2dc7fad7bd
|
* add .m2ts as video extension
|
2012-12-29 17:38:52 +00:00 |
|
Reinhard Pointner
|
b43c724a51
|
* movieDetection: check tt1234567 imdbid patterns from filename
|
2012-12-29 17:36:36 +00:00 |
|
Reinhard Pointner
|
9944693316
|
* just to be on the save side
|
2012-12-16 13:25:40 +00:00 |
|
Reinhard Pointner
|
cfb06a5bac
|
* fix DnD for Mac and keep it working for Linux at the same time...
|
2012-12-15 01:00:53 +00:00 |
|
Reinhard Pointner
|
fa100995fa
|
+ Bump to 3.2
|
2012-12-14 15:32:46 +00:00 |
|
Reinhard Pointner
|
b81845e277
|
* make serializer friendly
|
2012-12-12 10:27:26 +00:00 |
|
Reinhard Pointner
|
cfa959cd38
|
* replace -clear option with 2 options -clear-cache and -clear-prefs
|
2012-12-11 11:19:14 +00:00 |
|
Reinhard Pointner
|
58b23a36ad
|
* if anything goes wrong make sure to unwind as a partial episode set possibly missing important data can lead to bad matches
|
2012-12-10 16:34:21 +00:00 |
|
Reinhard Pointner
|
a05c98dce7
|
* fine-tune blacklists for movie matching
|
2012-12-09 20:01:27 +00:00 |
|
Reinhard Pointner
|
419884ab73
|
* make movie index lookup more restrictive and reliable
|
2012-12-09 18:57:04 +00:00 |
|
Reinhard Pointner
|
35e95c3a43
|
* added optional wait interval for retry{ ... }
|
2012-12-09 14:03:34 +00:00 |
|
Reinhard Pointner
|
8c96196b60
|
* added heuristics for the following episode filenames:
Hml8p.201.mkv
tvs-himym-dd20-sed-dl-18p-bd-x264-410.mkv
tvs-mentalist-dd51-ded-dl-7p-ithd-avc-214.mkv
|
2012-12-09 13:37:27 +00:00 |
|
Reinhard Pointner
|
e34ca7db2c
|
* mp4 => assume mp4 video NEVER mp4 audio
|
2012-12-08 13:06:00 +00:00 |
|
Reinhard Pointner
|
f73a07a06b
|
* account for weird data
|
2012-12-06 17:47:39 +00:00 |
|
Reinhard Pointner
|
ee6330a10c
|
* include omdb dump in movie index
* allow foreach for AssociativeScriptObjects
* added sysenv script used for printing out system properties and environment variables
|
2012-12-05 09:36:30 +00:00 |
|
Reinhard Pointner
|
58e59a8639
|
* added {es} binding => list of episode numbers
|
2012-12-04 09:24:15 +00:00 |
|
Reinhard Pointner
|
d94c85ab00
|
* improve stability
|
2012-12-03 18:08:02 +00:00 |
|
Reinhard Pointner
|
7396e1fe68
|
* optimize
|
2012-12-02 14:16:29 +00:00 |
|
Reinhard Pointner
|
9d1f33ae76
|
* Transliterate any text to ASCII before running any kind of string similarity
|
2012-12-02 13:41:06 +00:00 |
|
Reinhard Pointner
|
d3347d19d9
|
* scrape info from main movie page rather than releaseinfo
* spoof googlebot http headers to trick imdb geo-localisation
* fix imdb url encoding issues
|
2012-12-02 09:36:59 +00:00 |
|
Reinhard Pointner
|
55b4b26890
|
* fix retry{ ... } logic
|
2012-12-02 09:32:33 +00:00 |
|
Reinhard Pointner
|
f053ecd8be
|
* make imdb host (e.g. akas.imdb.com) configurable via -Dimdb.hostname
|
2012-12-02 05:15:50 +00:00 |
|
Reinhard Pointner
|
d2ab91e846
|
* fix issue that caused filebot -clear not to work in headless mode
|
2012-12-01 15:58:00 +00:00 |
|
Reinhard Pointner
|
9c39577f63
|
* update IMDb Scraper due to site changes
|
2012-12-01 14:55:34 +00:00 |
|
Reinhard Pointner
|
8592525cfb
|
* fix Linux uriList flavour issues
|
2012-11-25 12:52:08 +00:00 |
|
Reinhard Pointner
|
c6a883a538
|
* fixfix
|
2012-11-24 21:56:09 +00:00 |
|
Reinhard Pointner
|
21fa1a19c4
|
* don't crash just because if there's something wrong with GVFS
|
2012-11-24 06:27:24 +00:00 |
|
Reinhard Pointner
|
215dfcc66a
|
* fine-tune logging
|
2012-11-24 00:11:45 +00:00 |
|
Reinhard Pointner
|
8ab2bd5b5a
|
+++ clean-up GVFS support
|
2012-11-24 00:11:07 +00:00 |
|
Reinhard Pointner
|
879deaa643
|
+++ Support GVFS URIs as valid DnD files by translating the URI to the .gvfs mountpoint filepath
|
2012-11-24 00:00:03 +00:00 |