[wesnoth-commits] [wesnoth/wesnoth] eb0457: Split addons meta from the server config

Artem Khrapov noreply at github.com
Thu Oct 15 13:39:42 UTC 2020


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: eb045704303ead83d6dd45c42d05f719014a2ed0
      https://github.com/wesnoth/wesnoth/commit/eb045704303ead83d6dd45c42d05f719014a2ed0
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/server.cpp
    M src/server/campaignd/server.hpp

  Log Message:
  -----------
  Split addons meta from the server config

Redid campaignd's storage architecture so add-on metadata is stored separate from the server configuration (and not duplicated in the individual full packs).

The update packs has not been implemented yet.

Tested on my pet server.


  Commit: 2cbbafeae6fbc4ac203e01d7fd03f6b96d8f7dd2
      https://github.com/wesnoth/wesnoth/commit/2cbbafeae6fbc4ac203e01d7fd03f6b96d8f7dd2
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/server.cpp
    M src/server/campaignd/server.hpp

  Log Message:
  -----------
  Renamed campaign to addon for convenience


  Commit: d1f8d8da2663ee9fa90919732278ef9d626d3804
      https://github.com/wesnoth/wesnoth/commit/d1f8d8da2663ee9fa90919732278ef9d626d3804
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/addon_utils.cpp
    M src/server/campaignd/addon_utils.hpp
    M src/server/campaignd/server.cpp
    M src/server/campaignd/server.hpp

  Log Message:
  -----------
  The concept of update packs

Added the basic machinery of update packs creation and their lifespan management. Also, fixed the naming of private variables and made invalid_ config actually invalid.
Note: the thing is not finished yet!


  Commit: 3bc4fe9eca6d2855c85ca9da86e018df5669c334
      https://github.com/wesnoth/wesnoth/commit/3bc4fe9eca6d2855c85ca9da86e018df5669c334
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Fixed addon updatepack generation

Fixed some mistakes and runtime WML errors. Also tested the changes on my local server, the updatepack generation and naming worked as planned.


  Commit: 33fd51bd42bb747a862571068afe9fa401e86d9d
      https://github.com/wesnoth/wesnoth/commit/33fd51bd42bb747a862571068afe9fa401e86d9d
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/config.hpp
    M src/server/campaignd/server.cpp
    M src/server/campaignd/server.hpp

  Log Message:
  -----------
  Made invalid config invalid, fixed prev. version insertion

That involves enabling an access to the invalid config variable in the config class.


  Commit: 7a47bcffc6b8109f87bb92ed186de9c9bd4f6ac5
      https://github.com/wesnoth/wesnoth/commit/7a47bcffc6b8109f87bb92ed186de9c9bd4f6ac5
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Convert the format of legacy addons when loading


  Commit: b0c33d358e072c88b3ebd7c86dba0c8ebb5318a0
      https://github.com/wesnoth/wesnoth/commit/b0c33d358e072c88b3ebd7c86dba0c8ebb5318a0
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/addon/client.cpp
    M src/server/campaignd/addon_utils.cpp
    M src/server/campaignd/addon_utils.hpp
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Incremental addon updates (server side)


  Commit: 5a77701ebe03fb4bab7bb768e817bbeb2f30076b
      https://github.com/wesnoth/wesnoth/commit/5a77701ebe03fb4bab7bb768e817bbeb2f30076b
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/addon/client.cpp
    M src/addon/manager.cpp
    M src/addon/manager.hpp

  Log Message:
  -----------
  Incremental addon updates (client side)


  Commit: 43817eccf00c9fe7382909ccbe7b3bedd4ab41ec
      https://github.com/wesnoth/wesnoth/commit/43817eccf00c9fe7382909ccbe7b3bedd4ab41ec
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/addon_utils.cpp
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  New directories fix and a valid loop breaker


  Commit: e75b8623e367d393b0750636c60e609ea1af5ec1
      https://github.com/wesnoth/wesnoth/commit/e75b8623e367d393b0750636c60e609ea1af5ec1
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Removed an unnecessary check


  Commit: 7f2385b36f9da84b547bc6fa97567a6832689029
      https://github.com/wesnoth/wesnoth/commit/7f2385b36f9da84b547bc6fa97567a6832689029
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/addon/client.cpp
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Shutdown the server in potential data loss situations, iteration cleanup

Changes suggested by @shikadiqueen.


  Commit: 715594a8d1293745697b65b472809968e8cd7336
      https://github.com/wesnoth/wesnoth/commit/715594a8d1293745697b65b472809968e8cd7336
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Added the update pack size check

If size of the pack sequence gets larger than the full pack, it's better to send the full pack instead.


  Commit: 0f3af615dbc38b9a13baa3bef114a1e03f3f51ba
      https://github.com/wesnoth/wesnoth/commit/0f3af615dbc38b9a13baa3bef114a1e03f3f51ba
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Improved the wording in server messages

Switched to a more assertive style and paraphrased the message about missing addon versions.
Suggested by @shikadiqueen, approved by @Vultraz.


  Commit: 74fda8e1037f4029fcebd5fff52498f5aaca7c8d
      https://github.com/wesnoth/wesnoth/commit/74fda8e1037f4029fcebd5fff52498f5aaca7c8d
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/addon/validation.cpp
    M src/addon/validation.hpp
    M src/server/campaignd/addon_utils.cpp
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Make the addons server generate hashlists on upload


  Commit: c146034bd12497f4b44bd4570ae789cd5d0bf11a
      https://github.com/wesnoth/wesnoth/commit/c146034bd12497f4b44bd4570ae789cd5d0bf11a
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/server.cpp
    M src/server/campaignd/server.hpp

  Log Message:
  -----------
  Added a request for addon hashes


  Commit: a0cca4ba54482ec2b1bc8fd55287cbedf7455fef
      https://github.com/wesnoth/wesnoth/commit/a0cca4ba54482ec2b1bc8fd55287cbedf7455fef
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/addon/client.cpp
    M src/addon/client.hpp
    M src/addon/validation.cpp
    M src/addon/validation.hpp
    M src/gui/dialogs/addon/manager.cpp
    M src/server/campaignd/addon_utils.cpp
    M src/server/campaignd/addon_utils.hpp
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Incremental addon uploads (client side)


  Commit: 74e2e3ecbf127861562e92cd338d70547e989755
      https://github.com/wesnoth/wesnoth/commit/74e2e3ecbf127861562e92cd338d70547e989755
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/addon/client.cpp
    M src/addon/validation.cpp
    M src/server/campaignd/addon_utils.cpp
    M src/server/campaignd/addon_utils.hpp
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Incremental addon uploads (server side)


  Commit: 2c132a8949c61bf7372b8d309d9088eea11ed07c
      https://github.com/wesnoth/wesnoth/commit/2c132a8949c61bf7372b8d309d9088eea11ed07c
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Addon update uploading fixes

Fixed the server crash when data is not specified because the assignation of an invalid value to a config causes an exception. Also, added the missing removelist/addlist tags to update pack file writing and simplified some code.


  Commit: 6c055a96dcf813447eb6a288da0471740b158132
      https://github.com/wesnoth/wesnoth/commit/6c055a96dcf813447eb6a288da0471740b158132
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/addon/validation.cpp

  Log Message:
  -----------
  Remove the accomplished TODO tag


  Commit: 6df3f920da0b66350522171e4782b61696d40335
      https://github.com/wesnoth/wesnoth/commit/6df3f920da0b66350522171e4782b61696d40335
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/addon/client.cpp
    M src/addon/validation.cpp
    M src/addon/validation.hpp

  Log Message:
  -----------
  Remove the unnecessary function modifiers


  Commit: 7f07f28862713c9acf38058964399a1aebc0f9d2
      https://github.com/wesnoth/wesnoth/commit/7f07f28862713c9acf38058964399a1aebc0f9d2
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Fixed wrong version selection by the server

Empty version string had been interpreted as the 'zeroth' version instead of the latest, so an additional check was implemented. Also, the 'upper_bound' pointed at the next element after the latest, so it had to be shifted back by one.


  Commit: bc0aab256c3638669b19f716818667c58ef171ee
      https://github.com/wesnoth/wesnoth/commit/bc0aab256c3638669b19f716818667c58ef171ee
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/addon_utils.cpp

  Log Message:
  -----------
  Prevent removelist from deleting a fileless dir if it contains subdirs

The presence of files in these subdirs is checked earlier by the program.


  Commit: b0dfad8bef3e8588663fa13cc6367ba437cb09ab
      https://github.com/wesnoth/wesnoth/commit/b0dfad8bef3e8588663fa13cc6367ba437cb09ab
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/addon/validation.cpp

  Log Message:
  -----------
  Hashlist comparison fix


  Commit: d09e54c18af2544a842f6c195bae62c792c5ee41
      https://github.com/wesnoth/wesnoth/commit/d09e54c18af2544a842f6c195bae62c792c5ee41
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/addon/validation.cpp

  Log Message:
  -----------
  Don't list unchanged directories in an updatepack/uploadpack

This reduces the file size and makes it easier to be debugged.


  Commit: e131720271ae3d25ff2315661763fd973c026389
      https://github.com/wesnoth/wesnoth/commit/e131720271ae3d25ff2315661763fd973c026389
  Author: Artem Khrapov <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/addon/manager.cpp

  Log Message:
  -----------
  Fixed wrong files being deleted by the client

It tried to delete files in the parent directory instead of the target one.


  Commit: 38dc17c731520dd2b6917e29813289d2f965bda7
      https://github.com/wesnoth/wesnoth/commit/38dc17c731520dd2b6917e29813289d2f965bda7
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Split empty and not found requested version processing


  Commit: f2ac72a13fe8f044cb4fb50a17ed8c85c05c4b78
      https://github.com/wesnoth/wesnoth/commit/f2ac72a13fe8f044cb4fb50a17ed8c85c05c4b78
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/addon/manager.cpp

  Log Message:
  -----------
  Added a check for non-existent directories

Fixes the occasion when the client tries to get the size of a directory with missing parents.


  Commit: aa6daed0de3f5a06f6e8100813cbde1e88c8bb4f
      https://github.com/wesnoth/wesnoth/commit/aa6daed0de3f5a06f6e8100813cbde1e88c8bb4f
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/addon_utils.cpp
    M src/server/campaignd/addon_utils.hpp

  Log Message:
  -----------
  Removed the ref qualifier from the version map


  Commit: 9b446b2eff61373c8f8702b4244ee344674cc0de
      https://github.com/wesnoth/wesnoth/commit/9b446b2eff61373c8f8702b4244ee344674cc0de
  Author: kabachuha <artemkhrapov2001 at yandex.ru>
  Date:   2020-10-15 (Thu, 15 Oct 2020)

  Changed paths:
    M src/server/campaignd/server.cpp

  Log Message:
  -----------
  Removed the initial '/' from updatepack and version filenames


Compare: https://github.com/wesnoth/wesnoth/compare/ab5244e906c9...9b446b2eff61



More information about the Commits mailing list