j
|
4ae8783d27
|
ignore cache if not able to load json file
|
2013-01-31 20:29:21 +05:30 |
|
j
|
e2936705c4
|
fix import
|
2013-01-31 20:07:11 +05:30 |
|
j
|
bb78574bc0
|
add ox.web.twitter
|
2013-01-31 19:48:07 +05:30 |
|
j
|
a7307ec08a
|
alos load releaseinfo for international titles, fixes #1128
|
2013-01-31 14:55:23 +05:30 |
|
j
|
f0c2b888d7
|
fix poster lookup
|
2013-01-29 08:05:31 +05:30 |
|
j
|
2bfd63ff0f
|
add ox.fix_bad_unicode
|
2012-12-30 16:16:23 +01:00 |
|
j
|
8021672cfd
|
add ox.web.ubu
|
2012-12-29 13:04:24 +01:00 |
|
rolux
|
5b5cb0f2c4
|
typo
|
2012-12-27 15:05:58 +01:00 |
|
rolux
|
e4e6a2ff3a
|
image module: update getImageHash method
|
2012-12-27 14:47:15 +01:00 |
|
rolux
|
0ddb32858b
|
image module: add getImageHash method
|
2012-12-27 14:45:20 +01:00 |
|
rolux
|
5c377a5d3a
|
saner copyfile method (that works for files > max python str len)
|
2012-12-26 21:26:43 +01:00 |
|
j
|
7884e8671a
|
dont use Japan (imdb display title) (English title)
|
2012-11-19 12:04:06 +01:00 |
|
j
|
9dfcb77be8
|
international english before often original uk
|
2012-11-11 17:23:34 +01:00 |
|
j
|
6529e5f1c1
|
some more special cases
|
2012-11-11 17:15:40 +01:00 |
|
j
|
43a54740bd
|
restored version
|
2012-11-11 03:08:54 +01:00 |
|
j
|
8229a651f7
|
USA/UK
|
2012-11-11 02:31:51 +01:00 |
|
rolux
|
b8b7e666bc
|
ua parser: detect chrome on ios
|
2012-11-09 23:07:31 +01:00 |
|
j
|
11a00db3bb
|
update series detection, fixes #1153
|
2012-11-09 14:28:34 +01:00 |
|
j
|
c7a2ef21c7
|
titles
|
2012-11-08 20:34:26 +01:00 |
|
j
|
91ebecccc3
|
alternative spelling
|
2012-11-07 20:07:24 +01:00 |
|
j
|
6eb18c3077
|
use title from series entry as series title
|
2012-11-07 00:05:18 +01:00 |
|
j
|
15e78b8cb1
|
,
|
2012-11-04 16:12:28 +01:00 |
|
j
|
8c6f211f25
|
add more video extensions
|
2012-11-04 16:08:00 +01:00 |
|
j
|
dd316160be
|
fix youtube download urls
|
2012-11-01 13:14:59 +01:00 |
|
rolux
|
0001859ba8
|
improve parse_useragent
|
2012-10-27 21:59:40 +02:00 |
|
rolux
|
d73833f467
|
in parse_useragent, add chromium
|
2012-10-27 21:35:46 +02:00 |
|
rolux
|
48240cee7f
|
update parse_useragent
|
2012-10-27 18:51:39 +02:00 |
|
j
|
71b99c8ce9
|
better unicode support for download names
|
2012-10-24 17:18:23 +02:00 |
|
j
|
3b7b87a89f
|
match charset in lower case
|
2012-10-19 14:22:39 +02:00 |
|
j
|
639b74eac3
|
reduce choice of alternative titles for english films, fixes #1084
|
2012-10-10 13:27:19 +02:00 |
|
j
|
13a55763d3
|
take first title only, fixes #1088
|
2012-10-10 13:08:37 +02:00 |
|
j
|
eaa8b9995f
|
use title/originalTitle not title/internationalTitle
|
2012-10-09 14:55:29 +02:00 |
|
j
|
073aaa1b32
|
make directors unique but keep order, fixes #1076
|
2012-10-08 13:44:02 +02:00 |
|
rolux
|
104e9f1c5c
|
format_path: don't use more than 10 director names
|
2012-10-08 11:27:28 +02:00 |
|
j
|
7fe62b5ce3
|
regex first, fixes #1058
|
2012-10-01 23:29:57 +02:00 |
|
j
|
102365eb8e
|
ignore - descriptions, fixes #1047
|
2012-09-30 12:17:45 +02:00 |
|
j
|
1935b76b46
|
also strip single quotes from titles. fixes #1050
|
2012-09-30 12:14:33 +02:00 |
|
j
|
e0dd4d53b1
|
fix only one connection, parse connection description too
|
2012-09-29 18:13:58 +02:00 |
|
j
|
da09714910
|
parse new movieconnections page, fixes #1045
|
2012-09-29 17:55:37 +02:00 |
|
rolux
|
52932bccec
|
fix opera version detection
|
2012-09-29 14:48:19 +02:00 |
|
j
|
c690f811b6
|
minor change
|
2012-09-25 13:54:54 +02:00 |
|
j
|
7c60ddd584
|
allow DictField to be None
|
2012-09-25 13:26:50 +02:00 |
|
j
|
8f82cefa78
|
cleanup imdb characters
|
2012-09-25 12:57:57 +02:00 |
|
j
|
c8cea371e3
|
load series pages with same timeout
|
2012-09-23 15:26:20 +02:00 |
|
rolux
|
280d5ddb39
|
(minor change)
|
2012-09-23 15:21:38 +02:00 |
|
rolux
|
8b0b960cce
|
normalize: add 'dos' to lastname prefixes
|
2012-09-23 15:20:36 +02:00 |
|
rolux
|
62358ecd55
|
normalize: add 'des' to lastname prefixes
|
2012-09-23 15:19:54 +02:00 |
|
j
|
7ae6556ff4
|
cleanup episode titles
|
2012-09-23 15:12:07 +02:00 |
|
j
|
46f9b36851
|
update usera agent
|
2012-09-23 12:01:12 +02:00 |
|
j
|
1272e70891
|
remove empty alternative titles
|
2012-09-22 23:28:59 +02:00 |
|
j
|
a79b2a6134
|
fix stop words
|
2012-09-22 22:56:10 +02:00 |
|
j
|
6df54b5ca2
|
add title stop words again
|
2012-09-22 22:52:18 +02:00 |
|
j
|
b5b480e3f2
|
use imdb display title before other titles, dont add internationalTitle if its the same as title
|
2012-09-22 22:44:08 +02:00 |
|
j
|
d29f9e3dc8
|
fix movies with only one alternative title
|
2012-09-22 22:38:02 +02:00 |
|
j
|
ca9ffcf867
|
add Australia (foo) to International titles
|
2012-09-22 22:34:52 +02:00 |
|
j
|
e6aae3abe5
|
case sensitive title type match
|
2012-09-22 22:11:54 +02:00 |
|
j
|
da72fbdaed
|
imdb: retun title/internationalTitle, #947; cleanup alternative titles, #963
|
2012-09-22 21:40:01 +02:00 |
|
j
|
c69a2ee825
|
detect html5 encoding
|
2012-09-22 20:57:40 +02:00 |
|
j
|
2d1ad2785d
|
ignore anything after timecodes in srt, fixes #996
|
2012-09-21 11:48:02 +02:00 |
|
j
|
1522f870b7
|
strip whitespace
|
2012-09-14 11:31:29 +02:00 |
|
j
|
7a8609f5cf
|
cleanup title in one place
|
2012-09-14 11:27:36 +02:00 |
|
j
|
36c6e6908e
|
cleanup imdb titles, fixes #957
|
2012-09-14 11:17:34 +02:00 |
|
j
|
9f4020e238
|
update imdb parser, fixes #942
|
2012-09-12 23:33:29 +02:00 |
|
rolux
|
327dd21d5c
|
add 'ben' and 'le' to surname suffixes (which are actually prefixes, btw)
|
2012-09-12 21:45:34 +02:00 |
|
rolux
|
654bd0da0e
|
movie.py: update format_underscores
|
2012-09-11 19:58:30 +02:00 |
|
rolux
|
c467f7fa52
|
typo
|
2012-09-11 19:22:45 +02:00 |
|
rolux
|
2879c66d46
|
movie.py: deal with special chars that cause problems in afp/smb (?<>)
|
2012-09-11 19:21:45 +02:00 |
|
rolux
|
16d16b0c45
|
movie.py: use data['isEpisode']
|
2012-09-11 18:30:42 +02:00 |
|
rolux
|
99f8db0385
|
movie.py: fix bugs with episodes, discard prefix directory
|
2012-09-11 17:55:35 +02:00 |
|
j
|
bde28ce097
|
remove seriesDirector, just use director
|
2012-09-11 15:29:10 +02:00 |
|
j
|
1e53378a78
|
cleanup ox.movie.format_path
|
2012-09-11 14:36:51 +02:00 |
|
j
|
8ba74a1e4b
|
fix some failing tests
|
2012-09-09 19:28:11 +02:00 |
|
j
|
fcae567823
|
fix import
|
2012-09-09 18:48:40 +02:00 |
|
j
|
764db8556b
|
up version
|
2012-09-07 03:57:05 +02:00 |
|
j
|
9bc239de51
|
import fallback
|
2012-09-06 13:45:30 +02:00 |
|
j
|
3a0c35372d
|
convert some left over readUrls to read_url
|
2012-09-06 13:25:57 +02:00 |
|
rolux
|
7ebfdaff30
|
revert changes
|
2012-09-01 05:27:59 +02:00 |
|
rolux
|
e04cc5b819
|
merging changes
|
2012-09-01 05:16:28 +02:00 |
|
rolux
|
fb26797b95
|
geo.py: add crosses_dateline and get_area
|
2012-09-01 05:01:08 +02:00 |
|
j
|
f5ad5d73e4
|
some writers are still lists of lists
|
2012-08-30 11:46:25 +02:00 |
|
j
|
2d04e03d3d
|
ox.web.imdb.get_episodes: get all episodes of a series
|
2012-08-26 15:27:16 +02:00 |
|
j
|
ec04c29bcd
|
accept and support compressed response from api, POST with gzip encoded body is not supported in django/wsgi
|
2012-08-22 00:54:04 +02:00 |
|
j
|
ebf3b691b2
|
support new series format in parse_movie_path
|
2012-08-22 00:53:08 +02:00 |
|
rolux
|
b728fdc9b7
|
movie.py: more bugfixes
|
2012-08-22 17:20:58 +02:00 |
|
rolux
|
1f5c060bbc
|
movie.py: more bugfixes
|
2012-08-22 17:19:31 +02:00 |
|
rolux
|
c12914adb5
|
movie.py: more bugfixes
|
2012-08-22 17:17:22 +02:00 |
|
rolux
|
3ded47ac5b
|
movie.py: more bugfixes
|
2012-08-22 17:10:54 +02:00 |
|
rolux
|
7a51ec5fe9
|
movie.py: remove debug information, more bugfixes
|
2012-08-22 14:52:35 +02:00 |
|
rolux
|
b9df4de27e
|
movie.py: temporarily add some debug information
|
2012-08-22 14:39:51 +02:00 |
|
rolux
|
7738bf9811
|
movie.py: temporarily add some debug information
|
2012-08-22 14:33:14 +02:00 |
|
rolux
|
75eed86f7c
|
movie.py: more bugfixes
|
2012-08-22 14:15:32 +02:00 |
|
rolux
|
00ea83dffe
|
movie.py: more bugfixes
|
2012-08-22 14:13:17 +02:00 |
|
rolux
|
a46e3ee210
|
movie.py: typo
|
2012-08-22 12:54:56 +02:00 |
|
rolux
|
f1e897e96e
|
movie.py: use '/', not '.', as separator in version key
|
2012-08-22 12:53:02 +02:00 |
|
rolux
|
f630291584
|
movie.py: don't coerce None to string
|
2012-08-22 12:50:13 +02:00 |
|
rolux
|
6268c491e8
|
movie.py: in parse_item_files, return list, not dict
|
2012-08-22 12:44:43 +02:00 |
|
rolux
|
761586f356
|
movie.py: typo
|
2012-08-22 12:38:21 +02:00 |
|
rolux
|
80bf8e3584
|
movie.py: more bugfixes
|
2012-08-22 12:38:04 +02:00 |
|
rolux
|
84a8a82fcb
|
movie.py: more bugfixes
|
2012-08-22 12:36:17 +02:00 |
|
rolux
|
436abe3def
|
movie.py: typo
|
2012-08-22 12:31:16 +02:00 |
|
rolux
|
359052f780
|
movie.py: typo
|
2012-08-22 12:29:43 +02:00 |
|
rolux
|
e8cec680e9
|
movie.py: more bugfixes
|
2012-08-22 12:27:32 +02:00 |
|
rolux
|
9449b929e6
|
movie.py: typo
|
2012-08-22 12:24:29 +02:00 |
|
rolux
|
2c616e2c52
|
movie.py: handle missing version/part/language/extension
|
2012-08-22 12:22:12 +02:00 |
|
rolux
|
def5c8dabd
|
movie.py: originalPath/path -> path/normalizedPath
|
2012-08-22 11:13:14 +02:00 |
|
rolux
|
f5924bc61c
|
movie.py: use video modification time, not video size
|
2012-08-22 00:42:54 +02:00 |
|
rolux
|
3e232b9a1e
|
parse_paths -> parse_item_files (improved, untested)
|
2012-08-22 00:32:35 +02:00 |
|
rolux
|
0979f1edda
|
movie.py: add fixme
|
2012-08-21 12:08:03 +02:00 |
|
j
|
a22f07ee26
|
use under_score api in ox.torrent too
|
2012-08-21 10:49:36 +02:00 |
|
j
|
d1299f940f
|
add filmsdivision
|
2012-08-21 09:55:16 +02:00 |
|
j
|
771d76d8bb
|
add cache for file functions: oshash/sha1sum/avinfo
|
2012-08-21 09:35:37 +02:00 |
|
j
|
fffd0a17f7
|
typo: web.wikipedia
|
2012-08-21 09:07:26 +02:00 |
|
j
|
f38c7c4ea2
|
speedup imdb parser
|
2012-08-21 09:06:29 +02:00 |
|
j
|
03dbc4d045
|
map->[]
|
2012-08-21 08:41:49 +02:00 |
|
j
|
61b14e9537
|
add read_url debug output
|
2012-08-21 08:41:25 +02:00 |
|
j
|
21dd1c7903
|
- no unicode decoding to get ids to seepdup get_ids
- one function for to get ids get_ids and get_ids(page=N)
|
2012-08-20 14:58:39 +02:00 |
|
j
|
62f5e84642
|
fix ox.cache.read_url
|
2012-08-17 22:20:35 +02:00 |
|
j
|
a4fd3c930f
|
ox.web under_score api rewrite
|
2012-08-15 17:15:40 +02:00 |
|
j
|
bb35daa95c
|
replace all CammelCase with under_score in ox
|
2012-08-14 16:12:43 +02:00 |
|
j
|
2de989e188
|
net/cache readUrl->read_url / Unicode -> unicode=True
format replace all CammelCase with under_score
|
2012-08-14 15:58:05 +02:00 |
|
j
|
c1d0fc6242
|
parse archive.org
|
2012-08-14 15:30:52 +02:00 |
|
j
|
4316c68c6c
|
key not keys
|
2012-08-20 20:34:23 +02:00 |
|
rolux
|
563f9a2a6d
|
movie.py: use original file path
|
2012-08-20 20:28:11 +02:00 |
|
j
|
3f6547f28f
|
support keys in sorted_strings
|
2012-08-20 20:15:52 +02:00 |
|
rolux
|
c1a2bd4d3d
|
movie.py: minor refactoring
|
2012-08-20 20:16:36 +02:00 |
|
rolux
|
73fa8fbecc
|
movie.py: minor fixes
|
2012-08-20 20:08:50 +02:00 |
|
rolux
|
8ffb8fb4b1
|
movie.py: handle multiple subtitle languages and multiple video extensions
|
2012-08-20 19:42:03 +02:00 |
|
rolux
|
204542e2ab
|
movie.py: add parse_paths
|
2012-08-20 18:19:17 +02:00 |
|
rolux
|
f4bb9822bc
|
movie.py: change wording in comment
|
2012-08-20 15:32:06 +02:00 |
|
rolux
|
332e6051c4
|
movie.py: remove spaces preceding extension
|
2012-08-18 22:24:51 +02:00 |
|
rolux
|
87032a2a5e
|
movie.py: when replacing title in file name, strip leading whitespace
|
2012-08-18 22:11:19 +02:00 |
|
rolux
|
1040878a0f
|
movie.py: when replacing title in file name, don't consume extension
|
2012-08-18 22:06:08 +02:00 |
|
rolux
|
d3f8443a15
|
movie.py: fix regexp
|
2012-08-18 21:35:58 +02:00 |
|
rolux
|
c5a7e55608
|
movie.py: correctly handle dots in part title
|
2012-08-18 21:06:50 +02:00 |
|
rolux
|
8d340e46a9
|
movie.py: in format_path, always add '.en'
|
2012-08-18 19:14:29 +02:00 |
|
rolux
|
e8af7b4615
|
movie.py: in format_path, always add '.en'
|
2012-08-18 19:05:45 +02:00 |
|
rolux
|
a15a07bdcc
|
movie.py: refactoring; fix multiple years
|
2012-08-18 15:21:24 +02:00 |
|
rolux
|
3d26e8b495
|
movie.py: correctly handle multi-episode files
|
2012-08-18 14:52:46 +02:00 |
|
rolux
|
5bd546af09
|
movie.py: correctly handle S00 and E00
|
2012-08-18 14:06:52 +02:00 |
|
rolux
|
0b619cfc86
|
movie.py: improve handling of dots in episode titles
|
2012-08-18 13:49:05 +02:00 |
|
rolux
|
11aa3f2180
|
movie.py: strip whitespace from beginning and end of path parts
|
2012-08-17 15:51:03 +02:00 |
|
rolux
|
66b407a6fa
|
movie.py: allow for S00 or E00
|
2012-08-17 15:48:19 +02:00 |
|
rolux
|
3e269531e5
|
movie.py: typo
|
2012-08-17 11:08:47 +02:00 |
|
rolux
|
8e1261bc9d
|
movie.py: typo
|
2012-08-17 11:05:09 +02:00 |
|
rolux
|
0f97aa8bae
|
movie.py: allow for 'Title (YEAR-)/'
|
2012-08-17 01:59:09 +02:00 |
|
j
|
a4304fd8b9
|
add more extensions, make extension accessible
|
2012-08-16 18:57:57 +02:00 |
|
rolux
|
4336c19378
|
movie.py: refactoring
|
2012-08-16 18:18:44 +02:00 |
|
rolux
|
3e657b09c0
|
movie.py: correctly handle subdirectories
|
2012-08-16 16:31:58 +02:00 |
|
rolux
|
9de043422e
|
movie.py: handle some more corner cases
|
2012-08-16 16:21:15 +02:00 |
|
rolux
|
ccc9c90090
|
movie.py: update parse_path to handle arbitrary strings
|
2012-08-16 15:44:57 +02:00 |
|
rolux
|
7d9c389606
|
movie.py: accept uppercase extensions
|
2012-08-16 02:57:46 +02:00 |
|
rolux
|
92f53b2346
|
movie.py: make keys camelCase
|
2012-08-16 00:34:12 +02:00 |
|
rolux
|
458455592b
|
movie.py: correctly format Unknown Director
|
2012-08-15 22:39:38 +02:00 |
|
rolux
|
10b71a5c23
|
movie.py: handle two-letter extensions; don't add 'en' to path
|
2012-08-15 21:55:35 +02:00 |
|
rolux
|
09381f65f4
|
in movie module, add new format_path and parse_path methods
|
2012-08-15 20:57:04 +02:00 |
|
rolux
|
4fb9b03db9
|
update geo module
|
2012-08-15 18:00:52 +02:00 |
|
rolux
|
cfd84e916a
|
update user agent parser
|
2012-08-15 17:58:46 +02:00 |
|
j
|
c374a8fec1
|
fix allmovie parser to work a bit
|
2012-07-08 14:16:57 +02:00 |
|
j
|
d860742aea
|
cleanup metacritic
|
2012-07-08 13:16:59 +02:00 |
|
j
|
e74dc77ab1
|
update rottentomatoes and metacritic
|
2012-07-08 13:09:58 +02:00 |
|
j
|
a4271fd81a
|
support versioned apis
|
2012-07-07 18:51:46 +02:00 |
|
j
|
9c7b985295
|
only return movie data if page is a movie page
|
2012-07-07 18:51:19 +02:00 |
|
j
|
b12e6f1b5c
|
fix wikipedia poster urls
|
2012-07-07 18:03:02 +02:00 |
|
j
|
daf79e8d52
|
add some imdb mappings
|
2012-07-07 15:04:16 +02:00 |
|
j
|
43e8efc470
|
person keys should be unique fixes #900
|
2012-07-02 15:06:08 +02:00 |
|
j
|
d6be4b20f7
|
add ffprobe wrapper
|
2012-06-11 12:11:06 +02:00 |
|
j
|
77d7d7a2ec
|
country names are unicode
|
2012-06-04 21:25:41 +02:00 |
|
j
|
ddecba1d1f
|
cleanup
|
2012-05-27 13:50:10 +02:00 |
|
j
|
f6b5d6bde8
|
parse_html->sanitize_html, add links, allow mailto
|
2012-05-27 13:38:58 +02:00 |
|
rolux
|
e556447d1b
|
typo
|
2012-05-27 12:59:15 +02:00 |
|
rolux
|
4568cba7b6
|
fix is_regexp() in tokenize()
|
2012-05-26 12:52:49 +02:00 |
|
j
|
9ac7491e70
|
new imdb 404 message
|
2012-05-22 11:22:08 +02:00 |
|
j
|
1748484e05
|
fix year parsing
|
2012-05-19 17:08:13 +02:00 |
|
j
|
7af3c5ffcb
|
add sort_string, sorted_strings
|
2012-05-16 12:29:52 +02:00 |
|
j
|
45488de06f
|
try to give context if jsonc parsing fails
|
2012-05-04 20:28:48 +02:00 |
|
j
|
e471e050ad
|
add ox.net.oshash
|
2012-04-30 10:40:10 +02:00 |
|
j
|
5a00be4b37
|
apos not in name2codepoint, also decode that
|
2012-04-24 19:00:48 +02:00 |
|
rolux
|
6ed4a2d867
|
handle webkit; make robot a dict (since robots may run on specific systems or emulate specific browsers, they should be returned separately)
|
2012-03-27 12:20:22 +02:00 |
|
rolux
|
4bb4e31b48
|
Handle Bing Preview and Chrome Mobile
|
2012-03-27 09:55:12 +02:00 |
|
rolux
|
1828701abd
|
add robot flag to parse_useragent
|
2012-03-26 13:40:00 +02:00 |
|
j
|
224fcf7955
|
dont fail with f2t 0.27
|
2012-03-23 23:00:54 +01:00 |
|
rolux
|
e1cc6a07be
|
Change the string for versions of Microsoft Windows from 'NT X.Y (Windows ABC)' to 'NT X.Y (ABC)'
|
2012-03-22 21:17:14 +01:00 |
|
j
|
b0b8f87d43
|
fail if ffmpeg2theora is not up to date
|
2012-03-21 23:45:19 +01:00 |
|
j
|
22a66ec331
|
fix typo
|
2012-03-21 20:38:40 +01:00 |
|
j
|
7e08473e11
|
add get_country_name to ox namespace
|
2012-03-21 20:35:01 +01:00 |
|
rolux
|
4aef31680f
|
add geo module (for country name normalization)
|
2012-03-21 17:55:42 +01:00 |
|
rolux
|
948f172dfc
|
update parse_useragent
|
2012-03-21 08:47:04 +01:00 |
|
rolux
|
070a4879c6
|
add parse_useragent
|
2012-03-21 08:44:24 +01:00 |
|
j
|
fab1f86987
|
include summary in results
|
2012-03-18 15:38:51 +01:00 |
|
j
|
bc655b4134
|
use imdb search to find movie with most votes
|
2012-03-08 14:42:22 +01:00 |
|
j
|
966f558853
|
maxVotes
|
2012-03-08 13:57:11 +01:00 |
|
j
|
b76bb80577
|
handle srts with empty subs
|
2012-03-07 18:59:02 +01:00 |
|
j
|
5ddf7970b9
|
improve parser(handle empty subs)
|
2012-03-06 23:00:16 +01:00 |
|
j
|
cc8b42ebf4
|
add utf-8 BOM to srt
|
2012-03-02 22:37:35 +01:00 |
|
j
|
cf33e530f4
|
update genre parse. fixes #635
|
2012-02-29 15:52:12 +01:00 |
|
j
|
6bd249a5ae
|
use local ffmpeg2theora if available
|
2012-02-24 22:37:55 +05:30 |
|
j
|
60839de99c
|
escape_html/parse_html
|
2012-02-21 21:14:50 +05:30 |
|
j
|
52afe24428
|
add docs
|
2012-02-21 03:04:50 +05:30 |
|
j
|
51f6b0645f
|
add api_proxy view
|
2012-02-21 03:03:55 +05:30 |
|
j
|
a7613f92ef
|
filenames
|
2012-01-31 05:58:58 +05:30 |
|
j
|
ca7bfd06d5
|
utf-8 srts are more common
|
2012-01-28 13:56:42 +05:30 |
|
j
|
b7bb4a4e80
|
space
|
2012-01-26 09:13:48 +05:30 |
|
j
|
01f7e31685
|
http headers must be utf-8 encoded
|
2012-01-24 15:24:13 +05:30 |
|
j
|
29a0e79fbf
|
fix getTorrentSize
|
2012-01-17 14:56:01 +05:30 |
|
j
|
95e5129f1a
|
conditionally import image module
|
2012-01-16 11:39:31 +05:30 |
|
j
|
7243eefb8b
|
amg has to be digit
|
2012-01-13 21:02:22 +05:30 |
|
j
|
1e0fc757d6
|
ids
|
2012-01-13 20:49:04 +05:30 |
|
j
|
f3787c7412
|
not all archive.org links have a title
|
2012-01-13 19:37:12 +05:30 |
|
j
|
fdbf18980f
|
archive.org module
|
2012-01-13 19:22:55 +05:30 |
|
j
|
b506c13bb2
|
add oembed discovery, fix wikipedia parser
|
2012-01-10 14:30:29 +05:30 |
|
j
|
5c2e5e6a3a
|
add ox.django.api
|
2012-01-04 01:30:33 +05:30 |
|
j
|
c4d80675ae
|
add srt.encode
|
2012-01-02 22:37:17 +05:30 |
|
j
|
755eaec501
|
add srt.load
|
2012-01-02 22:14:10 +05:30 |
|
j
|
ad362e5bdc
|
all new youtube bindings
|
2011-12-27 21:59:13 +05:30 |
|
j
|
ed32023686
|
from/toAZ starts at 1
|
2011-12-17 14:02:06 +05:30 |
|
j
|
e0a878464a
|
from/toAZ
|
2011-12-17 03:31:16 +05:30 |
|
j
|
b7aba8bfcf
|
parse google page, ajax json api is limited to 50 requests
|
2011-11-28 14:24:21 +01:00 |
|
j
|
0614f1e5b1
|
_ > :
|
2011-11-22 22:35:06 +01:00 |
|
j
|
bfb1d468af
|
episode can also be 0
|
2011-11-22 22:30:29 +01:00 |
|
j
|
0b3aaae981
|
fix title for episode only series
|
2011-11-22 22:21:29 +01:00 |
|
j
|
bac441158b
|
episode title
|
2011-11-22 22:19:19 +01:00 |
|
j
|
6331d586fc
|
creator for series entries
|
2011-11-22 12:46:27 +01:00 |
|
j
|
ccab080e3f
|
creator exists only for series
|
2011-11-22 12:42:15 +01:00 |
|
j
|
2a04bb8a74
|
Heat expects RGB image
|
2011-11-07 22:51:40 +01:00 |
|
j
|
cb8ebbe74a
|
some static id mapping
|
2011-11-03 11:21:49 +01:00 |
|
j
|
2b7268157b
|
avoid variable collision, save url
|
2011-11-01 22:53:36 +01:00 |
|
j
|
e290438c75
|
dont lookup imdb by default
|
2011-11-01 18:37:45 +01:00 |
|
j
|
8fe8822e09
|
add file cache
|
2011-11-01 13:55:49 +01:00 |
|
j
|
2a7b70c576
|
do empty posters, hand down more timeouts
|
2011-11-01 13:04:13 +01:00 |
|
j
|
6655864337
|
add timeout to getData
|
2011-11-01 09:38:00 +01:00 |
|
j
|
d21221feee
|
just keyword
|
2011-10-31 17:46:05 +01:00 |
|
j
|
7f6e118e6e
|
only $ bugets
|
2011-10-30 15:34:59 +01:00 |
|
j
|
78d8f8cc0b
|
imdb.getUrl
|
2011-10-30 13:31:19 +01:00 |
|
j
|
4cfd74b4b9
|
words
|
2011-10-30 12:54:59 +01:00 |
|
j
|
8f826c4ac3
|
dont wrap data into Binary twice
|
2011-10-29 14:08:38 +02:00 |
|
j
|
8ba5b2097a
|
aspectratio
|
2011-10-29 01:25:43 +02:00 |
|
j
|
b803c06dae
|
releasedate
|
2011-10-28 19:24:09 +02:00 |
|
j
|
be28a4c625
|
episodeYear
|
2011-10-24 21:29:49 +02:00 |
|
j
|
981a0ee2ec
|
default mime type
|
2011-10-21 18:44:45 +02:00 |
|
j
|
5e0193d149
|
dont set None as content_type
|
2011-10-21 18:37:51 +02:00 |
|
j
|
c87a6eddba
|
work around broken episode titles
|
2011-10-21 12:00:20 +02:00 |
|
j
|
bfe269a349
|
usa display title
|
2011-10-19 15:46:07 +02:00 |
|
rolux
|
87f491e96e
|
merge
|
2011-10-18 19:45:12 +02:00 |
|
rolux
|
f23aaf0141
|
don't read piratecinema.org/posters from cache
|
2011-10-18 19:32:27 +02:00 |
|
j
|
c8dc06d682
|
take International (English title)
|
2011-10-18 16:15:07 +02:00 |
|
j
|
60d8c6bc05
|
not everybody can be
|
2011-10-18 15:50:16 +02:00 |
|
j
|
f0a7aba8b0
|
_
|
2011-10-18 15:30:16 +02:00 |
|
j
|
23ea669b7d
|
cleanup summary
|
2011-10-18 14:57:31 +02:00 |
|
j
|
3e7b463ac8
|
International (Spanish
|
2011-10-18 14:45:00 +02:00 |
|
j
|
71abfcc307
|
directors are creators
|
2011-10-18 14:33:45 +02:00 |
|
j
|
f1fee46126
|
episodes without director where series does not have a creator, fix euro entity
|
2011-10-18 14:25:13 +02:00 |
|
j
|
2057e699bd
|
special case series without creator but a director
|
2011-10-18 12:58:03 +02:00 |
|
j
|
fc95c4797b
|
script titles
|
2011-10-18 10:19:02 +02:00 |
|
j
|
7a0fad1e03
|
series without episodes
|
2011-10-17 22:53:02 +02:00 |
|
j
|
d76b607363
|
.
|
2011-10-17 13:56:49 +02:00 |
|
j
|
ae6b2abaaf
|
series country
|
2011-10-17 12:00:39 +02:00 |
|
j
|
0b380abaeb
|
series creator(s) fixed #25
|
2011-10-15 21:32:32 +02:00 |
|
j
|
1b9c4d288c
|
check before use
|
2011-10-15 19:03:32 +02:00 |
|
j
|
e756062749
|
cleanup imdb data
|
2011-10-15 16:54:09 +02:00 |
|
j
|
0bac09ba51
|
recut
|
2011-10-14 22:32:29 +02:00 |
|
j
|
4b8da070af
|
merge
|
2011-10-14 22:29:52 +02:00 |
|
j
|
c5fa197de3
|
output computed title
|
2011-10-14 21:50:50 +02:00 |
|
rolux
|
6160c2bc50
|
merge
|
2011-10-14 21:18:42 +02:00 |
|
rolux
|
2ea147cb7c
|
new piratecinema poster module
|
2011-10-14 21:18:17 +02:00 |
|
j
|
55a43b2d0a
|
upgrade bot to FF 7
|
2011-10-14 12:42:28 +02:00 |
|
j
|
da22dc0bf1
|
api results should be unicode
|
2011-10-13 20:07:01 +02:00 |
|
j
|
2c141fdbcf
|
add api, refine parse_movie_path
|
2011-10-13 19:28:18 +02:00 |
|
j
|
c2c5fbb725
|
add get_oxid
|
2011-10-13 15:08:40 +02:00 |
|
j
|
9b98abdbc6
|
parse_movie_path/create_movie_path
|
2011-10-13 12:21:16 +02:00 |
|
rolux
|
4aeda6bff9
|
fix jsonc.load()
|
2011-10-12 12:26:26 +02:00 |
|
rolux
|
525d71bf89
|
add JSONC module
|
2011-10-12 12:19:57 +02:00 |
|
rolux
|
d8c371e7fb
|
add assertion
|
2011-10-11 21:19:54 +02:00 |
|
rolux
|
90e5e4e932
|
please romans
|
2011-10-11 21:10:36 +02:00 |
|
rolux
|
47a8918c12
|
please academics
|
2011-10-11 20:19:56 +02:00 |
|
rolux
|
df16e0baf5
|
disable article 'i'
|
2011-10-11 19:33:45 +02:00 |
|
rolux
|
c5a6b36273
|
fix a bug in get_sort_title with articles that end with a single quote
|
2011-10-11 18:51:28 +02:00 |
|
rolux
|
8b756b888a
|
handle some more corner cases when sorting names
|
2011-10-11 17:19:31 +02:00 |
|
rolux
|
e93484d110
|
add some support for sorting asian names
|
2011-10-11 16:48:51 +02:00 |
|
rolux
|
d1a0915369
|
typos
|
2011-10-11 16:22:39 +02:00 |
|
rolux
|
0bd59742e7
|
typos
|
2011-10-11 16:17:34 +02:00 |
|
rolux
|
d1021cd9c3
|
update file module, add get_sort_name and get_sort_title to text module
|
2011-10-11 16:14:29 +02:00 |
|
rolux
|
a7aba40790
|
fix a bug where the js tokenizer would fail if the last character of the source was an operator
|
2011-10-07 00:42:31 +02:00 |
|
rolux
|
409d5da90d
|
add js module (tokenize, minify)
|
2011-10-06 22:05:01 +02:00 |
|
j
|
0050c403ab
|
add admin_required decorator
|
2011-10-03 18:05:27 +02:00 |
|
j
|
7b76ad4cc0
|
episodes do not have original title
|
2011-10-02 19:55:51 +02:00 |
|
j
|
46791ba543
|
handle one alternative title
|
2011-10-02 16:23:49 +02:00 |
|
j
|
e77d0c9de1
|
add from/to26 functions
|
2011-09-30 23:42:56 +02:00 |
|
j
|
40b3dabb99
|
include title in connections
|
2011-09-30 19:52:13 +02:00 |
|
j
|
0ff79d432f
|
do not set http status code to json status, this only causes annoying error messages in debug consoles
|
2011-09-29 00:47:22 +02:00 |
|
j
|
10e1291d87
|
titles
|
2011-08-23 16:04:04 +02:00 |
|
j
|
b482ecf707
|
expires
|
2011-08-19 20:08:02 +02:00 |
|
j
|
20346b248a
|
aspect ratio
|
2011-08-18 09:30:30 +02:00 |
|
j
|
a691759a12
|
remove quotes
|
2011-08-10 16:16:04 +02:00 |
|
j
|
87877ff64a
|
english titles
|
2011-08-10 16:13:43 +02:00 |
|
j
|
a9013626a0
|
£25,000 (estimated)<br/>
|
2011-08-09 12:06:47 +02:00 |
|
j
|
e31e8b7e29
|
worldwide gross does not work like that
|
2011-08-09 10:34:26 +02:00 |
|
j
|
9333abbd1b
|
business as usual
|
2011-08-09 10:30:13 +02:00 |
|
j
|
aaf5990381
|
multipart support utf-8
|
2011-08-08 16:24:43 +02:00 |
|
j
|
e216e4a627
|
fix alternative titles
|
2011-08-07 12:42:59 +02:00 |
|
j
|
d1e678186b
|
only list one country per alt title
|
2011-08-05 16:08:30 +02:00 |
|
j
|
b1e883107d
|
trivial trivia fix
|
2011-08-05 15:51:39 +02:00 |
|
j
|
d7c3583535
|
make utf-8 url
|
2011-07-30 13:17:25 +02:00 |
|
rolux
|
9c5f5097c7
|
add parser for trailers.apple.com
|
2011-07-30 10:12:24 +02:00 |
|
rolux
|
faeed07934
|
add apple module (movie link/poster/trailer)
|
2011-07-30 08:42:44 +02:00 |
|
j
|
01ea39b02a
|
race auth exception
|
2011-07-07 00:07:07 +02:00 |
|
j
|
79b1c7ed85
|
south introspection
|
2011-07-07 00:06:35 +02:00 |
|
j
|
c4e1bb311e
|
remove second truncateWords function
|
2011-06-10 13:34:31 +02:00 |
|
j
|
c66787785f
|
net.readUrlUnicode can take data, headers too
|
2011-04-26 23:11:24 +02:00 |
|
j
|
cbca12c3d8
|
reload all pages, just in case
|
2011-04-20 23:12:31 +02:00 |
|
j
|
f3c78be720
|
something went wrong
|
2011-04-20 23:08:33 +02:00 |
|
j
|
2e2a391ae9
|
more format workarounds in avinfo
|
2011-04-19 15:42:04 +02:00 |
|
j
|
59863f15c8
|
imdb fixes
|
2011-04-15 11:46:20 +02:00 |
|
j
|
e02769552d
|
update wikipedia movie data
|
2011-04-07 20:52:03 +02:00 |
|
j
|
bd242d9712
|
do not fail if XACCELREDIRECT and XSENDFILE are not defined
|
2011-04-06 20:38:00 +02:00 |
|
j
|
9a05621d69
|
ox.makedirs
|
2011-04-06 15:24:32 +02:00 |
|
j
|
515d769f9f
|
work around local django.utils package
|
2011-04-05 14:06:56 +02:00 |
|
j
|
e8aa6fe1e4
|
compress cache for html,text,css,js
|
2011-03-28 20:27:41 +02:00 |
|
j
|
f0065dd756
|
f2t sometimes does not list display aspect ratio, set it to width/height in that case
|
2011-03-26 12:12:56 +01:00 |
|
j
|
618ad7ed3f
|
debug needs custom json hooks too
|
2011-03-25 11:39:31 +01:00 |
|
j
|
d35a1c721c
|
connection has to be named argument
|
2011-03-24 20:53:22 +01:00 |
|
j
|
076020bd84
|
add connection to get_db_prep_save
|
2011-03-23 08:03:56 +01:00 |
|
j
|
798f366b8a
|
more manual id mappings
|
2011-03-15 20:16:35 +01:00 |
|
j
|
e0f7b00b86
|
tune criterion
|
2011-03-09 13:10:20 +01:00 |
|
j
|
15db38b442
|
criterion
|
2011-02-27 16:33:25 +01:00 |
|
j
|
337fb29685
|
python2.5
|
2011-02-25 13:24:38 +01:00 |
|
j
|
a4ce8ff800
|
more datetime support
|
2011-02-25 12:20:14 +01:00 |
|
j
|
9043418608
|
support datetime in json serialization
|
2011-02-25 00:55:07 +01:00 |
|
j
|
2132510a8c
|
fix criterion
|
2011-02-23 11:12:37 +01:00 |
|
j
|
2fed0f2b7d
|
promotional abbreviation
|
2011-02-21 11:13:40 +01:00 |
|
j
|
460f1ce92d
|
unicode
|
2011-02-08 12:50:57 +05:30 |
|
j
|
478919c60a
|
hsl needs RGB images
|
2011-02-08 12:43:38 +05:30 |
|
j
|
3049c0185d
|
update tests
|
2011-02-08 12:43:23 +05:30 |
|
j
|
4305546f8b
|
fix impposter urls
|
2011-02-08 12:43:00 +05:30 |
|
j
|
437d90a00f
|
custom queryset to allow for order by NULLS LAST
|
2011-01-25 04:13:00 +05:30 |
|
j
|
e404521e11
|
do NOT use one dict for all requests
|
2011-01-11 18:44:35 +05:30 |
|
j
|
623205bc19
|
fix rating
|
2011-01-06 16:19:58 +05:30 |
|
j
|
e5dd8a3343
|
fix ddg
|
2010-12-31 13:02:22 +05:30 |
|
j
|
3d93932200
|
use imdb for search
|
2010-12-31 12:53:28 +05:30 |
|
j
|
9fc6425a9e
|
search cleanup
|
2010-12-31 12:53:24 +05:30 |
|
j
|
2892f3d12e
|
add duckduckgo search
|
2010-12-29 17:36:14 +05:30 |
|
j
|
0b3cfe6c8d
|
ignore complete title
|
2010-12-28 22:30:45 +05:30 |
|
j
|
c09c6c156c
|
pass on timeout
|
2010-12-27 18:56:11 +05:30 |
|
j
|
2a7e415271
|
no working title
|
2010-12-25 16:52:50 +05:30 |
|
j
|
bf79a05edf
|
return all uppercase base32
|
2010-12-25 15:38:28 +05:30 |
|
j
|
04ce15caa1
|
alternative title
|
2010-12-23 14:39:22 +05:30 |
|
j
|
ce17d0a36b
|
typo
|
2010-12-23 14:35:00 +05:30 |
|
j
|
2c7b3466f7
|
work around imdb quirks in guessing ids
|
2010-12-23 14:23:53 +05:30 |
|
j
|
0d8cc6f94f
|
language too
|
2010-12-23 11:35:06 +05:30 |
|
j
|
07a3794225
|
country links
|
2010-12-23 11:30:53 +05:30 |
|
j
|
7f250988c0
|
do not set status code
|
2010-12-23 00:55:57 +05:30 |
|
j
|
060e4a666f
|
add django.views.taks_status
|
2010-12-22 15:09:34 +05:30 |
|
j
|
0e9f149edb
|
to32 should start with capital letter or number
|
2010-12-22 15:08:59 +05:30 |
|
j
|
fc22335f8e
|
use akas.imdb.com
|
2010-12-09 04:37:28 +01:00 |
|
j
|
ccc55e28f0
|
leave title alone
|
2010-12-08 01:56:37 +01:00 |
|
j
|
8b70307ec8
|
name->property
|
2010-12-07 19:29:53 +01:00 |
|
j
|
066bd38a01
|
series creators as directors
|
2010-11-28 16:53:47 +01:00 |
|
j
|
614c92ee59
|
use ox json import
|
2010-11-23 11:26:14 +01:00 |
|
j
|
17e8e349ac
|
add location
|
2010-11-23 10:50:40 +01:00 |
|
j
|
0262ae50ca
|
add oxdjango to ox package
|
2010-11-23 10:23:40 +01:00 |
|
j
|
01c368d493
|
cleanup
|
2010-11-19 19:57:55 +01:00 |
|
j
|
36b2fec446
|
work around ffmpeg2theora problems with some metadata output
|
2010-11-15 17:35:07 +01:00 |
|
j
|
59741c9cd0
|
vimeo
|
2010-11-05 13:00:19 +01:00 |
|
j
|
bcd0c528fd
|
add amazon
|
2010-10-26 19:33:32 +02:00 |
|
j
|
7a7a921fdb
|
update aaaarg
|
2010-10-26 19:32:34 +02:00 |
|
j
|
2b5c0b7108
|
add timeout
|
2010-10-19 16:08:21 +02:00 |
|
j
|
2da500d26e
|
use cookie to get us titles from imdb
|
2010-10-08 18:07:39 +02:00 |
|
j
|
a106f0cfd7
|
refine title match
|
2010-10-08 17:50:51 +02:00 |
|
j
|
8230cb7c40
|
also fix title in ImdbCombined
|
2010-10-08 17:47:13 +02:00 |
|
j
|
ddc1d1ef43
|
use aka titles
|
2010-10-08 17:43:25 +02:00 |
|
Rolux
|
b22be542d7
|
minus typos
|
2010-09-17 17:25:36 +02:00 |
|
Rolux
|
810860c072
|
adding image module
|
2010-09-17 16:05:29 +02:00 |
|
j
|
77c88dda5b
|
there are blu-ray disks without dvd now
|
2010-09-17 12:30:38 +02:00 |
|
j
|
bbf8fc6866
|
get series poster for episodes
|
2010-09-17 10:46:37 +02:00 |
|
j
|
9cec714835
|
add flixter
|
2010-09-04 12:42:37 +02:00 |
|
j
|
e24fa5f079
|
better tests
|
2010-09-04 03:22:18 +02:00 |
|
j
|
e4e6798433
|
make sure tests work again, fix to32
|
2010-09-03 23:19:19 +02:00 |
|
j
|
269086d349
|
new user agent, fix path
|
2010-09-01 19:57:29 +02:00 |
|
j
|
82b7ff413c
|
stripAccents
|
2010-09-01 14:55:52 +02:00 |
|
j
|
4a19d5f938
|
normalizePath
|
2010-09-01 13:31:18 +02:00 |
|
j
|
51b4872d3e
|
add auth.update
|
2010-08-24 19:08:42 +02:00 |
|
j
|
d31ce9e759
|
add iframe embed
|
2010-08-13 14:58:15 +02:00 |
|
j
|
ff0352a0b7
|
fix video urls
|
2010-08-12 23:53:33 +02:00 |
|
j
|
c97dce9431
|
update useragent
|
2010-08-12 23:35:31 +02:00 |
|
j
|
50794cb741
|
fix youtube id
|
2010-08-12 22:45:09 +02:00 |
|
j
|
f73e043d64
|
include first poster
|
2010-08-12 13:54:22 +02:00 |
|
j
|
0f74f3efff
|
do not reload by default
|
2010-08-07 20:13:55 +02:00 |
|
j
|
0695d80ce9
|
fix base32
|
2010-08-07 20:08:31 +02:00 |
|
j
|
273dbbfd18
|
remove dead code
|
2010-08-03 10:32:54 +02:00 |
|
j
|
eae4803cd3
|
import json/simplejson in one place and use that
|
2010-07-28 15:08:06 +02:00 |
|
j
|
8569759865
|
use googleapi for all google queries
|
2010-07-28 15:04:43 +02:00 |
|
j
|
79286b4619
|
sort title, exclude i verb, and los angeles
|
2010-07-23 12:10:26 +02:00 |
|
j
|
0d2bd1b962
|
readUrl
|
2010-07-19 12:05:58 +02:00 |
|
j
|
d82353a186
|
poster urls
|
2010-07-19 12:05:01 +02:00 |
|
j
|
80385abcd0
|
blue ray
|
2010-07-19 11:53:13 +02:00 |
|
j
|
01c0b7ecc5
|
wikipedia is always utf-8
|
2010-07-18 21:25:33 +02:00 |
|
j
|
f1718e4af1
|
only return pages where imdb id is actually found
|
2010-07-18 21:16:25 +02:00 |
|
j
|
e4005f5810
|
update wikipedia getMovieData
|
2010-07-18 21:12:56 +02:00 |
|
j
|
d56d8aaaf9
|
remove debug
|
2010-07-18 20:59:39 +02:00 |
|
j
|
b3a7546344
|
fix criterion
|
2010-07-18 20:57:22 +02:00 |
|
j
|
2050c9deae
|
only get id from criterion
|
2010-07-18 20:39:26 +02:00 |
|
j
|
b3345523b4
|
somtimes its better to just make one imdb request
|
2010-07-18 20:24:36 +02:00 |
|
j
|
0a2e427f5f
|
freebase movies
|
2010-07-17 14:02:08 +02:00 |
|
j
|
e99c44fee6
|
only take season/episode from original air date
|
2010-07-13 11:28:55 +02:00 |
|
j
|
3010321175
|
add original_title
|
2010-07-12 11:04:34 +02:00 |
|
j
|
4af1dd055e
|
seasons
|
2010-07-12 10:52:26 +02:00 |
|
j
|
9c432f2ab0
|
producers need series crew cropping too
|
2010-07-10 20:20:48 +02:00 |
|
j
|
f3147437b6
|
dates, reduce number of imdb pages loaded
|
2010-07-10 13:54:33 +02:00 |
|
j
|
18ce4cd92d
|
more imdb refinement
|
2010-07-10 10:24:56 +02:00 |
|
j
|
6afafa7355
|
more imdb cleanup, add alternative_titles
|
2010-07-09 10:54:06 +02:00 |
|
j
|
50ada035cc
|
add reviews
|
2010-07-08 10:59:15 +02:00 |
|
j
|
87e73406eb
|
imdb parser fixes
|
2010-07-08 10:03:57 +02:00 |
|
j
|
06d61943ac
|
add ox.web to this repos
|
2010-07-08 01:25:57 +02:00 |
|
j
|
0d354d2574
|
rename, use namespaces
|
2010-07-08 00:34:04 +02:00 |
|
j
|
cff20af4e7
|
back to oxlib, package_dir does not work with pip/python setup.py develop
|
2009-10-12 17:21:05 +02:00 |
|
j
|
8d14cf2291
|
change api, getUrl -> readUrl
|
2009-10-11 15:03:00 +02:00 |
|
j
|
d14f13faaf
|
install as ox
|
2009-10-11 14:53:50 +02:00 |
|