From 09f28695d84c8ebb92959a811908b75fa26fc884 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Sun, 24 Jan 2010 20:44:07 +0000 Subject: [PATCH] Upstream tarball 9975 --- .svn-revision | 2 +- src/ECSpecialCoreTags.cpp | 1 + src/amule-remote-gui.cpp | 1 + src/libs/ec/abstracts/ECCodes.abstract | 1 + src/libs/ec/c#/ECCodes.cs | 1 + src/libs/ec/cpp/ECCodes.h | 2 ++ src/libs/ec/cpp/ECSpecialTags.h | 2 ++ src/libs/ec/java/ECCodes.java | 1 + src/remote-gui.net/ECCodes.cs | 1 + 9 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.svn-revision b/.svn-revision index dd54067a..46f38590 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -9974 +9975 diff --git a/src/ECSpecialCoreTags.cpp b/src/ECSpecialCoreTags.cpp index 83fd9bd3..e1760f88 100644 --- a/src/ECSpecialCoreTags.cpp +++ b/src/ECSpecialCoreTags.cpp @@ -186,6 +186,7 @@ CECTag(EC_TAG_PARTFILE, file->GetFileHash()) AddTag(EC_TAG_PARTFILE_LAST_SEEN_COMP, file->lastseencomplete, valuemap); AddTag(EC_TAG_PARTFILE_LAST_RECV, file->GetLastChangeDatetime(), valuemap); AddTag(EC_TAG_PARTFILE_DOWNLOAD_ACTIVE, file->GetDlActiveTime(), valuemap); + AddTag(EC_TAG_PARTFILE_AVAILABLE_PARTS, file->GetAvailablePartCount(), valuemap); AddTag(EC_TAG_PARTFILE_LOST_CORRUPTION, file->GetLostDueToCorruption(), valuemap); AddTag(EC_TAG_PARTFILE_GAINED_COMPRESSION, file->GetGainDueToCompression(), valuemap); diff --git a/src/amule-remote-gui.cpp b/src/amule-remote-gui.cpp index ae0ce05f..46ea5d07 100644 --- a/src/amule-remote-gui.cpp +++ b/src/amule-remote-gui.cpp @@ -1362,6 +1362,7 @@ void CDownQueueRem::ProcessItemUpdate(CEC_PartFile_Tag *tag, CPartFile *file) tag->LastSeenComplete(&file->lastseencomplete); tag->LastDateChanged(&file->m_lastDateChanged); tag->DownloadActiveTime(&file->m_nDlActiveTime); + tag->AvailablePartCount(&file->m_availablePartsCount); tag->GetLostDueToCorruption(&file->m_iLostDueToCorruption); tag->GetGainDueToCompression(&file->m_iGainDueToCompression); diff --git a/src/libs/ec/abstracts/ECCodes.abstract b/src/libs/ec/abstracts/ECCodes.abstract index 5e4e5615..02b26f39 100644 --- a/src/libs/ec/abstracts/ECCodes.abstract +++ b/src/libs/ec/abstracts/ECCodes.abstract @@ -220,6 +220,7 @@ EC_TAG_PARTFILE 0x0300 EC_TAG_PARTFILE_GAINED_COMPRESSION 0x031A EC_TAG_PARTFILE_SAVED_ICH 0x031B EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS 0x031C + EC_TAG_PARTFILE_AVAILABLE_PARTS 0x031D EC_TAG_KNOWNFILE 0x0400 EC_TAG_KNOWNFILE_XFERRED 0x0401 diff --git a/src/libs/ec/c#/ECCodes.cs b/src/libs/ec/c#/ECCodes.cs index e8e66202..e9f31cd1 100644 --- a/src/libs/ec/c#/ECCodes.cs +++ b/src/libs/ec/c#/ECCodes.cs @@ -188,6 +188,7 @@ public enum ECTagNames { EC_TAG_PARTFILE_GAINED_COMPRESSION = 0x031A, EC_TAG_PARTFILE_SAVED_ICH = 0x031B, EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS = 0x031C, + EC_TAG_PARTFILE_AVAILABLE_PARTS = 0x031D, EC_TAG_KNOWNFILE = 0x0400, EC_TAG_KNOWNFILE_XFERRED = 0x0401, EC_TAG_KNOWNFILE_XFERRED_ALL = 0x0402, diff --git a/src/libs/ec/cpp/ECCodes.h b/src/libs/ec/cpp/ECCodes.h index a6765119..7ae48ae4 100644 --- a/src/libs/ec/cpp/ECCodes.h +++ b/src/libs/ec/cpp/ECCodes.h @@ -197,6 +197,7 @@ enum ECTagNames { EC_TAG_PARTFILE_GAINED_COMPRESSION = 0x031A, EC_TAG_PARTFILE_SAVED_ICH = 0x031B, EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS = 0x031C, + EC_TAG_PARTFILE_AVAILABLE_PARTS = 0x031D, EC_TAG_KNOWNFILE = 0x0400, EC_TAG_KNOWNFILE_XFERRED = 0x0401, EC_TAG_KNOWNFILE_XFERRED_ALL = 0x0402, @@ -596,6 +597,7 @@ wxString GetDebugNameECTagNames(uint16 arg) case 0x031A: return wxT("EC_TAG_PARTFILE_GAINED_COMPRESSION"); case 0x031B: return wxT("EC_TAG_PARTFILE_SAVED_ICH"); case 0x031C: return wxT("EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS"); + case 0x031D: return wxT("EC_TAG_PARTFILE_AVAILABLE_PARTS"); case 0x0400: return wxT("EC_TAG_KNOWNFILE"); case 0x0401: return wxT("EC_TAG_KNOWNFILE_XFERRED"); case 0x0402: return wxT("EC_TAG_KNOWNFILE_XFERRED_ALL"); diff --git a/src/libs/ec/cpp/ECSpecialTags.h b/src/libs/ec/cpp/ECSpecialTags.h index 965243de..5804459e 100644 --- a/src/libs/ec/cpp/ECSpecialTags.h +++ b/src/libs/ec/cpp/ECSpecialTags.h @@ -230,6 +230,8 @@ class CEC_PartFile_Tag : public CECTag { time_t LastSeenComplete(time_t *target = 0)const { return AssignIfExist(EC_TAG_PARTFILE_LAST_SEEN_COMP, target); } time_t LastDateChanged(time_t *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_LAST_RECV, target); } uint32 DownloadActiveTime(uint32 *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_DOWNLOAD_ACTIVE, target); } + uint16 AvailablePartCount(uint16 *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_AVAILABLE_PARTS, target); } + uint64 GetLostDueToCorruption(uint64 *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_LOST_CORRUPTION, target); } uint64 GetGainDueToCompression(uint64 *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_GAINED_COMPRESSION, target); } uint32 TotalPacketsSavedDueToICH(uint32 *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_SAVED_ICH, target); } diff --git a/src/libs/ec/java/ECCodes.java b/src/libs/ec/java/ECCodes.java index bd018d96..14c2ccfb 100644 --- a/src/libs/ec/java/ECCodes.java +++ b/src/libs/ec/java/ECCodes.java @@ -185,6 +185,7 @@ public final static short EC_TAG_PARTFILE_LOST_CORRUPTION = 0x0319; public final static short EC_TAG_PARTFILE_GAINED_COMPRESSION = 0x031A; public final static short EC_TAG_PARTFILE_SAVED_ICH = 0x031B; public final static short EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS = 0x031C; +public final static short EC_TAG_PARTFILE_AVAILABLE_PARTS = 0x031D; public final static short EC_TAG_KNOWNFILE = 0x0400; public final static short EC_TAG_KNOWNFILE_XFERRED = 0x0401; public final static short EC_TAG_KNOWNFILE_XFERRED_ALL = 0x0402; diff --git a/src/remote-gui.net/ECCodes.cs b/src/remote-gui.net/ECCodes.cs index e8e66202..e9f31cd1 100644 --- a/src/remote-gui.net/ECCodes.cs +++ b/src/remote-gui.net/ECCodes.cs @@ -188,6 +188,7 @@ public enum ECTagNames { EC_TAG_PARTFILE_GAINED_COMPRESSION = 0x031A, EC_TAG_PARTFILE_SAVED_ICH = 0x031B, EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS = 0x031C, + EC_TAG_PARTFILE_AVAILABLE_PARTS = 0x031D, EC_TAG_KNOWNFILE = 0x0400, EC_TAG_KNOWNFILE_XFERRED = 0x0401, EC_TAG_KNOWNFILE_XFERRED_ALL = 0x0402, -- 2.11.4.GIT