Merge branch 'master' of https://github.com/unxed/far2l

Author: unxed

.cirrus.yml

@@ -1,8 +1,8 @@
 freebsd_test_task:
     freebsd_instance:
-        image_family: freebsd-14-0
+        image_family: freebsd-14-2
     name: cirrus/FreeBSD
-    install_script: pkg install -y cmake git pkgconf bash wx32-gtk3 libssh openssl libnfs neon libarchive samba416 uchardet libxml2
+    install_script: pkg install -y cmake git pkgconf bash wx32-gtk3 libssh openssl libnfs neon libarchive samba416 uchardet libxml2 aws-sdk-cpp
     script: mkdir build && cd build && cmake .. && make -j $(getconf _NPROCESSORS_ONLN) && ./install/far2l --help
 
 macos_test_task:

.github/workflows/build.yml

@@ -69,7 +69,6 @@ jobs:
          libx11-dev libxi-dev
          libssl-dev libsmbclient-dev libnfs-dev libneon27-dev libssh-dev
          libarchive-dev
-         libarchive-dev
          python3-dev python3-cffi
  
       - name: Create Build Environment

.travis.yml

@@ -5,6 +5,10 @@ matrix:
   include:
     - os: osx
       osx_image: xcode12
+      before_install:
+        - git clone https://github.com/microsoft/vcpkg.git
+        - ./vcpkg/bootstrap-vcpkg.sh
+        - ./vcpkg/vcpkg install aws-sdk-cpp
     - os: linux
       dist: xenial
       sudo: required
@@ -26,8 +30,12 @@ matrix:
             - libarchive-dev
             - ninja-build
       env: CXX=g++-5
+      before_install:
+        - git clone https://github.com/microsoft/vcpkg.git
+        - ./vcpkg/bootstrap-vcpkg.sh
+        - ./vcpkg/vcpkg install aws-sdk-cpp
       install:
-            - if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
+        - if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
     - os: linux
       dist: xenial
       sudo: required
@@ -49,8 +57,12 @@ matrix:
             - libarchive-dev
             - ninja-build
       env: CXX=g++-6
+      before_install:
+        - git clone https://github.com/microsoft/vcpkg.git
+        - ./vcpkg/bootstrap-vcpkg.sh
+        - ./vcpkg/vcpkg install aws-sdk-cpp
       install:
-            - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
+        - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
     - os: linux
       dist: xenial
       sudo: required
@@ -73,8 +85,12 @@ matrix:
             - libarchive-dev
             - ninja-build
       env: CXX=clang++-3.6
+      before_install:
+        - git clone https://github.com/microsoft/vcpkg.git
+        - ./vcpkg/bootstrap-vcpkg.sh
+        - ./vcpkg/vcpkg install aws-sdk-cpp
       install:
-            - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.6" CC="clang-3.6"; fi
+        - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.6" CC="clang-3.6"; fi
     - os: linux
       dist: xenial
       sudo: required
@@ -98,8 +114,12 @@ matrix:
             - zlib1g-dev
             - ninja-build
       env: CXX=clang++-3.7
+      before_install:
+        - git clone https://github.com/microsoft/vcpkg.git
+        - ./vcpkg/bootstrap-vcpkg.sh
+        - ./vcpkg/vcpkg install aws-sdk-cpp
       install:
-            - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+        - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python@2 ; fi
@@ -112,5 +132,6 @@ before_install:
 script:
   - mkdir build
   - cd build
-  - cmake -G Ninja .. && ninja -v
+  - cmake -G Ninja .. -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake
+  - ninja -v
   - cd install && zip -r ../far2l-${TRAVIS_COMMIT}.zip * && cd -

Brewfile

@@ -10,3 +10,5 @@ brew "uchardet"
 brew "wget"
 brew "wxwidgets"
 brew "libxml2"
+brew "libxml2"
+brew "aws-sdk-cpp"

CMakeLists.txt

@@ -75,7 +75,7 @@ set(VERSION_PATCH "${VERSION_PATCH}-beta")
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 if(NOT CMAKE_BUILD_TYPE)
@@ -141,7 +141,7 @@ endif()
 
 if(${CMAKE_VERSION} VERSION_LESS "3.1.0")
     message("Please consider to switch to newer CMake")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 endif()
 
 if("${ICU_MODE}" STREQUAL "runtime")
@@ -454,6 +454,13 @@ if (NOT DEFINED NETROCKS OR NETROCKS)
         message(WARNING "${ColorRed}libneon not found, NetRocks will not have WebDav protocol support. Install libneon*-dev if you want WebDav protocol available in NetRocks.${ColorNormal}")
     endif(LIBNEON_FOUND)
 
+    find_package(AWSSDK QUIET COMPONENTS s3)
+    if(AWSSDK_FOUND)
+        message(STATUS "aws-sdk-cpp found -> enjoy AWS s3 support in NetRocks")
+    else()
+        message(WARNING "${ColorRed}aws-sdk-cpp not found, NetRocks will not have AWS S3 protocol support. Install aws-sdk-cpp if you want AWS S3 protocol available in NetRocks.${ColorNormal}")
+    endif(AWSSDK_FOUND)
+
     add_subdirectory (NetRocks)
 else()
     message(STATUS "${ColorRed}NETROCKS plugin disabled due to NETROCKS=${NETROCKS}${ColorNormal}")

HACKING.md

@@ -89,6 +89,7 @@ far2l uses this to resolve symlink destination when user selects plugin's item t
 * `DM_SETTEXTPTRSILENT`
 * `ECTL_ADDTRUECOLOR` - applies coloring to editor like ECTL_ADDCOLOR does but allows to specify 24 RGB color using EditorTrueColor structure.
 * `ECTL_GETTRUECOLOR` - retrieves coloring of editor like ECTL_GETCOLOR does but gets 24 RGB color using EditorTrueColor structure.
+* `DN_KEY` - Param2 retrives bitmasked state of the keys KEY_SHIFT, KEY_ALT and KEY_CTRL when Param1 equals to 0
 
 Note that all true-color capable messages extend but don't replace 'base' 16 palette colors. This is done intentionally as far2l may run in terminal that doesn't support true color palette, and in such case 24bit colors will be ignored and base palette attributes will be used instead.
 

NetRocks/CMakeLists.txt

@@ -23,6 +23,7 @@ src/UI/Settings/ExtraSiteSettings.cpp
 src/UI/Settings/ProxySettings.cpp
 src/UI/Settings/ConfigureProtocolSFTPSCP.cpp
 src/UI/Settings/ConfigureProtocolFTP.cpp
+src/UI/Settings/ConfigureProtocolAWS.cpp
 src/UI/Settings/ConfigureProtocolSMB.cpp
 src/UI/Settings/ConfigureProtocolNFS.cpp
 src/UI/Settings/ConfigureProtocolWebDAV.cpp
@@ -177,6 +178,26 @@ if (LIBNEON_FOUND AND ((NOT DEFINED NR_WEBDAV) OR NR_WEBDAV))
         SUFFIX ".broker")
 endif ()
 
+if (AWSSDK_FOUND AND ((NOT DEFINED NR_AWS) OR NR_AWS))
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_AWS")
+    add_executable (NetRocks-AWS
+        ${PROTOCOL_SOURCES}
+        src/Protocol/AWS/AWSFile.cpp
+        src/Protocol/AWS/AWSFileWriter.cpp
+        src/Protocol/AWS/AWSFileReader.cpp
+        src/Protocol/AWS/S3Repository.cpp
+        src/Protocol/AWS/ProtocolAWS.cpp
+    )
+    target_include_directories(NetRocks-AWS PRIVATE src ${AWSSDK_INCLUDE_DIR})
+    target_link_libraries(NetRocks-AWS utils ${AWSSDK_LINK_LIBRARIES})
+
+    set_target_properties(NetRocks-AWS
+        PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY "${INSTALL_DIR}/Plugins/NetRocks/plug"
+        PREFIX ""
+        SUFFIX ".broker")
+endif ()
+
     add_executable (NetRocks-FTP
         ${PROTOCOL_SOURCES}
         src/Protocol/FTP/ProtocolFTP.cpp

NetRocks/configs/plug/bel.lng

@@ -316,3 +316,13 @@
 "Не выкарыстоўваць праксіфікатар"
 "Выкарыстоўваны &праксіфікатар:"
 "&Рэдагаваць канфігурацыю праксіфікатара"
+
+"Ховішча AWS S3"
+"Карыстальніцкі агент"
+"Рэгіён"
+"Выкарыстоўваць праксы"
+"Хост праксы"
+"Порт праксы"
+"Пракса з аўтэнтыфікацыяй"
+"Імя карыстальніка праксы"
+"Пароль праксы"

NetRocks/configs/plug/eng.lng

@@ -316,3 +316,13 @@
 "Not using proxifier"
 "&Proxifier kind to use:"
 "&Edit proxifier configuration"
+
+"AWS S3 Storage"
+"User agent"
+"Region"
+"Use proxy"
+"Proxy host"
+"Proxy port"
+"Auth proxy"
+"Proxy username"
+"Proxy password"

NetRocks/configs/plug/rus.lng

@@ -316,3 +316,13 @@
 "Не использовать проксификатор"
 "Используемый &проксификатор:"
 "&Редактировать конфигурацию проксификатора"
+
+"Хранилище AWS S3"
+"Пользовательский агент"
+"Регион"
+"Использовать прокси"
+"Хост прокси"
+"Порт прокси"
+"Прокси с аутентификацией"
+"Имя пользователя прокси"
+"Пароль прокси"