[web] generating an app id as a simple treated name

This commit is contained in:
Vinícius Moreira
2019-12-19 10:49:02 -03:00
parent 14008e4ad5
commit 8da60c3a70

View File

@@ -4,7 +4,6 @@ import os
import re import re
import shutil import shutil
import subprocess import subprocess
import time
import traceback import traceback
from pathlib import Path from pathlib import Path
from threading import Thread from threading import Thread
@@ -451,14 +450,20 @@ class WebApplicationManager(SoftwareManager):
def _gen_app_id(self, name: str) -> Tuple[str, str]: def _gen_app_id(self, name: str) -> Tuple[str, str]:
treated_name = name.lower().strip().replace(' ', '-') treated_name = RE_SYMBOLS_SPLIT.sub('-', name.lower().strip())
config_path = '{}/.config'.format(Path.home())
counter = 0
while True: while True:
random_number = str(int(time.time())) app_id = '{}{}'.format(treated_name, '-{}'.format(counter) if counter else '')
app_id = '{}-{}'.format(random_number, treated_name)
if not os.path.exists('{}/{}'.format(INSTALLED_PATH, app_id)): if not os.path.exists('{}/{}'.format(INSTALLED_PATH, app_id)):
return app_id, treated_name # checking if there is no config folder associated with the id
if os.path.exists(config_path):
if not glob.glob('{}/{}-nativefier-*'.format(config_path, app_id)):
return app_id, treated_name
counter += 1
def _gen_desktop_entry_path(self, app_id: str) -> str: def _gen_desktop_entry_path(self, app_id: str) -> str:
base_id = app_id base_id = app_id