173 commits

Author	SHA1	Message	Date
Stephen Birarda	c4845e5ae5	remove getMapping call from AssetServer that is unused	2016-03-08 11:50:23 -08:00
Stephen Birarda	4608eddb40	remove an extra blank line	2016-03-08 11:47:55 -08:00
Stephen Birarda	7ecfc20dc2	add error handling for asset-server files directory	2016-03-08 11:47:11 -08:00
Stephen Birarda	4236d8e147	replace toLocal8Bit with toUtf8 for hex conversions	2016-03-08 11:40:35 -08:00
Stephen Birarda	063826638e	move handling of get all operation to sep method	2016-03-08 11:39:28 -08:00
Stephen Birarda	bfb9801b22	Merge branch 'atp' of github.com:birarda/hifi into atp-mappings	2016-03-08 11:37:27 -08:00
Stephen Birarda	7bf6b8405c	pluralize mappings in AssetServer naming	2016-03-08 10:28:59 -08:00
Ryan Huffman	89b37f78f0	Make AssetServer response reliable and ordered	2016-03-08 10:26:50 -08:00
Ryan Huffman	7db296fa69	Remove unused get/set/deleteMapping in AssetServer	2016-03-08 10:23:48 -08:00
Stephen Birarda	a3533b0b7d	repairs for moved packet handling in AssetServer	2016-03-08 10:21:29 -08:00
Stephen Birarda	fa04f08c4c	use toHex/fromHex for more compact messaging	2016-03-08 10:01:54 -08:00
Stephen Birarda	da3e3b7e6c	add handle calls for mapping operations	2016-03-08 09:55:48 -08:00
Ryan Huffman	37c0417ea6	Add GetAll and Delete mapping requests	2016-03-07 16:31:49 -08:00
Stephen Birarda	12a774d47f	return error if persistence fails for set/delete operations	2016-03-07 15:46:44 -08:00
Stephen Birarda	5aa287a789	handle read/write to asset-server map file	2016-03-07 15:30:30 -08:00
Stephen Birarda	82cd8aed8c	protect mapping clobbering when migrating	2016-03-07 14:46:54 -08:00
Stephen Birarda	18b22cbd16	add a mapping for pre-mapping migrated files	2016-03-07 14:43:17 -08:00
Stephen Birarda	9d61de6cd5	add a mapping migration for pre-mapping assets	2016-03-07 14:38:55 -08:00
Stephen Birarda	7bb97ec3da	add an extra space before debug in AssetServer	2016-03-07 13:57:12 -08:00
Stephen Birarda	e7124d4b10	add server handling for no extension requests	2016-03-07 13:57:11 -08:00
Ryan Huffman	9eb0fdf589	Clean up AssetServer mapping handling	2016-03-07 13:50:08 -08:00
Ryan Huffman	6b485cf81d	Update atp mapping operations to use a single packet	2016-03-07 13:49:55 -08:00
Ryan Huffman	9148db2612	Clean up AssetServer mapping handling	2016-03-07 13:22:23 -08:00
Ryan Huffman	db98e46bb8	Update atp mapping operations to use a single packet	2016-03-01 16:18:35 -08:00
Atlante45	7b179ab91a	First draft for mapping requests	2016-03-01 13:08:46 -08:00
Stephen Birarda	27d338e81c	make any asset path relative to assets dir	2016-02-11 15:49:13 -08:00
Stephen Birarda	8eaea8a7ff	clarify asset-server migration message	2016-02-11 15:42:35 -08:00
Stephen Birarda	f117bd5867	fix check for string assets path	2016-02-11 15:38:50 -08:00
Stephen Birarda	7c0b3953e4	handle custom path in asset-server for assets	2016-02-11 15:34:43 -08:00
Ryan Huffman	f9718931b0	Fix asset server not creating resources directory before migrating	2016-01-21 17:40:12 -08:00
Ryan Huffman	99bb1fcbe1	Remove dirs from atp copy	2016-01-21 16:46:45 -08:00
Ryan Huffman	c9ea6e7eb6	Fix ATP file copy	2016-01-21 16:45:13 -08:00
Ryan Huffman	e63ac03123	Fix asset server data migration	2016-01-21 15:26:52 -08:00
Ryan Huffman	4ce20242b1	Fix asset server data migration	2016-01-19 15:50:45 -08:00
Ryan Huffman	c417bc0fb3	Move asset resource directory out of /resources	2016-01-19 14:41:57 -08:00
Ryan Huffman	fc42254be1	Add migration of old Asset server data	2016-01-14 12:57:29 -08:00
Ryan Huffman	9ddcfdf94d	Cleanup PacketReceier and ReceivedMessage	2015-10-16 09:21:10 -07:00
Ryan Huffman	7682ab00e3	Add ReceivedMessage and receive progress	2015-10-15 14:09:53 -07:00
Atlante45	1f46b90f9c	Remove constexpr for windows	2015-09-14 18:39:31 +02:00
Atlante45	8ee56b59c9	Update AssetServer stats with units ... Also removed array for better layout	2015-09-11 22:33:58 +02:00
Atlante45	05df84ee67	Remove AS stats namespace/Filter DS	2015-09-11 15:20:01 +02:00
Atlante45	801f32295d	Update JSON stats building	2015-09-11 14:21:54 +02:00
Atlante45	08e0a8d705	AssetServer JSON stats	2015-09-11 14:21:53 +02:00
Atlante45	5808658958	Make NodeJSONStats reliable	2015-09-11 14:21:53 +02:00
Ryan Huffman	db92e3155c	Update AssetServerError enum to be camelcase	2015-09-01 09:39:30 -07:00
Stephen Birarda	dc7d7ef444	make SendAssetTask be consistent with new UploadAssetTask	2015-08-31 15:17:40 -06:00
Stephen Birarda	3f85e8a2fe	add an UploadAssetTask so uploading is on diff thread	2015-08-28 11:12:52 -07:00
Atlante45	12fdec232b	CR	2015-08-28 16:31:02 +02:00
Atlante45	ea05fcea0c	Forward AssetResourceRequest loading errors	2015-08-28 16:03:31 +02:00
Ryan Huffman	8452289e00	Fix issue with raw hash not being converted to hex	2015-08-27 15:56:07 -07:00
Stephen Birarda	8eeb808572	Merge branch 'protocol' of github.com:birarda/hifi into asset-hash	2015-08-27 15:16:41 -07:00
Stephen Birarda	eae90cbe8a	resolve conflicts on merge with origin/protocol	2015-08-27 14:47:35 -07:00
Ryan Huffman	5aa5bca8f7	Add path to headers	2015-08-27 14:29:54 -07:00
Stephen Birarda	86a7a42d24	use compact hash representation for asset-server	2015-08-27 14:22:21 -07:00
Stephen Birarda	f3797964e2	resolve conflicts on merge with huffman/atp-server	2015-08-27 12:21:15 -07:00
Stephen Birarda	16eee10cab	repairs to permission error for asset-server upload	2015-08-27 12:13:20 -07:00
Stephen Birarda	c212ef5734	fix PacketReceiver cleanup, return permission error for upload	2015-08-27 12:01:24 -07:00
Ryan Huffman	a49a1eb0d6	Add extension to atp requests	2015-08-27 11:51:45 -07:00
Ryan Huffman	628f275013	Fix asset server upload errors	2015-08-27 10:07:53 -07:00
Ryan Huffman	f95957a271	Cleanup AssetServer	2015-08-27 09:30:34 -07:00
Ryan Huffman	4ed5748afa	Fix new asset loading in directory	2015-08-26 15:37:58 -07:00
Ryan Huffman	287f2533eb	Remove AssetServer dtor	2015-08-26 15:37:38 -07:00
Ryan Huffman	d66c521200	Move SendAssetTask to separate file	2015-08-26 15:37:23 -07:00
Ryan Huffman	34f7aa74f3	Move SendAssetTask declaration to header	2015-08-26 14:27:46 -07:00
Ryan Huffman	2e585256ff	Update asset hash to Sha256	2015-08-26 14:20:24 -07:00
Ryan Huffman	9b174bfbf4	Remove extension from filename	2015-08-26 09:28:19 -07:00
Ryan Huffman	d503c5293a	Remove commented out line	2015-08-26 09:28:06 -07:00
Ryan Huffman	85f80ff6f9	Update AssetServer to use PacketList	2015-08-25 15:05:35 -07:00
Ryan Huffman	0352782e46	Add SendAssetTask	2015-08-25 12:46:44 -07:00
Ryan Huffman	b865a3f8fb	Add thread pool to AssetGet requests	2015-08-25 12:41:55 -07:00
Ryan Huffman	a168a1058f	Update filename regex in AssetServer to allow extensions	2015-08-19 12:09:46 -07:00
Ryan Huffman	5258474f98	Update AssetServer with GetInfo packet	2015-08-03 16:24:34 -07:00
Ryan Huffman	bf9bfb4575	Add AssetServer	2015-07-23 15:07:20 -07:00