diff --git a/GenRecovers.py b/GenRecovers.py index 89d7088..c8a75ba 100644 --- a/GenRecovers.py +++ b/GenRecovers.py @@ -8,16 +8,21 @@ def ScanRecoverFile(): if os.path.exists('./recovers.txt'): with open('./recovers.txt') as f: ScanResult =f.read().split("\n") + else: print("Файла со список рекомедации нейдлено") res = GenRecoversFun(ScanResult) return res def GenRecoversFun(Reclist): - result =[] + result ={} + cat= "" for r in Reclist: - result.append(search(r)) - + if r.startswith("["): + cat = r.replace("[", "") and r.replace("]", "") + result[r.replace("[", "") and r.replace("]", "")]= [] + else: + result[cat].append(search(r)) return result diff --git a/findfsdb.py b/findfsdb.py index 10588a4..364108b 100755 --- a/findfsdb.py +++ b/findfsdb.py @@ -46,8 +46,8 @@ def create_db(): if not pkg_name[:-1] in all_pkgs: #print(str(d.split("/")[-2] +"/" + d.split("/")[-1] +"\n")) - if pkg_name[:-1] in AliaseCategory: - all_pkgs.append(AliaseCategory[pkg_name[:-1]]) + if str(d.split("/")[-2] +"/" + d.split("/")[-1]) in AliaseCategory: + all_pkgs.append(AliaseCategory[d]) else: all_pkgs.append(str(d.split("/")[-2] +"/" + d.split("/")[-1])) diff --git a/recovers.txt b/recovers.txt index 1e60021..ed60e96 100644 --- a/recovers.txt +++ b/recovers.txt @@ -1,25 +1,42 @@ - -net-im/element-desktop-bin -net-im/telegram-desktop-bin - - +[net-im] +element-desktop-bin +telegram-desktop-bin +zoom +pidgin +teams +slack +[Музыка] audacity +clementine +mixx +lmms +mpd +[Видео] obs-studio kdenlive -mixxx mplayer vlc +mplayer +[Web-Серверв] nginx -www-servers/apache -yaws -dev-util/pycharm-community +apache +[dev-util] +pycharm-community +[Графика] gimp blender +[Игры] steam-launcher +[Браузеры] firefox-bin +chromium +falkpon +links +vivaldi +netsurf +[app-utils] vim nano - - - - +vscode +jedit +gedit \ No newline at end of file