a27673eaa4
Merge branch 'develop_clean_path' of git://github.com/mano3m/CouchPotatoServer into mano3m-develop_clean_path
2013-11-16 12:57:21 +01:00
8e3291a1b0
bithdtv, Import correct functions
2013-11-16 12:49:39 +01:00
89c04902e8
Merge branch 'develop' of github.com:RuudBurger/CouchPotatoServer into develop
2013-11-16 12:47:57 +01:00
e29b100374
Don't try to unicode None object
2013-11-16 12:47:18 +01:00
941d4414ce
Changed to using getattr() so films lacking sets/collections are also handled.
2013-11-16 12:43:07 +01:00
dc830324ae
Added XBMC collection (set) categorization capability.
2013-11-16 12:43:02 +01:00
3f37fc1e11
Move proxy getter to global torrent provider
2013-11-16 12:39:43 +01:00
3442129610
Merge branch 'refs/heads/cptjhmiller-develop' into develop
2013-11-16 12:16:42 +01:00
e9d29f10c1
Cleanup KAT import
2013-11-16 12:16:37 +01:00
8996dd34c2
fix ident in bithdtv
2013-11-16 12:01:29 +01:00
e2c5be0fcd
Merge branch 'develop' of git://github.com/cptjhmiller/CouchPotatoServer into cptjhmiller-develop
2013-11-16 11:57:27 +01:00
3d42c55560
Merge branch 'refs/heads/techmunk-develop' into develop
2013-11-16 11:56:35 +01:00
9d287f140b
Reorder deluge import
2013-11-16 11:56:29 +01:00
5a8f28764d
Fix to help find working proxy
2013-11-16 02:30:31 +00:00
a2c5074d66
fixed bithdtv provider
2013-11-16 02:58:29 +01:00
6acc125d4f
bithdtv provider
...
thanks to @lansinghd ,
https://github.com/RuudBurger/CouchPotatoServer/pull/2460
2013-11-16 02:57:06 +01:00
7b9ebc2f34
Fixed issue https://github.com/RuudBurger/CouchPotatoServer/issues/2440 , by returning a 'True' status when an existing torrent in deluge is added from CP.
2013-11-15 21:25:19 +10:00
4e0d6ec980
Merge branch 'refs/heads/clinton-hall-develop' into develop
2013-11-14 22:36:17 +01:00
c1944c987d
Add some more double char replacements
2013-11-14 22:35:13 +01:00
cdb889a985
Merge branch 'develop' of git://github.com/clinton-hall/CouchPotatoServer into clinton-hall-develop
2013-11-14 21:56:31 +01:00
f6281c6dcc
Update __init__.py
2013-11-14 14:51:27 +00:00
c832a9e2b2
Added proxy support
2013-11-14 14:50:50 +00:00
0c4851e436
Escape filename before using it in a regex. fixes #2430
2013-11-13 19:32:59 +01:00
ce1b205993
Allow 720p tag for screener
2013-11-13 19:22:19 +01:00
b771aa303f
replace multiple separators. fixes #2448
2013-11-13 21:41:29 +10:30
81178b4c8b
Merge pull request #2438 from fuzeman/feature/dev_rtorrent
...
rTorrent: Delete Torrent Directories
2013-11-10 08:28:29 -08:00
0317681597
Added directory removal to the rtorrent downloader
2013-11-11 03:21:00 +13:00
ddba0e318f
Merge branch 'develop' of github.com:RuudBurger/CouchPotatoServer into develop
2013-11-09 23:42:15 +01:00
3ef9591abd
Cleanup import
2013-11-09 23:42:08 +01:00
0d3c0c4077
use delete_files
2013-11-09 22:42:09 +01:00
22b32364b6
Missing )
2013-11-09 21:41:03 +01:00
db8fd20d67
Merge pull request #2436 from jkaberg/develop
...
rTorrent: remove only files, not folder
2013-11-09 09:46:15 -08:00
3c061095e9
remove only files, not folder
...
(or in worst case the download clients root folder and anything in it)
2013-11-09 18:33:21 +01:00
05853bca89
Don't put plot over trailer z-index
2013-11-06 22:16:02 +01:00
aa489bb709
Force name as string
2013-11-05 23:42:44 +01:00
0b70465578
Add Flickcharts to userscript
2013-11-05 23:35:47 +01:00
5c64ba3c9e
Add box office top10 to IMDB automation. closes #2427
2013-11-05 22:45:25 +01:00
e119020016
Ignore releases without any info.
2013-11-05 22:16:26 +01:00
9b92a3d396
Make sure the ignored files get used. fix #2425
2013-11-05 21:24:47 +01:00
c73dc10aeb
Add a bit of padding to plot
2013-11-04 22:47:20 +01:00
c5ee0a576e
Merge branch 'refs/heads/jerbob92-suggestdescription' into develop
2013-11-04 22:26:14 +01:00
3e2ede585a
Animate plot to show more text
2013-11-04 22:26:08 +01:00
ba3dd263ac
Merge branch 'suggestdescription' of git://github.com/jerbob92/CouchPotatoServer into jerbob92-suggestdescription
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-11-03 21:59:39 +01:00
7c955ecc80
XMPP notification support
...
thanks @wernight
2013-11-03 17:17:59 +01:00
48193b38c5
Merge pull request #2415 from mano3m/develop_fix_scanner
...
Cleanup file size code in scanner
2013-11-03 07:44:30 -08:00
2f5a233e63
Merge pull request #2416 from mano3m/develop_remote
...
Default movie_folder to from folder
2013-11-02 11:56:55 -07:00
7b86fe5587
Default movie_folder to from folder
...
In case remote downloaders return a path that does not exist locally,
the movie_folder and files are updated to the from folder. Fixes #2412 ,
#1762 , #1667 , #1047
2013-11-02 11:20:34 +01:00
5396343940
Cleanup file size code in scanner
2013-11-02 10:43:22 +01:00
fa1baa73e8
Introduce path cleaning
...
A new function sp is introduced. It does the same as ss but also cleans
the path.
2013-11-02 10:15:50 +01:00
9fa62de6dd
Wrong variable logged in email notification
2013-10-30 23:09:45 +01:00
Ruud