remove more references to compact storage allocation

bindings/python/client.py

@@ -168,9 +168,6 @@ def main():
     parser.add_option('-s', '--save-path',
         type='string', help='the path where the downloaded file/folder should be placed.')
 
-    parser.add_option('-a', '--allocation-mode',
-        type='string', help='sets mode used for allocating the downloaded files on disk. Possible options are [full | compact]')
-
     parser.add_option('-r', '--proxy-host',
         type='string', help='sets HTTP proxy host and port (separated by \':\')')
 
@@ -179,7 +176,6 @@ def main():
       , max_download_rate=0
       , max_upload_rate=0
       , save_path='.'
-      , allocation_mode='compact'
       , proxy_host=''
     )
 
@@ -196,8 +192,6 @@ def main():
     if options.max_download_rate <= 0:
         options.max_download_rate = -1
 
-    compact_allocation = options.allocation_mode == 'compact'
-
     settings = lt.session_settings()
     settings.user_agent = 'python_client/' + lt.version
 

docs/manual.rst

@@ -522,7 +522,7 @@ The file format is a bencoded dictionary containing the following fields:
 |                          | re-check is issued.                                          |
 +--------------------------+--------------------------------------------------------------+
 | ``allocation``           | The allocation mode for the storage. Can be either ``full``  |
-|                          | or ``compact``. If this is full, the file sizes and          |
+|                          | or ``sparse``. If this is full, the file sizes and           |
 |                          | timestamps are disregarded. Pieces are assumed not to have   |
 |                          | moved around even if the files have been modified after the  |
 |                          | last resume data checkpoint.                                 |
@@ -541,16 +541,6 @@ There are two modes in which storage (files on disk) are allocated in libtorrent
 2. The *sparse allocation*, sparse files are used, and pieces are downloaded
    directly to where they belong. This is the recommended (and default) mode.
 
-In previous versions of libtorrent, a 3rd mode was supported, *compact
-allocation*. Support for this is deprecated and will be removed in future
-versions of libtorrent. It's still described in here for completeness.
-
-The allocation mode is selected when a torrent is started. It is passed as an
-argument to session::add_torrent() or session::async_add_torrent().
-
-The decision to use full allocation or compact allocation typically depends on
-whether any files have priority 0 and if the filesystem supports sparse files.
-
 sparse allocation
 -----------------
 

include/libtorrent/error_code.hpp

@@ -365,7 +365,7 @@ namespace libtorrent
 			// The 'blocks per piece' entry is invalid in the resume data file
 			invalid_blocks_per_piece,
 			// The resume file is missing the 'slots' entry, which is required
-			// for torrents with compact allocation
+			// for torrents with compact allocation. *DEPRECATED*
 			missing_slots,
 			// The resume file contains more slots than the torrent
 			too_many_slots,
@@ -376,7 +376,7 @@ namespace libtorrent
 			// The pieces on disk needs to be re-ordered for the specified
 			// allocation mode. This happens if you specify sparse allocation
 			// and the files on disk are using compact storage. The pieces needs
-			// to be moved to their right position
+			// to be moved to their right position. *DEPRECATED*
 			pieces_need_reorder,
 			// this error is returned when asking to save resume data and
 			// specifying the flag to only save when there's anything new to save

include/libtorrent/storage.hpp

@@ -153,17 +153,6 @@ namespace libtorrent
 	namespace aux { struct session_settings; }
 	struct cached_piece_entry;
 
-	TORRENT_EXTRA_EXPORT std::vector<std::pair<boost::int64_t, std::time_t> > get_filesizes(
-		file_storage const& t
-		, std::string const& p);
-
-	TORRENT_EXTRA_EXPORT bool match_filesizes(
-		file_storage const& t
-		, std::string const& p
-		, std::vector<std::pair<boost::int64_t, std::time_t> > const& sizes
-		, bool compact_mode
-		, std::string* error = 0);
-
 	TORRENT_EXTRA_EXPORT int copy_bufs(file::iovec_t const* bufs, int bytes, file::iovec_t* target);
 	TORRENT_EXTRA_EXPORT void advance_bufs(file::iovec_t*& bufs, int bytes);
 	TORRENT_EXTRA_EXPORT void clear_bufs(file::iovec_t const* bufs, int num_bufs);