FreeDV
/
FreeDATA
mirror of https://github.com/DJ2LS/FreeDATA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ls-logging

pull/1007/head
DJ2LS 2025-09-21 13:53:20 +02:00 committed by GitHub
parent a08ec1addd 82db99f6b4
commit e734cf6dcd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 58 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build_appimage_bundle.yml vendored
View File

@ -9,15 +9,15 @@ jobs:
- name: Check out repository
uses: actions/checkout@v5
- name: Set up Python 3.11
- name: Set up Python 3.13
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.13"
- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v4
with:
node-version: 22
node-version: 24
- name: Electron Builder
working-directory: freedata_gui

18
.github/workflows/build_nsis_bundle.yml vendored
View File

@ -9,15 +9,18 @@ jobs:
- name: Check out repository
uses: actions/checkout@v5
- name: Set up Python 3.11
- name: Set up Python 3.13
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.13"
- name: Install NSIS via choco
run: choco install nsis
- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v4
with:
node-version: 22
node-version: 24
- name: Vue Builder
working-directory: freedata_gui
@ -39,7 +42,7 @@ jobs:
fileName: "hamlib-w64-*.zip"
# latest: true
extract: true
tag: '4.5.5'
tag: '4.6.5'
out-file-path: "freedata_server/lib/hamlib"
- name: Move Hamlib Files
@ -67,8 +70,11 @@ jobs:
--include-data-files=lib/hamlib/bin/*.exe=lib/hamlib/bin/ `
--include-data-files=lib/hamlib/bin/*.dll=lib/hamlib/bin/ `
--include-data-files=config.ini.example=config.ini `
--nofollow-import-to=sqlalchemy.dialects.mysql,sqlalchemy.dialects.mariadb,sqlalchemy.dialects.postgresql,sqlalchemy.dialects.oracle,sqlalchemy.dialects.mssql `
--include-package=sqlalchemy.dialects.sqlite `
--standalone server.py `
--output-filename=freedata-server
--output-filename=freedata-server `
--low-memory
shell: pwsh
@ -76,7 +82,7 @@ jobs:
run: ls -R
- name: Create installer
uses: joncloud/makensis-action@v4.1
uses: joncloud/makensis-action@v5.0
with:
script-file: "freedata-nsis-config.nsi"
arguments: '/V3'

12
.github/workflows/build_server.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
include:
- os: ubuntu-24.04
zip_name: freedata-server_ubuntu
generator: Unix Makefiles
#generator: Unix Makefiles
modem_binary_name: freedata_server
#- os: macos-latest
@ -22,7 +22,7 @@ jobs:
- os: windows-latest
zip_name: freedata-server_windows
generator: Visual Studio 16 2019
#generator: Visual Studio 17 2022
modem_binary_name: freedata_server.exe
steps:
@ -34,7 +34,7 @@ jobs:
- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v4
with:
node-version: 22
node-version: 24
- name: Vue Builder
working-directory: freedata_gui
@ -42,10 +42,10 @@ jobs:
npm i
npm run build
- name: Set up Python 3.11
- name: Set up Python 3.13
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.13"
- name: Install Linux dependencies
if: ${{startsWith(matrix.os, 'ubuntu')}}
@ -74,7 +74,7 @@ jobs:
- name: Build binaries
working-directory: freedata_server
run: |
python3 -m nuitka --remove-output --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-dir=../freedata_gui/dist=gui --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server
python3 -m nuitka --remove-output --nofollow-import-to=sqlalchemy.dialects.mysql,sqlalchemy.dialects.mariadb,sqlalchemy.dialects.postgresql,sqlalchemy.dialects.oracle,sqlalchemy.dialects.mssql --include-package=sqlalchemy.dialects.sqlite --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-dir=../freedata_gui/dist=gui --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server
#- name: Download Portaudio binaries Linux macOS
# if: ${{!startsWith(matrix.os, 'windows')}}

1
.github/workflows/gui_tests.yml vendored
View File

@ -20,6 +20,7 @@ jobs:
#- node-version: "18" # EOL
- node-version: "20"
- node-version: "22"
- node-version: "24"
steps:
- uses: actions/checkout@v5

2
.github/workflows/pip_package.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v4
with:
node-version: 22
node-version: 24
- name: Install Linux dependencies
run: |

46
freedata_gui/package.json
View File

@ -26,36 +26,36 @@
"homepage": "https://freedata.app",
"dependencies": {
"@popperjs/core": "^2.11.8",
"bootstrap": "^5.3.7",
"bootstrap-icons": "^1.11.3",
"bootstrap-vue-next": "^0.30.0",
"chart.js": "^4.4.3",
"chartjs-plugin-annotation": "^3.0.1",
"core-js": "^3.8.3",
"bootstrap": "^5.3.8",
"bootstrap-icons": "^1.13.1",
"bootstrap-vue-next": "^0.40.4",
"chart.js": "^4.5.0",
"chartjs-plugin-annotation": "^3.1.0",
"core-js": "^3.45.1",
"d3": "^7.9.0",
"dompurify": "^3.1.6",
"dompurify": "^3.2.7",
"gettext-parser": "^8.0.0",
"gridstack": "^12.1.1",
"i18next": "^25.0.2",
"i18next-vue": "^5.2.0",
"gridstack": "^12.3.3",
"i18next": "^25.5.2",
"i18next-vue": "^5.3.0",
"js-image-compressor": "^2.0.0",
"marked": "^16.0.0",
"pinia": "^3.0.1",
"marked": "^16.3.0",
"pinia": "^3.0.3",
"qth-locator": "^2.1.0",
"topojson-client": "^3.1.0",
"uuid": "^11.0.2",
"vue": "^3.2.13",
"vue-chartjs": "^5.3.1",
"vuemoji-picker": "^0.3.1"
"uuid": "^13.0.0",
"vue": "^3.5.21",
"vue-chartjs": "^5.3.2",
"vuemoji-picker": "^0.3.2"
},
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/eslint-parser": "^7.25.1",
"@eslint/js": "^9.10.0",
"@vue/cli-service": "~5.0.8",
"eslint": "^9.0.0",
"eslint-plugin-vue": "^10.2.0",
"globals": "^16.0.0"
"@babel/core": "^7.28.4",
"@babel/eslint-parser": "^7.28.4",
"@eslint/js": "^9.35.0",
"@vue/cli-service": "~5.0.9",
"eslint": "^9.35.0",
"eslint-plugin-vue": "^10.4.0",
"globals": "^16.4.0"
},
"browserslist": [
"> 1%",

2
freedata_server/message_p2p.py
View File

@ -2,9 +2,7 @@ from datetime import datetime, timezone
import api_validations
import base64
import json
from message_system_db_manager import DatabaseManager
from message_system_db_messages import DatabaseManagerMessages
#import command_message_send
def message_received(ctx, data, statistics):

1
freedata_server/message_system_db_attachments.py
View File

@ -2,7 +2,6 @@ from message_system_db_manager import DatabaseManager
from message_system_db_model import MessageAttachment, Attachment, P2PMessage
import json
import hashlib
import os
class DatabaseManagerAttachments(DatabaseManager):
"""Manages database operations for message attachments.

6
freedata_server/message_system_db_beacon.py
View File

@ -1,10 +1,6 @@
from message_system_db_manager import DatabaseManager
from sqlalchemy import create_engine
from sqlalchemy.orm import scoped_session, sessionmaker
from threading import local
from message_system_db_model import Base, Beacon, Station, Status, Attachment, P2PMessage
from message_system_db_model import Beacon, Station
from datetime import timezone, timedelta, datetime
import os
class DatabaseManagerBeacon(DatabaseManager):
"""Manages database operations for beacon signals.

3
freedata_server/message_system_db_manager.py
View File

@ -1,6 +1,3 @@
# database_manager.py
import sqlite3
from sqlalchemy import create_engine, text, inspect
from sqlalchemy.orm import scoped_session, sessionmaker
from threading import local

1
freedata_server/message_system_db_messages.py
View File

@ -5,7 +5,6 @@ from message_system_db_station import DatabaseManagerStations
from sqlalchemy.exc import IntegrityError
from datetime import datetime, timedelta
import json
import os
from exceptions import MessageStatusError
class DatabaseManagerMessages(DatabaseManager):

2
freedata_server/message_system_db_model.py
View File

@ -1,5 +1,3 @@
# models.py
from sqlalchemy import Index, Boolean, Column, String, Integer, JSON, ForeignKey, DateTime
from sqlalchemy.orm import declarative_base, relationship

3
freedata_server/message_system_db_station.py
View File

@ -1,9 +1,6 @@
from sqlalchemy.orm import Session
from sqlalchemy.exc import SQLAlchemyError
from message_system_db_model import Station
from message_system_db_manager import DatabaseManager
import os
class DatabaseManagerStations(DatabaseManager):
"""Manages database operations for stations.

14
tools/Linux/install-freedata-linux.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
#
# Simple script to install FreeDATA in Linux
# Dj Merrill - N1JOV
# Simple script to install and also update FreeDATA in Linux
# To update FreeDATA, simply re-run the script in the same location
#
# Please note this script is not meant to cover all possible installations
# but hopefully can be used as a guide if you are installing on other
@ -40,8 +40,16 @@
# FreeDATA config file is stored in $HOME/.config/FreeDATA/config.ini
# See the run-freedata-linux.sh for more details
#
# Dj Merrill - N1JOV
#
#
# Changelog:
# 2.8: 16 Sep 2025
# Add initial support for Debian 13
#
# 2.7: 14 Sep 2025 (deej)
# Add comment that this script will also update FreeDATA
#
# 2.6: 02 May 2025 (deej)
# Allow any Hamlib released version as a second command line argument.
# Note this requires specifying the FreeDATA branch as the
@ -150,7 +158,7 @@ echo "*************************************************************************"
case $osname in
"Debian GNU/Linux")
case $osversion in
"11" | "12")
"11" | "12" | "13")
sudo apt install --upgrade -y fonts-noto-color-emoji git build-essential cmake python3 portaudio19-dev python3-pyaudio python3-pip python3-colorama python3-venv wget python3-dev
;;