Gitea/git-touch-android-ios-app
1
0
Fork 0
mirror of https://github.com/git-touch/git-touch synced 2025-03-12 01:00:16 +01:00
Code Issues Releases Wiki Activity

refactor: object path

Browse Source
This commit is contained in:
Rongjian Zhang 2020-01-31 11:50:41 +08:00
parent a425902756
commit 366f09823b
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/screens/gitlab_blob.dart
View File

@ -25,9 +25,8 @@ class GitlabBlobScreen extends StatelessWidget {
return RefreshStatefulScaffold<GitlabBlob>( return RefreshStatefulScaffold<GitlabBlob>(
title: AppBarTitle(path ?? ''), title: AppBarTitle(path ?? ''),
fetchData: () async { fetchData: () async {
final encodedPath = Uri.encodeComponent(path);
final res = await Provider.of<AuthModel>(context).fetchGitlab( final res = await Provider.of<AuthModel>(context).fetchGitlab(
'/projects/$id/repository/files/$encodedPath?ref=master'); // TODO: '/projects/$id/repository/files/${path.urlencode}?ref=master'); // TODO:
return GitlabBlob.fromJson(res); return GitlabBlob.fromJson(res);
}, },
action: ActionEntry( action: ActionEntry(

35
lib/screens/object.dart
View File

@ -6,10 +6,10 @@ import 'package:git_touch/widgets/action_entry.dart';
import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/app_bar_title.dart';
import 'package:git_touch/widgets/blob_view.dart'; import 'package:git_touch/widgets/blob_view.dart';
import 'package:git_touch/widgets/object_tree.dart'; import 'package:git_touch/widgets/object_tree.dart';
import 'package:path/path.dart' as p;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/auth.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:path/path.dart' as p;
import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/utils/utils.dart';
final objectRouter = RouterScreen('/:owner/:name/blob/:ref', (context, params) { final objectRouter = RouterScreen('/:owner/:name/blob/:ref', (context, params) {
@ -17,7 +17,7 @@ final objectRouter = RouterScreen('/:owner/:name/blob/:ref', (context, params) {
params['owner'].first, params['owner'].first,
params['name'].first, params['name'].first,
params['ref'].first, params['ref'].first,
paths: params['path']?.first?.split('/') ?? [], path: params['path']?.first,
); );
}); });
@ -25,26 +25,16 @@ class ObjectScreen extends StatelessWidget {
final String owner; final String owner;
final String name; final String name;
final String branch; final String branch;
final List<String> paths; final String path;
ObjectScreen(this.owner, this.name, this.branch, {this.path});
ObjectScreen(this.owner, this.name, this.branch, {this.paths = const []}); String get _pathNotNull => path ?? '';
String get _expression => '$branch:$_path';
String get _extname {
if (paths.isEmpty) return '';
var dotext = p.extension(paths.last);
if (dotext.isEmpty) return '';
return dotext.substring(1);
}
String get _path => paths.join('/');
bool get _isImage => ['png', 'jpg', 'jpeg', 'gif', 'webp'].contains(_extname);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return RefreshStatefulScaffold<GhObjectGitObject>( return RefreshStatefulScaffold<GhObjectGitObject>(
canRefresh: !_isImage, // canRefresh: !_isImage, // TODO:
title: AppBarTitle(_path.isEmpty ? 'Files' : _path), title: AppBarTitle(path == null ? 'Files' : path),
fetchData: () async { fetchData: () async {
final res = await Provider.of<AuthModel>(context) final res = await Provider.of<AuthModel>(context)
.gqlClient .gqlClient
@ -52,7 +42,7 @@ class ObjectScreen extends StatelessWidget {
variables: GhObjectArguments( variables: GhObjectArguments(
owner: owner, owner: owner,
name: name, name: name,
expression: _expression, expression: '$branch:$_pathNotNull',
), ),
)); ));
final data = res.data.repository.object; final data = res.data.repository.object;
@ -84,12 +74,11 @@ class ObjectScreen extends StatelessWidget {
return ObjectTree( return ObjectTree(
items: (data as GhObjectTree).entries.map((v) { items: (data as GhObjectTree).entries.map((v) {
// if (item.type == 'commit') return null; // if (item.type == 'commit') return null;
final p = [...paths, v.name].join('/').urlencode;
return ObjectTreeItem( return ObjectTreeItem(
name: v.name, name: v.name,
type: v.type, type: v.type,
url: '/$owner/$name/blob/$branch?path=$p', url:
'/$owner/$name/blob/$branch?path=${p.join(_pathNotNull, v.name).urlencode}',
size: v.object.resolveType == 'Blob' size: v.object.resolveType == 'Blob'
? (v.object as GhObjectBlob).byteSize ? (v.object as GhObjectBlob).byteSize
: null, : null,
@ -100,10 +89,10 @@ class ObjectScreen extends StatelessWidget {
// TODO: Markdown base path // TODO: Markdown base path
// basePaths: [owner, name, branch, ...paths] // basePaths: [owner, name, branch, ...paths]
return BlobView( return BlobView(
_path, path,
text: (data as GhObjectBlob).text, text: (data as GhObjectBlob).text,
networkUrl: networkUrl:
'https://raw.githubusercontent.com/$owner/$name/$branch/$_path', // TODO: private 'https://raw.githubusercontent.com/$owner/$name/$branch/$path', // TODO: private
); );
default: default:
return null; return null;