Skip to content

Commit 57b9e60

Browse files
sam-astrosam-astro
committed
.
1 parent 74282eb commit 57b9e60

File tree

10 files changed

+161
-88912
lines changed

10 files changed

+161
-88912
lines changed

‎dcc_client/dcc_client/Main.cpp

+15-13
Original file line numberDiff line numberDiff line change
@@ -596,19 +596,21 @@ int main()
596596
delugeFile.close();
597597

598598
content.push_back({(colorstr) {(std::string)delugeJson["_name"]}, (colorstr) {((std::string)delugeJson["_totalHash"]).substr(0, 20)}, (colorstr) {std::to_string(delugeJson["peers"].size())}, (colorstr) {truncateMetricNum((unsigned long long)delugeJson["_totalSizeB"]) + "B"}}); // Add new row
599-
//// Verify the deluge, by checking each chunk with its expected hash, and then the full hash
600-
//std::string delugePath = "./wwwdata/containers/" + ((std::string)delugeJson["_totalHash"]).substr(0, 32) + ".tar.zip";
601-
//if(VerifyDeluge(delugeJson, delugePath)){
602-
// // Add deluge full hash to list with it's path as a value
603-
// //completeDelugeList[(std::string)delugeJson["_totalHash"]] = deluge.path();
604-
//}
605-
//// If the deluge is invalid, remove it's file
606-
//else{
607-
// try{
608-
// remove(deluge.path());
609-
// }
610-
// catch(...){}
611-
//}
599+
600+
// Verify the deluge, by checking each chunk with its expected hash, and then the full hash
601+
std::string delugePath = "./wwwdata/containers/" + ((std::string)delugeJson["_totalHash"]).substr(0, 32) + ".tar.zip";
602+
if (VerifyDeluge(delugeJson, delugePath)) {
603+
// Add deluge full hash to list with it's path as a value
604+
//completeDelugeList[(std::string)delugeJson["_totalHash"]] = deluge.path();
605+
}
606+
// If the deluge is invalid, remove it's file
607+
else {
608+
try {
609+
//remove(deluge.path());
610+
}
611+
catch (...) {
612+
}
613+
}
612614
}
613615
}
614616
console::WriteTable(headers, content, widths, 1);

‎dcc_client/out-linux/_deps/cpr-build/cpr/CMakeFiles/cpr.dir/compiler_depend.internal

-3,740
This file was deleted.

‎dcc_client/out-linux/_deps/cpr-build/cpr/CMakeFiles/cpr.dir/compiler_depend.make

+2-4,390
Large diffs are not rendered by default.

‎dcc_client/out-linux/_deps/curl-build/lib/CMakeFiles/libcurl.dir/compiler_depend.internal

-23,077
This file was deleted.

‎dcc_client/out-linux/_deps/curl-build/lib/CMakeFiles/libcurl.dir/compiler_depend.make

+2-24,037
Large diffs are not rendered by default.

‎dcc_client/out-linux/_deps/curl-build/libcurl-target.cmake

+138
Original file line numberDiff line numberDiff line change
@@ -3151,6 +3151,144 @@ unset(_cmake_targets_not_defined)
31513151
unset(_cmake_expected_targets)
31523152

31533153

3154+
# Create imported target CURL::libcurl
3155+
add_library(CURL::libcurl SHARED IMPORTED)
3156+
3157+
set_target_properties(CURL::libcurl PROPERTIES
3158+
INTERFACE_INCLUDE_DIRECTORIES "/home/sam/Code/Distributed-Compute-Coin/dcc_client/out-linux/_deps/curl-src/include"
3159+
INTERFACE_LINK_LIBRARIES "dl;OpenSSL::SSL;OpenSSL::Crypto;ZLIB::ZLIB"
3160+
)
3161+
3162+
# Import target "CURL::libcurl" for configuration "Release"
3163+
set_property(TARGET CURL::libcurl APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
3164+
set_target_properties(CURL::libcurl PROPERTIES
3165+
IMPORTED_LOCATION_RELEASE "/home/sam/Code/Distributed-Compute-Coin/dcc_client/out-linux/_deps/curl-build/lib/libcurl.so"
3166+
IMPORTED_SONAME_RELEASE "libcurl.so"
3167+
)
3168+
3169+
# This file does not depend on other imported targets which have
3170+
# been exported from the same project but in a separate export set.
3171+
3172+
# Commands beyond this point should not need to know the version.
3173+
set(CMAKE_IMPORT_FILE_VERSION)
3174+
cmake_policy(POP)
3175+
# Generated by CMake
3176+
3177+
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
3178+
message(FATAL_ERROR "CMake >= 2.8.0 required")
3179+
endif()
3180+
if(CMAKE_VERSION VERSION_LESS "2.8.3")
3181+
message(FATAL_ERROR "CMake >= 2.8.3 required")
3182+
endif()
3183+
cmake_policy(PUSH)
3184+
cmake_policy(VERSION 2.8.3...3.23)
3185+
#----------------------------------------------------------------
3186+
# Generated CMake target import file.
3187+
#----------------------------------------------------------------
3188+
3189+
# Commands may need to know the format version.
3190+
set(CMAKE_IMPORT_FILE_VERSION 1)
3191+
3192+
# Protect against multiple inclusion, which would fail when already imported targets are added once more.
3193+
set(_cmake_targets_defined "")
3194+
set(_cmake_targets_not_defined "")
3195+
set(_cmake_expected_targets "")
3196+
foreach(_cmake_expected_target IN ITEMS CURL::libcurl)
3197+
list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
3198+
if(TARGET "${_cmake_expected_target}")
3199+
list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
3200+
else()
3201+
list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
3202+
endif()
3203+
endforeach()
3204+
unset(_cmake_expected_target)
3205+
if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
3206+
unset(_cmake_targets_defined)
3207+
unset(_cmake_targets_not_defined)
3208+
unset(_cmake_expected_targets)
3209+
unset(CMAKE_IMPORT_FILE_VERSION)
3210+
cmake_policy(POP)
3211+
return()
3212+
endif()
3213+
if(NOT _cmake_targets_defined STREQUAL "")
3214+
string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
3215+
string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
3216+
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
3217+
endif()
3218+
unset(_cmake_targets_defined)
3219+
unset(_cmake_targets_not_defined)
3220+
unset(_cmake_expected_targets)
3221+
3222+
3223+
# Create imported target CURL::libcurl
3224+
add_library(CURL::libcurl SHARED IMPORTED)
3225+
3226+
set_target_properties(CURL::libcurl PROPERTIES
3227+
INTERFACE_INCLUDE_DIRECTORIES "/home/sam/Code/Distributed-Compute-Coin/dcc_client/out-linux/_deps/curl-src/include"
3228+
INTERFACE_LINK_LIBRARIES "dl;OpenSSL::SSL;OpenSSL::Crypto;ZLIB::ZLIB"
3229+
)
3230+
3231+
# Import target "CURL::libcurl" for configuration "Release"
3232+
set_property(TARGET CURL::libcurl APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
3233+
set_target_properties(CURL::libcurl PROPERTIES
3234+
IMPORTED_LOCATION_RELEASE "/home/sam/Code/Distributed-Compute-Coin/dcc_client/out-linux/_deps/curl-build/lib/libcurl.so"
3235+
IMPORTED_SONAME_RELEASE "libcurl.so"
3236+
)
3237+
3238+
# This file does not depend on other imported targets which have
3239+
# been exported from the same project but in a separate export set.
3240+
3241+
# Commands beyond this point should not need to know the version.
3242+
set(CMAKE_IMPORT_FILE_VERSION)
3243+
cmake_policy(POP)
3244+
# Generated by CMake
3245+
3246+
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
3247+
message(FATAL_ERROR "CMake >= 2.8.0 required")
3248+
endif()
3249+
if(CMAKE_VERSION VERSION_LESS "2.8.3")
3250+
message(FATAL_ERROR "CMake >= 2.8.3 required")
3251+
endif()
3252+
cmake_policy(PUSH)
3253+
cmake_policy(VERSION 2.8.3...3.23)
3254+
#----------------------------------------------------------------
3255+
# Generated CMake target import file.
3256+
#----------------------------------------------------------------
3257+
3258+
# Commands may need to know the format version.
3259+
set(CMAKE_IMPORT_FILE_VERSION 1)
3260+
3261+
# Protect against multiple inclusion, which would fail when already imported targets are added once more.
3262+
set(_cmake_targets_defined "")
3263+
set(_cmake_targets_not_defined "")
3264+
set(_cmake_expected_targets "")
3265+
foreach(_cmake_expected_target IN ITEMS CURL::libcurl)
3266+
list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
3267+
if(TARGET "${_cmake_expected_target}")
3268+
list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
3269+
else()
3270+
list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
3271+
endif()
3272+
endforeach()
3273+
unset(_cmake_expected_target)
3274+
if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
3275+
unset(_cmake_targets_defined)
3276+
unset(_cmake_targets_not_defined)
3277+
unset(_cmake_expected_targets)
3278+
unset(CMAKE_IMPORT_FILE_VERSION)
3279+
cmake_policy(POP)
3280+
return()
3281+
endif()
3282+
if(NOT _cmake_targets_defined STREQUAL "")
3283+
string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
3284+
string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
3285+
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
3286+
endif()
3287+
unset(_cmake_targets_defined)
3288+
unset(_cmake_targets_not_defined)
3289+
unset(_cmake_expected_targets)
3290+
3291+
31543292
# Create imported target CURL::libcurl
31553293
add_library(CURL::libcurl SHARED IMPORTED)
31563294

0 commit comments

Comments
 (0)