Zach Pomerantz
b1e020d3fd
Fix threadname typo
2016-03-17 15:56:57 -07:00
Clément Brisset
35aa074955
Merge pull request #7369 from birarda/udt-slow-start
...
repairs to udt SendQueue packet timing
2016-03-16 09:44:58 -07:00
Stephen Birarda
c94e2bdc8b
grab the now timestamp only when needed
2016-03-16 08:53:31 -07:00
Andrew Meadows
6028c3e841
Merge pull request #7318 from birarda/atp
...
Asset Transfer Protocol Mappings
2016-03-15 16:52:36 -07:00
Stephen Birarda
1cd16da83e
do sleep timing off when next packet would have been
2016-03-15 15:28:55 -07:00
Stephen Birarda
0012967734
use curly braced initialization for consts
2016-03-15 14:38:41 -07:00
Anthony Thibault
addde84bee
Merge pull request #7363 from markej/master
...
Fill in the Downloads: line of the stats window
2016-03-15 10:42:09 -07:00
Stephen Birarda
72c64532f5
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-15 09:12:49 -07:00
Stephen Birarda
8cb602173a
remove the unused member variable
2016-03-14 20:54:41 -07:00
Stephen Birarda
7858b6b0cd
fix for slow start initial value with new randomization
2016-03-14 15:06:05 -07:00
Mark Johnson
b7a47d7bf2
Tabs -> Spaces
2016-03-12 17:35:57 -08:00
Mark Johnson
d868b541c4
Separate the request limit value from the active request value
...
Use _requestLimit as the download limit, and track active downloads using
_requestsActive. If the limit is changes below the active count, it will
continue downloading all active requests, but not allow new requests until
the active count gets below the limit. If the limit increases, the pending
request queue will be checked immediately to fill the available download slots.
2016-03-12 17:19:29 -08:00
Stephen Birarda
895920a211
short circuit upload when file cannot be opened
2016-03-11 15:19:41 -08:00
Stephen Birarda
85e203e2cb
return an empty string for no error
2016-03-11 11:44:46 -08:00
Stephen Birarda
e51aedeb35
fix error handling for diff request types
2016-03-11 11:36:52 -08:00
Stephen Birarda
9522c2d17c
add file open and write error handling
2016-03-11 11:04:34 -08:00
Stephen Birarda
6ae5ed6588
add trimming to MappingRequest ctors
2016-03-10 16:57:39 -08:00
Atlante45
548d826a4e
Couple bug fixes
2016-03-10 14:59:20 -08:00
Atlante45
7d7a683b18
Add uploadFile method that prompts the user
2016-03-10 14:59:20 -08:00
Stephen Birarda
d077ade350
fix path regex to handle leading double slash
2016-03-10 14:48:44 -08:00
Stephen Birarda
5ad4645b47
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-10 13:28:59 -08:00
Stephen Birarda
50a05df721
fix asset loading with error changes
2016-03-10 11:58:57 -08:00
Stephen Birarda
9c53f40fbe
remove nullptr check in AssetMappingsScriptingInterface
2016-03-10 10:52:05 -08:00
Stephen Birarda
2bbeac6597
short circuit asset request for invalid hash
2016-03-10 10:52:05 -08:00
Stephen Birarda
9d19bf85b1
add consistent error handling for asset request and upload
2016-03-10 10:52:05 -08:00
Stephen Birarda
99718e9c4e
short circuit the mapping operations for invalid path/hash
2016-03-10 10:52:05 -08:00
Stephen Birarda
ae3c0f6646
add hash and path checking
2016-03-09 18:03:44 -08:00
Ryan Huffman
0d2ae4f3a4
Merge branch 'atp' of github.com:birarda/hifi into atp-model
2016-03-09 16:33:53 -08:00
Ryan Huffman
d299ce2677
Fix missing semicolon
2016-03-09 14:56:56 -08:00
Ryan Huffman
f5497aa1e7
Add new AssetMappingsScriptingInterface and add mappings model
2016-03-09 14:53:04 -08:00
Stephen Birarda
96ba57a946
remove client side caching of ATP mappings
2016-03-09 14:24:14 -08:00
Ryan Huffman
64bd41c37f
Add AssetMappingItem and extra data to items
2016-03-09 14:03:56 -08:00
Ryan Huffman
4da4fd889a
Add AssetMappingModel
2016-03-09 14:03:56 -08:00
Ryan Huffman
38edfe0557
Fix GetAllMappings reading
2016-03-09 14:03:56 -08:00
Ryan Huffman
fd5a5dd8f4
Add QJSEngine compatible AssetMappingScriptInterface
2016-03-09 14:03:25 -08:00
Stephen Birarda
2e9ee4f8a7
Merge branch 'atp' of github.com:birarda/hifi into atp
2016-03-09 12:16:59 -08:00
Stephen Birarda
9a2b2b4c16
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-09 12:16:46 -08:00
Clément Brisset
3f50abcd17
Merge pull request #82 from birarda/atp-rename-mapping
...
add rename mapping operation for atomic rename
2016-03-09 11:57:20 -08:00
Zach Pomerantz
54af58834a
Mark Resource loaded after postprocessing
2016-03-09 10:34:07 -08:00
Stephen Birarda
87d5958eb8
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-08 17:11:18 -08:00
Stephen Birarda
8d5111a332
move MappingRequest and subclasses to separate file
2016-03-08 15:30:59 -08:00
Stephen Birarda
181b20f673
move the AssetScriptInterface to script-engine
2016-03-08 14:49:26 -08:00
Stephen Birarda
f9f42a085a
add client side handling for mapping rename
2016-03-08 14:43:55 -08:00
Stephen Birarda
793d20306d
handle multiple paths for mapping delete operations
2016-03-08 14:24:03 -08:00
Zach Pomerantz
925ea8bcda
Add Resource::isCacheable
2016-03-08 13:30:58 -08:00
Stephen Birarda
cf5de317ba
use correct error handling for MappingRequest errors
2016-03-08 12:21:54 -08:00
Stephen Birarda
1ece9aac26
remove extension from asset upload task
2016-03-08 12:08:02 -08:00
Stephen Birarda
e92a9c9741
fix comment for asset packet version push
2016-03-08 11:53:53 -08:00
Stephen Birarda
88c1892bf6
remove a comment block re-added in merge
2016-03-08 11:51:59 -08:00
Stephen Birarda
8107287e6c
remove start from mapping request subclasses
2016-03-08 11:42:57 -08:00