.github/workflows/cd.yml

@@ -1,159 +0,0 @@
-name: ContinuousDelivery
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-env:
-  BUILD_TYPE: RelWidthDebInfo
-  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
-
-jobs:
-  linux-ubuntu:
-    timeout-minutes: 10
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-
-    - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
-
-    - name: Test
-      working-directory: ${{github.workspace}}/build
-      run: ctest -C ${{env.BUILD_TYPE}}
-
-    - name: Determine tag name
-      id: tag
-      shell: bash
-      # taken from llama.cpp
-      run: |
-        SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-        if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-          echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        else
-          SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-          echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Compress artifacts
-      shell: bash
-      run: |
-        tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64.tar.gz -C ${{github.workspace}}/build/bin/ .
-
-    - uses: actions/upload-artifact@v4
-      with:
-        # TODO: simpler name?
-        name: ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64
-        # TODO: do propper packing
-        path: |
-          ${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64.tar.gz
-
-
-  windows:
-    timeout-minutes: 15
-
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v4
-
-    # setup vs env
-    - uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: amd64
-
-    - name: Configure CMake
-      run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
-
-    - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-
-    - name: Determine tag name
-      id: tag
-      shell: bash
-      # taken from llama.cpp
-      run: |
-        SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-        if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-          echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        else
-          SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-          echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Compress artifacts
-      shell: powershell
-      run: |
-        Compress-Archive -Path ${{github.workspace}}/build/bin/* -Destination ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-msvc-x86_64.zip
-
-    - uses: actions/upload-artifact@v4
-      with:
-        # TODO: simpler name?
-        name: ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-msvc-x86_64
-        # TODO: do propper packing
-        path: |
-          ${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-msvc-x86_64.zip
-
-  release:
-    if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) }}
-
-    runs-on: ubuntu-latest
-
-    needs:
-      - linux-ubuntu
-      - windows
-
-    permissions:
-      contents: write
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Determine tag name
-      id: tag
-      shell: bash
-      # taken from llama.cpp
-      run: |
-        SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-        if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-          echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        else
-          SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-          echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Download artifacts
-      id: download-artifact
-      uses: actions/download-artifact@v4
-      with:
-        path: ./artifacts/
-
-    - name: Create release
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        tag: ${{ steps.tag.outputs.name }}
-      shell: bash
-      run: |
-        gh release create "$tag" \
-            --repo="$GITHUB_REPOSITORY" \
-            --title="nightly ${tag#v}" \
-            --notes="nightly build" \
-            --prerelease
-
-    - name: Upload artifacts
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        tag: ${{ steps.tag.outputs.name }}
-      shell: bash
-      run: |
-        ls -laR ./artifacts
-        gh release upload "$tag" ./artifacts/*/* \
-            --repo="$GITHUB_REPOSITORY"
-

plugins/plugin_factorio.cpp

@@ -40,7 +40,7 @@ SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api)
 		// static store, could be anywhere tho
 		// construct with fetched dependencies
 		g_flp = std::make_unique<FactorioLogParser>(*conf);
-		g_f = std::make_unique<Factorio>(*conf, *cr, *rmm, *g_flp);
+		g_f = std::make_unique<Factorio>(*cr, *rmm, *g_flp);
 
 		// register types
 		PLUG_PROVIDE_INSTANCE(FactorioLogParser, plugin_name, g_flp.get());

src/factorio.cpp

@@ -1,41 +1,14 @@
 #include "./factorio.hpp"
-
+#include "factorio_log_parser.hpp"
-#include <solanaceae/util/config_model.hpp>
-#include <solanaceae/util/utils.hpp>
 
 #include <solanaceae/message3/components.hpp>
 #include <solanaceae/contact/components.hpp>
 
-Factorio::Factorio(ConfigModelI& conf, Contact3Registry& cr, RegistryMessageModel& rmm, FactorioLogParser& flp) :
+Factorio::Factorio(Contact3Registry& cr, RegistryMessageModel& rmm, FactorioLogParser& flp) :
 	_cr(cr),
 	_rmm(rmm),
 	_flp(flp)
 {
-	// config
-	for (const auto&& [contact_id, enabled] : conf.entries_bool("Factorio", "link_to_contact")) {
-		//std::cout << "config id:" << contact_id << " e:" << enabled << "\n";
-
-		const auto id_vec = hex2bin(contact_id);
-
-		// search
-		Contact3Handle h;
-		auto view = _cr.view<Contact::Components::ID>();
-		for (const auto c : view) {
-			if (view.get<Contact::Components::ID>(c).data == id_vec) {
-				h = Contact3Handle{_cr, c};
-				std::cout << "Factorio: found contact for link.\n";
-				break;
-			}
-		}
-		if (!static_cast<bool>(h)) {
-			// not found, create thin contact with just id
-			h = {_cr, _cr.create()};
-			h.emplace<Contact::Components::ID>(id_vec);
-			std::cout << "Factorio: contact not found, created thin contact from ID. (" << contact_id << ")\n";
-		}
-		_linked_contacts.push_back(h);
-	}
-
 	_rmm.subscribe(this, RegistryMessageModel_Event::message_construct);
 
 	_flp.subscribe(this, FactorioLogParser_Event::join);
@@ -56,42 +29,42 @@ bool Factorio::onEvent(const Message::Events::MessageConstruct& e) {
 }
 
 bool Factorio::onEvent(const FactorioLog::Events::Join& e) {
-	std::cout << "Factorio: event join " << e.player_name << "\n";
+	std::cout << "F: event join " << e.player_name << "\n";
 	return false;
 }
 
 bool Factorio::onEvent(const FactorioLog::Events::Leave& e) {
-	std::cout << "Factorio: event leave " << e.player_name << " " << e.reason << "\n";
+	std::cout << "F: event leave " << e.player_name << " " << e.reason << "\n";
 	return false;
 }
 
 bool Factorio::onEvent(const FactorioLog::Events::Chat& e) {
-	std::cout << "Factorio: event chat " << e.player_name << ": " << e.message << "\n";
+	std::cout << "F: event chat " << e.player_name << ": " << e.message << "\n";
 	return false;
 }
 
 bool Factorio::onEvent(const FactorioLog::Events::Died& e) {
-	std::cout << "Factorio: event died " << e.player_name << ": " << e.reason << "\n";
+	std::cout << "F: event died " << e.player_name << ": " << e.reason << "\n";
 	return false;
 }
 
 bool Factorio::onEvent(const FactorioLog::Events::Evolution& e) {
-	std::cout << "Factorio: event evolution " << e.evo << "\n";
+	std::cout << "F: event evolution " << e.evo << "\n";
 	return false;
 }
 
 bool Factorio::onEvent(const FactorioLog::Events::ResearchStarted& e) {
-	std::cout << "Factorio: event research started " << e.name << "\n";
+	std::cout << "F: event research started " << e.name << "\n";
 	return false;
 }
 
 bool Factorio::onEvent(const FactorioLog::Events::ResearchFinished& e) {
-	std::cout << "Factorio: event research finished " << e.name << "\n";
+	std::cout << "F: event research finished " << e.name << "\n";
 	return false;
 }
 
 bool Factorio::onEvent(const FactorioLog::Events::ResearchCancelled& e) {
-	std::cout << "Factorio: event research cancelled " << e.name << "\n";
+	std::cout << "F: event research cancelled " << e.name << "\n";
 	return false;
 }
 

src/factorio.hpp

@@ -4,20 +4,13 @@
 
 #include "./factorio_log_parser.hpp"
 
-#include <vector>
-
-// fwd
-struct ConfigModelI;
-
 class Factorio : public RegistryMessageModelEventI, public FactorioLogParserEventI {
 	Contact3Registry& _cr;
 	RegistryMessageModel& _rmm;
 	FactorioLogParser& _flp;
 
-	std::vector<Contact3Handle> _linked_contacts;
-
 	public:
-		Factorio(ConfigModelI& conf, Contact3Registry& cr, RegistryMessageModel& rmm, FactorioLogParser& flp);
+		Factorio(Contact3Registry& cr, RegistryMessageModel& rmm, FactorioLogParser& flp);
 		virtual ~Factorio(void);
 
 	protected: // rmm