LANraragi/Karen
1
0
Fork 1
mirror of https://github.com/Difegue/Karen synced 2025-01-07 03:17:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Switch to using a native Redis server"

Browse Source 
This reverts the last three commits.
This commit is contained in:
Difegue 2024-04-06 03:08:43 +02:00
parent 3ad0b1a1d9
commit 1a9d2bae6b
6 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
External/add_package_tar_and_redis_here → External/add_package_tar_here vendored
View File

23
Karen/Interop/RedisServer.cs
View File

@ -1,23 +0,0 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Karen.Interop
{
public static class RedisServer
{
public static void Start(string contentFolder)
{
Process.Start(new ProcessStartInfo(".\\Redis\\redis-server.exe", $".\\Redis\\redis.conf --dir '{contentFolder}/' --daemonize yes") { UseShellExecute = false });
}
public static void Stop()
{
Process.Start(new ProcessStartInfo("taskkill", "/F /IM redis-server.exe") { UseShellExecute = false});
}
}
}

11
Karen/Interop/WslDistro.cs
View File

@ -87,10 +87,8 @@ namespace Karen.Interop
string contentFolder = GetWSLPath(winPath);
string thumbnailFolder = string.IsNullOrWhiteSpace(thumbPath) ? contentFolder + "/thumb" : GetWSLPath(thumbPath);
// Start native Redis server
RedisServer.Start(winPath);
var wslCommands = new List<string>();
var driveLetter = winPath.Split('\\')[0];
if (!IsLocalDrive(driveLetter))
@ -116,7 +114,8 @@ namespace Karen.Interop
wslCommands.Add($"export LRR_DATA_DIRECTORY='{contentFolder}'");
wslCommands.Add($"export LRR_THUMB_DIRECTORY='{thumbnailFolder}'");
wslCommands.Add($"cd /home/koyomi/lanraragi && rm -f public/temp/server.pid");
wslCommands.Add($"mkdir -p log && mkdir -p content && mkdir -p database");
wslCommands.Add($"mkdir -p log && mkdir -p content && mkdir -p database && sysctl vm.overcommit_memory=1");
wslCommands.Add($"redis-server /home/koyomi/lanraragi/tools/build/docker/redis.conf --dir '{contentFolder}/' --daemonize yes");
wslCommands.Add($"perl ./script/launcher.pl -f ./script/lanraragi");
// Concat all commands into one string we'll throw at WSL
@ -140,9 +139,7 @@ namespace Karen.Interop
}
public bool? StopApp()
{
RedisServer.Stop();
{
// Kill WSL Process
if (_lrrProc != null && !_lrrProc.HasExited)
{

2
Karen/MainWindow.xaml
View File

@ -70,7 +70,7 @@
<Separator Height="12" Margin="0"/>
<TextBlock Style="{StaticResource BodyTextBlockStyle}">
You're using the <Hyperlink NavigateUri="https://github.com/Difegue/Karen" RequestNavigate="Hyperlink_RequestNavigate">Karen</Hyperlink> Bootstrapper for <Hyperlink NavigateUri="https://github.com/Difegue/LANraragi" RequestNavigate="Hyperlink_RequestNavigate">LANraragi</Hyperlink>,
<LineBreak/> Version 2.8 <emoji:TextBlock Text="🐝"/>
<LineBreak/> Version 2.7 <emoji:TextBlock Text="🐝"/>
<LineBreak/>
<emoji:TextBlock Text="✨"/> Consider installing <Hyperlink NavigateUri="ms-windows-store://pdp/?ProductId=9MZ6BWWVSWJH&amp;mode=mini" RequestNavigate="Hyperlink_RequestNavigate">LRReader</Hyperlink> from the Microsoft Store! <emoji:TextBlock Text="✨"/>
<LineBreak/>

2
README.md
View File

@ -13,6 +13,6 @@ Works on Windows 10 1903 and up.
## Building
Add the WSL Distro package.tar in External/, alongside an unpacked build of [Redis for Windows](https://github.com/redis-windows/redis-windows) in a "Redis" directory.
Add the WSL Distro package.tar in External/, alongside a LxRunOffline folder containing a version of LxRunOffline: https://github.com/DDoSolitary/LxRunOffline/releases
Then simply build the solution.

11
Setup/Program.cs
View File

@ -40,13 +40,10 @@ namespace Setup
var project = new Project("LANraragi",
new Dir(@"%AppData%\LANraragi",
new Files(@"..\Karen\bin\Release\net472\win7-x64\*.*"),
new File(@"..\DistroInstaller\bin\Release\net472\win7-x64\DistroInstaller.exe"), //DesktopBridge.Helpers.dll already in the global Files match above
new File(@"..\External\package.tar"),
new Dir(@"Redis",
new Files(@"..\External\Redis\*.*")
),
uninstallerShortcut
),
new File(@"..\DistroInstaller\bin\Release\net472\win7-x64\DistroInstaller.exe"), //DesktopBridge.Helpers.dll already in the global Files match above
new File(@"..\External\package.tar"),
uninstallerShortcut
),
new Dir(@"%ProgramMenu%\LANraragi for Windows",
new ExeFileShortcut("LANraragi", "[INSTALLDIR]Karen.exe", "")),
new RegValue(RegistryHive.LocalMachineOrUsers, @"Software\Microsoft\Windows\CurrentVersion\Run", "Karen", "[INSTALLDIR]Karen.exe"),