mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-02-25 17:21:27 -05:00
removed old code
This commit is contained in:
csoler
parent
688813fbf5
commit
8341c68388
@ -48,137 +48,6 @@ RsItem *RsGxsPhotoSerialiser::create_item(uint16_t service, uint8_t item_sub_id)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TO_REMOVE
|
|
||||||
uint32_t RsGxsPhotoSerialiser::size(RsItem* item)
|
|
||||||
{
|
|
||||||
RsGxsPhotoPhotoItem* ppItem = NULL;
|
|
||||||
RsGxsPhotoAlbumItem* paItem = NULL;
|
|
||||||
RsGxsPhotoCommentItem* cItem = NULL;
|
|
||||||
|
|
||||||
if((ppItem = dynamic_cast<RsGxsPhotoPhotoItem*>(item)) != NULL)
|
|
||||||
{
|
|
||||||
return sizeGxsPhotoPhotoItem(ppItem);
|
|
||||||
}
|
|
||||||
else if((paItem = dynamic_cast<RsGxsPhotoAlbumItem*>(item)) != NULL)
|
|
||||||
{
|
|
||||||
return sizeGxsPhotoAlbumItem(paItem);
|
|
||||||
}
|
|
||||||
else if((cItem = dynamic_cast<RsGxsPhotoCommentItem*>(item)) != NULL)
|
|
||||||
{
|
|
||||||
return sizeGxsPhotoCommentItem(cItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
|
|
||||||
#endif
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
bool RsGxsPhotoSerialiser::serialise(RsItem* item, void* data, uint32_t* size)
|
|
||||||
{
|
|
||||||
|
|
||||||
RsGxsPhotoPhotoItem* ppItem = NULL;
|
|
||||||
RsGxsPhotoAlbumItem* paItem = NULL;
|
|
||||||
RsGxsPhotoCommentItem* cItem = NULL;
|
|
||||||
|
|
||||||
if((ppItem = dynamic_cast<RsGxsPhotoPhotoItem*>(item)) != NULL)
|
|
||||||
{
|
|
||||||
return serialiseGxsPhotoPhotoItem(ppItem, data, size);
|
|
||||||
}
|
|
||||||
else if((paItem = dynamic_cast<RsGxsPhotoAlbumItem*>(item)) != NULL)
|
|
||||||
{
|
|
||||||
return serialiseGxsPhotoAlbumItem(paItem, data, size);
|
|
||||||
}else if((cItem = dynamic_cast<RsGxsPhotoCommentItem*>(item)) != NULL)
|
|
||||||
{
|
|
||||||
return serialiseGxsPhotoCommentItem(cItem, data, size);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
|
|
||||||
#endif
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
RsItem* RsGxsPhotoSerialiser::deserialise(void* data, uint32_t* size)
|
|
||||||
{
|
|
||||||
|
|
||||||
#ifdef RSSERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialise()" << std::endl;
|
|
||||||
#endif
|
|
||||||
/* get the type and size */
|
|
||||||
uint32_t rstype = getRsItemId(data);
|
|
||||||
|
|
||||||
if ((RS_PKT_VERSION_SERVICE != getRsItemVersion(rstype)) ||
|
|
||||||
(RS_SERVICE_GXS_TYPE_PHOTO != getRsItemService(rstype)))
|
|
||||||
{
|
|
||||||
return NULL; /* wrong type */
|
|
||||||
}
|
|
||||||
|
|
||||||
switch(getRsItemSubType(rstype))
|
|
||||||
{
|
|
||||||
|
|
||||||
case RS_PKT_SUBTYPE_PHOTO_SHOW_ITEM:
|
|
||||||
return deserialiseGxsPhotoPhotoItem(data, size);
|
|
||||||
case RS_PKT_SUBTYPE_PHOTO_ITEM:
|
|
||||||
return deserialiseGxsPhotoAlbumItem(data, size);
|
|
||||||
case RS_PKT_SUBTYPE_PHOTO_COMMENT_ITEM:
|
|
||||||
return deserialiseGxsPhotoCommentItem(data, size);
|
|
||||||
default:
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialise(): subtype could not be dealt with"
|
|
||||||
<< std::endl;
|
|
||||||
#endif
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t RsGxsPhotoSerialiser::sizeGxsPhotoAlbumItem(RsGxsPhotoAlbumItem* item)
|
|
||||||
{
|
|
||||||
|
|
||||||
const RsPhotoAlbum& album = item->album;
|
|
||||||
uint32_t s = 8; // header
|
|
||||||
|
|
||||||
s += GetTlvStringSize(album.mCaption);
|
|
||||||
s += GetTlvStringSize(album.mCategory);
|
|
||||||
s += GetTlvStringSize(album.mDescription);
|
|
||||||
s += GetTlvStringSize(album.mHashTags);
|
|
||||||
s += GetTlvStringSize(album.mOther);
|
|
||||||
s += GetTlvStringSize(album.mPhotoPath);
|
|
||||||
s += GetTlvStringSize(album.mPhotographer);
|
|
||||||
s += GetTlvStringSize(album.mWhen);
|
|
||||||
s += GetTlvStringSize(album.mWhere);
|
|
||||||
|
|
||||||
RsTlvBinaryData b(item->PacketService()); // TODO, need something more persisitent
|
|
||||||
b.setBinData(album.mThumbnail.data, album.mThumbnail.size);
|
|
||||||
s += GetTlvStringSize(album.mThumbnail.type);
|
|
||||||
s += b.TlvSize();
|
|
||||||
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t RsGxsPhotoSerialiser::sizeGxsPhotoCommentItem(RsGxsPhotoCommentItem *item)
|
|
||||||
{
|
|
||||||
|
|
||||||
const RsPhotoComment& comment = item->comment;
|
|
||||||
uint32_t s = 8; // header
|
|
||||||
|
|
||||||
s += GetTlvStringSize(comment.mComment);
|
|
||||||
s += 4; // mflags
|
|
||||||
|
|
||||||
return s;
|
|
||||||
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void RsGxsPhotoAlbumItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
|
void RsGxsPhotoAlbumItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
|
||||||
{
|
{
|
||||||
RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_CAPTION, album.mCaption, "mCaption");
|
RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_CAPTION, album.mCaption, "mCaption");
|
||||||
@ -196,174 +65,6 @@ void RsGxsPhotoAlbumItem::serial_process(RsGenericSerializer::SerializeJob j,RsG
|
|||||||
|
|
||||||
RsTypeSerializer::serial_process<RsTlvItem>(j,ctx,b,"thumbnail binary data") ;
|
RsTypeSerializer::serial_process<RsTlvItem>(j,ctx,b,"thumbnail binary data") ;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TO_REMOVE
|
|
||||||
bool RsGxsPhotoSerialiser::serialiseGxsPhotoAlbumItem(RsGxsPhotoAlbumItem* item, void* data,
|
|
||||||
uint32_t* size)
|
|
||||||
{
|
|
||||||
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::serialiseGxsPhotoAlbumItem()" << std::endl;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
uint32_t tlvsize = sizeGxsPhotoAlbumItem(item);
|
|
||||||
uint32_t offset = 0;
|
|
||||||
|
|
||||||
if(*size < tlvsize){
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::serialiseGxsPhotoAlbumItem()" << std::endl;
|
|
||||||
#endif
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
*size = tlvsize;
|
|
||||||
|
|
||||||
bool ok = true;
|
|
||||||
|
|
||||||
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
|
|
||||||
|
|
||||||
/* skip the header */
|
|
||||||
offset += 8;
|
|
||||||
|
|
||||||
/* GxsPhotoAlbumItem */
|
|
||||||
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_CAPTION, item->album.mCaption);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_CATEGORY, item->album.mCategory);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_DESCR, item->album.mDescription);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_HASH_TAG, item->album.mHashTags);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_MSG, item->album.mOther);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_PATH, item->album.mPhotoPath);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_NAME, item->album.mPhotographer);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_DATE, item->album.mWhen);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_LOCATION, item->album.mWhere);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_PIC_TYPE, item->album.mThumbnail.type);
|
|
||||||
RsTlvBinaryData b(RS_SERVICE_GXS_TYPE_PHOTO); // TODO, need something more persisitent
|
|
||||||
b.setBinData(item->album.mThumbnail.data, item->album.mThumbnail.size);
|
|
||||||
ok &= b.SetTlv(data, tlvsize, &offset);
|
|
||||||
|
|
||||||
if(offset != tlvsize)
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::serialiseGxsPhotoAlbumItem() FAIL Size Error! " << std::endl;
|
|
||||||
#endif
|
|
||||||
ok = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
if (!ok)
|
|
||||||
{
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::serialiseGxsPhotoAlbumItem() NOK" << std::endl;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return ok;
|
|
||||||
}
|
|
||||||
|
|
||||||
RsGxsPhotoAlbumItem* RsGxsPhotoSerialiser::deserialiseGxsPhotoAlbumItem(void* data,
|
|
||||||
uint32_t* size)
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoAlbumItem()" << std::endl;
|
|
||||||
#endif
|
|
||||||
/* get the type and size */
|
|
||||||
uint32_t rstype = getRsItemId(data);
|
|
||||||
uint32_t rssize = getRsItemSize(data);
|
|
||||||
|
|
||||||
uint32_t offset = 0;
|
|
||||||
|
|
||||||
|
|
||||||
if ((RS_PKT_VERSION_SERVICE != getRsItemVersion(rstype)) ||
|
|
||||||
(RS_SERVICE_GXS_TYPE_PHOTO != getRsItemService(rstype)) ||
|
|
||||||
(RS_PKT_SUBTYPE_PHOTO_ITEM != getRsItemSubType(rstype)))
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoAlbumItem() FAIL wrong type" << std::endl;
|
|
||||||
#endif
|
|
||||||
return NULL; /* wrong type */
|
|
||||||
}
|
|
||||||
|
|
||||||
if (*size < rssize) /* check size */
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoAlbumItem() FAIL wrong size" << std::endl;
|
|
||||||
#endif
|
|
||||||
return NULL; /* not enough data */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set the packet length */
|
|
||||||
*size = rssize;
|
|
||||||
|
|
||||||
bool ok = true;
|
|
||||||
|
|
||||||
RsGxsPhotoAlbumItem* item = new RsGxsPhotoAlbumItem();
|
|
||||||
/* skip the header */
|
|
||||||
offset += 8;
|
|
||||||
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_CAPTION, item->album.mCaption);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_CATEGORY, item->album.mCategory);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_DESCR, item->album.mDescription);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_HASH_TAG, item->album.mHashTags);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_MSG, item->album.mOther);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_PATH, item->album.mPhotoPath);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_NAME, item->album.mPhotographer);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_DATE, item->album.mWhen);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_LOCATION, item->album.mWhere);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_PIC_TYPE, item->album.mThumbnail.type);
|
|
||||||
|
|
||||||
RsTlvBinaryData b(RS_SERVICE_GXS_TYPE_PHOTO); // TODO, need something more persisitent
|
|
||||||
ok &= b.GetTlv(data, rssize, &offset);
|
|
||||||
item->album.mThumbnail.data = (uint8_t*)b.bin_data;
|
|
||||||
item->album.mThumbnail.size = b.bin_len;
|
|
||||||
b.TlvShallowClear();
|
|
||||||
|
|
||||||
if (offset != rssize)
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoAlbumItem() FAIL size mismatch" << std::endl;
|
|
||||||
#endif
|
|
||||||
/* error */
|
|
||||||
delete item;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ok)
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoAlbumItem() NOK" << std::endl;
|
|
||||||
#endif
|
|
||||||
delete item;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t RsGxsPhotoSerialiser::sizeGxsPhotoPhotoItem(RsGxsPhotoPhotoItem* item)
|
|
||||||
{
|
|
||||||
|
|
||||||
const RsPhotoPhoto& photo = item->photo;
|
|
||||||
|
|
||||||
uint32_t s = 8; // header size
|
|
||||||
s += GetTlvStringSize(photo.mCaption);
|
|
||||||
s += GetTlvStringSize(photo.mCategory);
|
|
||||||
s += GetTlvStringSize(photo.mDescription);
|
|
||||||
s += GetTlvStringSize(photo.mHashTags);
|
|
||||||
s += GetTlvStringSize(photo.mOther);
|
|
||||||
s += GetTlvStringSize(photo.mPhotographer);
|
|
||||||
s += GetTlvStringSize(photo.mWhen);
|
|
||||||
s += GetTlvStringSize(photo.mWhere);
|
|
||||||
|
|
||||||
RsTlvBinaryData b(item->PacketService()); // TODO, need something more persisitent
|
|
||||||
b.setBinData(photo.mThumbnail.data, photo.mThumbnail.size);
|
|
||||||
s += GetTlvStringSize(photo.mThumbnail.type);
|
|
||||||
s += b.TlvSize();
|
|
||||||
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void RsGxsPhotoPhotoItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
|
void RsGxsPhotoPhotoItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
|
||||||
{
|
{
|
||||||
RsTypeSerializer::serial_process(j,ctx, TLV_TYPE_STR_CAPTION, photo.mCaption);
|
RsTypeSerializer::serial_process(j,ctx, TLV_TYPE_STR_CAPTION, photo.mCaption);
|
||||||
@ -379,276 +80,12 @@ void RsGxsPhotoPhotoItem::serial_process(RsGenericSerializer::SerializeJob j,RsG
|
|||||||
RsTlvBinaryDataRef b(RS_SERVICE_GXS_TYPE_PHOTO,photo.mThumbnail.data, photo.mThumbnail.size);
|
RsTlvBinaryDataRef b(RS_SERVICE_GXS_TYPE_PHOTO,photo.mThumbnail.data, photo.mThumbnail.size);
|
||||||
RsTypeSerializer::serial_process<RsTlvItem>(j,ctx, b, "mThumbnail") ;
|
RsTypeSerializer::serial_process<RsTlvItem>(j,ctx, b, "mThumbnail") ;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TO_REMOVE
|
|
||||||
bool RsGxsPhotoSerialiser::serialiseGxsPhotoPhotoItem(RsGxsPhotoPhotoItem* item, void* data,
|
|
||||||
uint32_t* size)
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::serialiseGxsPhotoPhotoItem()" << std::endl;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
uint32_t tlvsize = sizeGxsPhotoPhotoItem(item);
|
|
||||||
uint32_t offset = 0;
|
|
||||||
|
|
||||||
if(*size < tlvsize){
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::serialiseGxsPhotoPhotoItem()" << std::endl;
|
|
||||||
#endif
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
*size = tlvsize;
|
|
||||||
|
|
||||||
bool ok = true;
|
|
||||||
|
|
||||||
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
|
|
||||||
|
|
||||||
/* skip the header */
|
|
||||||
offset += 8;
|
|
||||||
|
|
||||||
/* GxsPhotoAlbumItem */
|
|
||||||
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_CAPTION, item->photo.mCaption);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_CATEGORY, item->photo.mCategory);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_DESCR, item->photo.mDescription);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_HASH_TAG, item->photo.mHashTags);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_MSG, item->photo.mOther);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_PIC_AUTH, item->photo.mPhotographer);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_DATE, item->photo.mWhen);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_LOCATION, item->photo.mWhere);
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_PIC_TYPE, item->photo.mThumbnail.type);
|
|
||||||
RsTlvBinaryData b(RS_SERVICE_GXS_TYPE_PHOTO); // TODO, need something more persisitent
|
|
||||||
b.setBinData(item->photo.mThumbnail.data, item->photo.mThumbnail.size);
|
|
||||||
ok &= b.SetTlv(data, tlvsize, &offset);
|
|
||||||
|
|
||||||
if(offset != tlvsize)
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::serialiseGxsPhotoPhotoItem() FAIL Size Error! " << std::endl;
|
|
||||||
#endif
|
|
||||||
ok = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
if (!ok)
|
|
||||||
{
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::serialiseGxsPhotoPhotoItem() NOK" << std::endl;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return ok;
|
|
||||||
}
|
|
||||||
|
|
||||||
RsGxsPhotoPhotoItem* RsGxsPhotoSerialiser::deserialiseGxsPhotoPhotoItem(void* data,
|
|
||||||
uint32_t* size)
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoPhotoItem()" << std::endl;
|
|
||||||
#endif
|
|
||||||
/* get the type and size */
|
|
||||||
uint32_t rstype = getRsItemId(data);
|
|
||||||
uint32_t rssize = getRsItemSize(data);
|
|
||||||
|
|
||||||
uint32_t offset = 0;
|
|
||||||
|
|
||||||
|
|
||||||
if ((RS_PKT_VERSION_SERVICE != getRsItemVersion(rstype)) ||
|
|
||||||
(RS_SERVICE_GXS_TYPE_PHOTO != getRsItemService(rstype)) ||
|
|
||||||
(RS_PKT_SUBTYPE_PHOTO_SHOW_ITEM != getRsItemSubType(rstype)))
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoPhotoItem() FAIL wrong type" << std::endl;
|
|
||||||
#endif
|
|
||||||
return NULL; /* wrong type */
|
|
||||||
}
|
|
||||||
|
|
||||||
if (*size < rssize) /* check size */
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoPhotoItem() FAIL wrong size" << std::endl;
|
|
||||||
#endif
|
|
||||||
return NULL; /* not enough data */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set the packet length */
|
|
||||||
*size = rssize;
|
|
||||||
|
|
||||||
bool ok = true;
|
|
||||||
|
|
||||||
RsGxsPhotoPhotoItem* item = new RsGxsPhotoPhotoItem();
|
|
||||||
/* skip the header */
|
|
||||||
offset += 8;
|
|
||||||
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_CAPTION, item->photo.mCaption);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_CATEGORY, item->photo.mCategory);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_DESCR, item->photo.mDescription);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_HASH_TAG, item->photo.mHashTags);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_MSG, item->photo.mOther);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_PIC_AUTH, item->photo.mPhotographer);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_DATE, item->photo.mWhen);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_LOCATION, item->photo.mWhere);
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_PIC_TYPE, item->photo.mThumbnail.type);
|
|
||||||
|
|
||||||
RsTlvBinaryData b(RS_SERVICE_GXS_TYPE_PHOTO); // TODO, need something more persisitent
|
|
||||||
ok &= b.GetTlv(data, rssize, &offset);
|
|
||||||
item->photo.mThumbnail.data = (uint8_t*)(b.bin_data);
|
|
||||||
item->photo.mThumbnail.size = b.bin_len;
|
|
||||||
b.TlvShallowClear();
|
|
||||||
|
|
||||||
if (offset != rssize)
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoPhotoItem() FAIL size mismatch" << std::endl;
|
|
||||||
#endif
|
|
||||||
/* error */
|
|
||||||
delete item;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ok)
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoPhotoItem() NOK" << std::endl;
|
|
||||||
#endif
|
|
||||||
delete item;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void RsGxsPhotoCommentItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
|
void RsGxsPhotoCommentItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
|
||||||
{
|
{
|
||||||
RsTypeSerializer::serial_process (j,ctx,TLV_TYPE_STR_COMMENT,comment.mComment,"mComment");
|
RsTypeSerializer::serial_process (j,ctx,TLV_TYPE_STR_COMMENT,comment.mComment,"mComment");
|
||||||
RsTypeSerializer::serial_process<uint32_t>(j,ctx,comment.mCommentFlag,"mCommentFlag");
|
RsTypeSerializer::serial_process<uint32_t>(j,ctx,comment.mCommentFlag,"mCommentFlag");
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TO_REMOVE
|
|
||||||
bool RsGxsPhotoSerialiser::serialiseGxsPhotoCommentItem (RsGxsPhotoCommentItem *item, void *data, uint32_t *size)
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::serialiseGxsPhotoCommentItem()" << std::endl;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
uint32_t tlvsize = sizeGxsPhotoCommentItem(item);
|
|
||||||
uint32_t offset = 0;
|
|
||||||
|
|
||||||
if(*size < tlvsize){
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::serialiseGxsPhotoCommentItem()" << std::endl;
|
|
||||||
#endif
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
*size = tlvsize;
|
|
||||||
|
|
||||||
bool ok = true;
|
|
||||||
|
|
||||||
ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
|
|
||||||
|
|
||||||
/* skip the header */
|
|
||||||
offset += 8;
|
|
||||||
|
|
||||||
/* GxsPhotoAlbumItem */
|
|
||||||
|
|
||||||
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_COMMENT, item->comment.mComment);
|
|
||||||
ok &= setRawUInt32(data, tlvsize, &offset, item->comment.mCommentFlag);
|
|
||||||
|
|
||||||
if(offset != tlvsize)
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::serialiseGxsPhotoCommentItem() FAIL Size Error! " << std::endl;
|
|
||||||
#endif
|
|
||||||
ok = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
if (!ok)
|
|
||||||
{
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::serialiseGxsPhotoCommentItem() NOK" << std::endl;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return ok;
|
|
||||||
}
|
|
||||||
|
|
||||||
RsGxsPhotoCommentItem * RsGxsPhotoSerialiser::deserialiseGxsPhotoCommentItem(void *data, uint32_t *size)
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoPhotoItem()" << std::endl;
|
|
||||||
#endif
|
|
||||||
/* get the type and size */
|
|
||||||
uint32_t rstype = getRsItemId(data);
|
|
||||||
uint32_t rssize = getRsItemSize(data);
|
|
||||||
|
|
||||||
uint32_t offset = 0;
|
|
||||||
|
|
||||||
|
|
||||||
if ((RS_PKT_VERSION_SERVICE != getRsItemVersion(rstype)) ||
|
|
||||||
(RS_SERVICE_GXS_TYPE_PHOTO != getRsItemService(rstype)) ||
|
|
||||||
(RS_PKT_SUBTYPE_PHOTO_COMMENT_ITEM != getRsItemSubType(rstype)))
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoCommentItem() FAIL wrong type" << std::endl;
|
|
||||||
#endif
|
|
||||||
return NULL; /* wrong type */
|
|
||||||
}
|
|
||||||
|
|
||||||
if (*size < rssize) /* check size */
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoCommentItem() FAIL wrong size" << std::endl;
|
|
||||||
#endif
|
|
||||||
return NULL; /* not enough data */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set the packet length */
|
|
||||||
*size = rssize;
|
|
||||||
|
|
||||||
bool ok = true;
|
|
||||||
|
|
||||||
RsGxsPhotoCommentItem* item = new RsGxsPhotoCommentItem();
|
|
||||||
|
|
||||||
/* skip the header */
|
|
||||||
offset += 8;
|
|
||||||
|
|
||||||
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_COMMENT, item->comment.mComment);
|
|
||||||
ok &= getRawUInt32(data, rssize, &offset, &(item->comment.mCommentFlag));
|
|
||||||
|
|
||||||
if (offset != rssize)
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoCommentItem() FAIL size mismatch" << std::endl;
|
|
||||||
#endif
|
|
||||||
/* error */
|
|
||||||
delete item;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ok)
|
|
||||||
{
|
|
||||||
#ifdef GXS_PHOTO_SERIAL_DEBUG
|
|
||||||
std::cerr << "RsGxsPhotoSerialiser::deserialiseGxsPhotoCommentItem() NOK" << std::endl;
|
|
||||||
#endif
|
|
||||||
delete item;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void RsGxsPhotoAlbumItem::clear()
|
void RsGxsPhotoAlbumItem::clear()
|
||||||
{
|
{
|
||||||
album.mCaption.clear();
|
album.mCaption.clear();
|
||||||
@ -669,41 +106,6 @@ void RsGxsPhotoCommentItem::clear()
|
|||||||
comment.mCommentFlag = 0;
|
comment.mCommentFlag = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TO_REMOVE
|
|
||||||
std::ostream& RsGxsPhotoCommentItem::print(std::ostream& out, uint16_t indent)
|
|
||||||
{
|
|
||||||
printRsItemBase(out, "RsGxsPhotoCommentItem", indent);
|
|
||||||
uint16_t int_Indent = indent + 2;
|
|
||||||
|
|
||||||
|
|
||||||
printRsItemEnd(out ,"RsGxsPhotoCommentItem", indent);
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::ostream& RsGxsPhotoAlbumItem::print(std::ostream& out, uint16_t indent)
|
|
||||||
{
|
|
||||||
printRsItemBase(out, "RsGxsPhotoAlbumItem", indent);
|
|
||||||
uint16_t int_Indent = indent + 2;
|
|
||||||
|
|
||||||
out << album << std::endl;
|
|
||||||
|
|
||||||
printRsItemEnd(out ,"RsGxsPhotoAlbumItem", indent);
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::ostream& RsGxsPhotoPhotoItem::print(std::ostream& out, uint16_t indent)
|
|
||||||
{
|
|
||||||
printRsItemBase(out, "RsGxsPhotoPhotoItem", indent);
|
|
||||||
uint16_t int_Indent = indent + 2;
|
|
||||||
|
|
||||||
|
|
||||||
printRsItemEnd(out ,"RsGxsPhotoPhotoItem", indent);
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void RsGxsPhotoPhotoItem::clear()
|
void RsGxsPhotoPhotoItem::clear()
|
||||||
{
|
{
|
||||||
photo.mCaption.clear();
|
photo.mCaption.clear();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user