christofsteel/syng
christofsteel/syng
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

set version to prerelease, and deleted rest of starting server in gui

Browse source
This commit is contained in:
Christoph Stahl 2024-09-23 17:49:16 +02:00
parent 27976b05d8
commit 4ad4563d80
2 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pyproject.toml
View file

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "syng" name = "syng"
version = "2.0.0" version = "2.0.0a0"
description = "A all-in-one webbased karaoke system with youtube support" description = "A all-in-one webbased karaoke system with youtube support"
authors = ["Christoph Stahl <christoph.stahl@tu-dortmund.de>"] authors = ["Christoph Stahl <christoph.stahl@tu-dortmund.de>"]
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"

69
syng/gui.py
View file

@ -1,4 +1,3 @@
from argparse import Namespace
from io import BytesIO from io import BytesIO
import logging import logging
from logging.handlers import QueueListener from logging.handlers import QueueListener
@ -9,14 +8,14 @@ import os
import builtins import builtins
from functools import partial from functools import partial
import random import random
from typing import TYPE_CHECKING, Any, Optional from typing import Any, Optional
import multiprocessing import multiprocessing
import secrets import secrets
import string import string
import signal import signal
from PyQt6.QtCore import QTimer from PyQt6.QtCore import QTimer
from PyQt6.QtGui import QAction, QCloseEvent, QIcon, QPixmap from PyQt6.QtGui import QCloseEvent, QIcon, QPixmap
from PyQt6.QtWidgets import ( from PyQt6.QtWidgets import (
QApplication, QApplication,
QCheckBox, QCheckBox,
@ -42,15 +41,15 @@ from .client import create_async_and_start_client, default_config
from .sources import available_sources from .sources import available_sources
try: # try:
from .server import run_server # from .server import run_server
#
SERVER_AVAILABLE = True # SERVER_AVAILABLE = True
except ImportError: # except ImportError:
if TYPE_CHECKING: # if TYPE_CHECKING:
from .server import run_server # from .server import run_server
#
SERVER_AVAILABLE = False # SERVER_AVAILABLE = False
# TODO: ScrollableFrame # TODO: ScrollableFrame
@ -497,29 +496,29 @@ class SyngGui(QMainWindow):
self.syng_client.kill() self.syng_client.kill()
self.set_client_button_start() self.set_client_button_start()
def start_syng_server(self) -> None: # def start_syng_server(self) -> None:
if self.syng_server is None: # if self.syng_server is None:
root_path = os.path.join(os.path.dirname(__file__), "static") # root_path = os.path.join(os.path.dirname(__file__), "static")
self.syng_server = multiprocessing.Process( # self.syng_server = multiprocessing.Process(
target=run_server, # target=run_server,
args=[ # args=[
Namespace( # Namespace(
host="0.0.0.0", # host="0.0.0.0",
port=8080, # port=8080,
registration_keyfile=None, # registration_keyfile=None,
root_folder=root_path, # root_folder=root_path,
private=False, # private=False,
restricted=False, # restricted=False,
) # )
], # ],
) # )
self.syng_server.start() # self.syng_server.start()
self.startsyng_serverbutton.setText("Stop Local Server") # self.startsyng_serverbutton.setText("Stop Local Server")
else: # else:
self.syng_server.terminate() # self.syng_server.terminate()
self.syng_server.join() # self.syng_server.join()
self.syng_server = None # self.syng_server = None
self.startsyng_serverbutton.setText("Start Local Server") # self.startsyng_serverbutton.setText("Start Local Server")
def change_qr(self, data: str) -> None: def change_qr(self, data: str) -> None:
qr = QRCode(box_size=10, border=2) qr = QRCode(box_size=10, border=2)