Skip to content

Commit

Permalink
TEST
Browse files Browse the repository at this point in the history
  • Loading branch information
@TaYaKi71751
TaYaKi71751 committed Dec 13, 2023
1 parent 470d10c commit 78f2c6d
Show file tree
Hide file tree
Showing 7 changed files with 226 additions and 91 deletions.
221 changes: 136 additions & 85 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,53 +6,53 @@ on:
merge_group:

jobs:
ios-build:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
with:
ref: dev
- uses: subosito/flutter-action@v2
with:
# flutter-version: '2.5.2'
channel: 'stable'
- uses: actions/setup-python@v2
with:
python-version: '3.8'
- name: Preprocess
run: |
# cd lib/server
# wget -q ${{ secrets.SECRET_SALT }}
# wget -q ${{ secrets.SECRET_WSALT }}
# cd ../..
cat << EOF > lib/server/salt.dart
String getValid(foo) {return foo;}
EOF
cat << EOF > lib/server/wsalt.dart
String getValid(foo) {return foo;}
EOF
python3 preprocess-ios.py
- name: Podfile
run: |
cd ios
rm Podfile.lock
flutter clean
flutter pub get
pod install
pod update
cd ..
- name: Build
run: |
flutter build ios --release --no-codesign
mkdir -p Payload
mv ./build/ios/iphoneos/Runner.app Payload
zip -r -y Payload.zip Payload/Runner.app
mv Payload.zip Payload.ipa
- name: Upload IPA
uses: actions/upload-artifact@v2
with:
name: ipa-build
path: Payload.ipa
# ios-build:
# runs-on: macos-latest
# steps:
# - uses: actions/checkout@v2
# with:
# ref: dev
# - uses: subosito/flutter-action@v2
# with:
# # flutter-version: '2.5.2'
# channel: 'stable'
# - uses: actions/setup-python@v2
# with:
# python-version: '3.8'
# - name: Preprocess
# run: |
# # cd lib/server
# # wget -q ${{ secrets.SECRET_SALT }}
# # wget -q ${{ secrets.SECRET_WSALT }}
# # cd ../..
# cat << EOF > lib/server/salt.dart
# String getValid(foo) {return foo;}
# EOF
# cat << EOF > lib/server/wsalt.dart
# String getValid(foo) {return foo;}
# EOF
# python3 preprocess-ios.py
# - name: Podfile
# run: |
# cd ios
# rm Podfile.lock
# flutter clean
# flutter pub get
# pod install
# pod update
# cd ..
# - name: Build
# run: |
# flutter build ios --release --no-codesign
# mkdir -p Payload
# mv ./build/ios/iphoneos/Runner.app Payload
# zip -r -y Payload.zip Payload/Runner.app
# mv Payload.zip Payload.ipa
# - name: Upload IPA
# uses: actions/upload-artifact@v2
# with:
# name: ipa-build
# path: Payload.ipa

# https://github.com/AppImageCrafters/appimage-builder-flutter-example/blob/main/.github/workflows/appimage.yml
linux-build:
Expand All @@ -69,6 +69,57 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y cmake ninja-build build-essential pkg-config curl file git unzip xz-utils zip libgtk-3-dev
- name: Clone project-violet/p7zip
run: git clone https://github.com/project-violet/p7zip.git
- name: Build p7zip for linux/armhf
uses: pguyot/arm-runner-action@v2
with:
base_image: raspios_lite:latest
commands: |
mkdir -p ./assets/p7zip/linux/armv7/
cd p7zip
make 7zr
cd ..
chmod 777 p7zip/bin/7zr
sudo chown $USER:$USER p7zip/bin/7zr
cp p7zip/bin/7zr ./assets/p7zip/linux/armv7/7zr
cd p7zip
git add -A
git reset --hard HEAD
cd ..
- name: Build p7zip for linux/arm64
uses: pguyot/arm-runner-action@v2
with:
base_image: raspios_lite_arm64:latest
commands: |
mkdir -p ./assets/p7zip/linux/armv8/
cd p7zip
make 7zr
cd ..
chmod 777 p7zip/bin/7zr
sudo chown $USER:$USER p7zip/bin/7zr
cp p7zip/bin/7zr ./assets/p7zip/linux/armv8/7zr
cd p7zip
git add -A
git reset --hard HEAD
cd ..
- name: Build p7zip for linux/x86(not yet)
run: |
mkdir -p ./assets/p7zip/linux/x86/
touch ./assets/p7zip/linux/x86/7zr
- name: Build p7zip for linux/x86_64
run: |
mkdir -p ./assets/p7zip/linux/x86_64/
cd p7zip
make 7zr
cd ..
chmod 777 p7zip/bin/7zr
sudo chown $USER:$USER p7zip/bin/7zr
cp p7zip/bin/7zr ./assets/p7zip/linux/x86_64/7zr
cd p7zip
git add -A
git reset --hard HEAD
cd ..
- name: Build flutter app
run: |
# cd lib/server
Expand Down Expand Up @@ -109,41 +160,41 @@ jobs:
# files: './*.AppImage*'
# repo_token: ${{ secrets.GITHUB_TOKEN }}

android-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: dev
- uses: actions/setup-java@v1
with:
java-version: '12.x'
- uses: subosito/flutter-action@v1
with:
# flutter-version: '2.5.2'
channel: 'stable'
- uses: actions/setup-python@v2
with:
python-version: '3.8'
- name: Preprocess
run: |
# cd lib/server
# wget -q ${{ secrets.SECRET_SALT }}
# wget -q ${{ secrets.SECRET_WSALT }}
# cd ../..
cat << EOF > lib/server/salt.dart
String getValid(foo) {return foo;}
EOF
cat << EOF > lib/server/wsalt.dart
String getValid(foo) {return foo;}
EOF
python3 preprocess-android.py
- name: Build
run: |
flutter clean
flutter build apk --release
- name: Upload APK
uses: actions/upload-artifact@v2
with:
name: apk-build
path: ./build/app/outputs/apk/release/app-release.apk
# android-build:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2
# with:
# ref: dev
# - uses: actions/setup-java@v1
# with:
# java-version: '12.x'
# - uses: subosito/flutter-action@v1
# with:
# # flutter-version: '2.5.2'
# channel: 'stable'
# - uses: actions/setup-python@v2
# with:
# python-version: '3.8'
# - name: Preprocess
# run: |
# # cd lib/server
# # wget -q ${{ secrets.SECRET_SALT }}
# # wget -q ${{ secrets.SECRET_WSALT }}
# # cd ../..
# cat << EOF > lib/server/salt.dart
# String getValid(foo) {return foo;}
# EOF
# cat << EOF > lib/server/wsalt.dart
# String getValid(foo) {return foo;}
# EOF
# python3 preprocess-android.py
# - name: Build
# run: |
# flutter clean
# flutter build apk --release
# - name: Upload APK
# uses: actions/upload-artifact@v2
# with:
# name: apk-build
# path: ./build/app/outputs/apk/release/app-release.apk
1 change: 1 addition & 0 deletions AppImageBuilder.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ AppDir:
- sourceline: deb http://security.ubuntu.com/ubuntu focal-security multiverse
include:
- libgtk-3-0
- p7zip-full
exclude:
- humanity-icon-theme
- hicolor-icon-theme
Expand Down
2 changes: 1 addition & 1 deletion lib/checker/checker.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class VioletChecker {
//
// 0. get database path
//
var dbPath = Platform.isAndroid
var dbPath = (Platform.isAndroid || Platform.isLinux)
? '${(await DefaultPathProvider.getBaseDirectory())}/data/data.db'
: '${(await DefaultPathProvider.getBaseDirectory())}/data.db';

Expand Down
2 changes: 1 addition & 1 deletion lib/database/database.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class DataBaseManager {
if (Platform.environment.containsKey('FLUTTER_TEST')) {
dbPath = join(Directory.current.path, 'test/db/data.db');
} else {
dbPath = Platform.isAndroid
dbPath = (Platform.isAndroid || Platform.isLinux)
? '${(await DefaultPathProvider.getBaseDirectory())}/data/data.db'
: '${(await DefaultPathProvider.getBaseDirectory())}/data.db';
}
Expand Down
6 changes: 3 additions & 3 deletions lib/pages/database_download/database_download_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class DataBaseDownloadPageState extends State<DataBaseDownloadPage> {
try {
final prefs = await MultiPreferences.getInstance();
if ((await prefs.getInt('db_exists')) == 1) {
var dbPath = Platform.isAndroid
var dbPath = (Platform.isAndroid || Platform.isLinux)
? '${(await DefaultPathProvider.getBaseDirectory())}/data/data.db'
: '${(await DefaultPathProvider.getBaseDirectory())}/data.db';
if (await File(dbPath).exists()) await File(dbPath).delete();
Expand Down Expand Up @@ -104,9 +104,9 @@ class DataBaseDownloadPageState extends State<DataBaseDownloadPage> {

Future<void> downloadFileLinux() async {
try {
await downloadFileLinuxWith('latest', true);
await downloadFileAndroidWith('latest', true);
} catch(e){
await downloadFileLinuxWith('old', false);
await downloadFileAndroidWith('old', false);
}
}

Expand Down
80 changes: 79 additions & 1 deletion lib/pages/database_download/decompress.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// This source code is a part of Project Violet.
// Copyright (C) 2020-2023. violet-team. Licensed under the Apache-2.0 License.

import 'dart:convert';
import 'dart:ffi';
import 'dart:io';
import 'dart:isolate';
Expand All @@ -9,6 +10,8 @@ import 'package:device_info_plus/device_info_plus.dart';
import 'package:ffi/ffi.dart';
import 'package:flutter/services.dart';
import 'package:path_provider/path_provider.dart';
import 'package:violet/log/log.dart';
import 'package:violet/settings/path.dart';

typedef _NativeP7zipShell = NativeFunction<Int32 Function(Pointer<Int8>)>;
typedef _DartP7zipShell = int Function(Pointer<Int8>);
Expand Down Expand Up @@ -49,7 +52,37 @@ class P7zip {
final soPath = await _checkSharedLibrary();
print(soPath);
if (soPath == null) {
return null;
final binPath = await _checkBinary();
if(binPath == null){
return null;
}
final filesStr = files.join(' ');
await ((()async{
Process process = await Process.start(
"chmod",
[
"+x",
"${(await DefaultPathProvider.getBaseDirectory())}/7zr",
],
);
await process.stdout
.transform(utf8.decoder)
.forEach(print);
})());
await ((()async{
Process process = await Process.start(
"${(await DefaultPathProvider.getBaseDirectory())}/7zr",
[
"e","$filesStr",
"-o$path"
],
);
await process.stdout
.transform(utf8.decoder)
.forEach(print);
})());
// return null;
return path;
}

final filesStr = files.join(' ');
Expand Down Expand Up @@ -97,4 +130,49 @@ class P7zip {

return libraryFile.path;
}
Future<String?> _checkBinary() async {
if(!Platform.isLinux){
return null;
}

var _arch = await ((()async{
var _a = '';
// https://stackoverflow.com/questions/70247458/flutter-dart-print-output-of-all-child-processes-to-stdout
Process process = await Process.start(
"uname",
[
"-m"
],
);

await process.stdout
.transform(utf8.decoder)
.forEach((value){
if(_a.isEmpty){
_a = value.replaceAll('\r', '').replaceAll('\n', '');
}
});
if((_a.contains('arm') || _a.contains('aarch')) && (_a.contains('32') || _a.contains('v7'))) return 'armv7';
if((_a.contains('arm') || _a.contains('aarch')) && (_a.contains('64') || _a.contains('v8'))) return 'armv8';
if(_a == 'x86_64' || _a == 'amd64') return 'x86_64';
if((_a.contains('i') || _a.contains('x')) && _a.contains('86') && !_a.contains('64')) return 'x86';
})());
final binaryPath = 'assets/p7zip/linux/$_arch/7zr';
final binaryContent = await rootBundle.load(binaryPath);
final tempDir = await DefaultPathProvider.getBaseDirectory();
final binaryFile = File('${tempDir}/7zr');
if(await binaryFile.exists()){
await binaryFile.delete();
}
if(await Directory('${tempDir}/').exists()){
Logger.info('${tempDir}/ exists');
}
final createdFile = await binaryFile.create();
final openFile = await createdFile.open(mode: FileMode.write);
final writtenFile =
await openFile.writeFrom(Uint8List.view(binaryContent.buffer));
await writtenFile.close();

return binaryFile.path;
}
}
Loading

0 comments on commit 78f2c6d

Please sign in to comment.