fix(gitlab): use default branch instead of master

r #28
pd4d10 · Feb 2, 2020 · 79fe174 · 79fe174
1 parent d152750
commit 79fe174
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 16 deletions.
diff --git a/lib/models/gitlab.dart b/lib/models/gitlab.dart
@@ -92,6 +92,7 @@ class GitlabProject {
   GitlabProjectStatistics statistics;
   DateTime lastActivityAt;
   DateTime createdAt;
+  String defaultBranch;
   GitlabProject();
   factory GitlabProject.fromJson(Map<String, dynamic> json) =>
       _$GitlabProjectFromJson(json);

diff --git a/lib/models/gitlab.g.dart b/lib/models/gitlab.g.dart
diff --git a/lib/router.dart b/lib/router.dart
@@ -148,12 +148,14 @@ class GitlabRouter {
   static final group = RouterScreen('/group/:id',
       (context, p) => GitlabGroupScreen(int.parse(p['id'].first)));
   static final blob = RouterScreen(
-      '/projects/:id/blob',
-      (context, params) => GitlabBlobScreen(int.parse(params['id'].first),
+      '/projects/:id/blob/:ref',
+      (context, params) => GitlabBlobScreen(
+          int.parse(params['id'].first), params['ref'].first,
           path: params['path']?.first));
   static final tree = RouterScreen(
-      '/projects/:id/tree',
-      (context, params) => GitlabTreeScreen(int.parse(params['id'].first),
+      '/projects/:id/tree/:ref',
+      (context, params) => GitlabTreeScreen(
+          int.parse(params['id'].first), params['ref'].first,
           path: params['path']?.first));
   static final project = RouterScreen('/projects/:id',
       (context, params) => GitlabProjectScreen(int.parse(params['id'].first)));

diff --git a/lib/screens/gitlab_blob.dart b/lib/screens/gitlab_blob.dart
@@ -10,16 +10,17 @@ import 'package:provider/provider.dart';
 
 class GitlabBlobScreen extends StatelessWidget {
   final int id;
+  final String ref;
   final String path;
-  GitlabBlobScreen(this.id, {this.path});
+  GitlabBlobScreen(this.id, this.ref, {this.path});
 
   @override
   Widget build(BuildContext context) {
     return RefreshStatefulScaffold<GitlabBlob>(
       title: AppBarTitle(path ?? ''),
       fetchData: () async {
         final res = await Provider.of<AuthModel>(context).fetchGitlab(
-            '/projects/$id/repository/files/${path.urlencode}?ref=master'); // TODO:
+            '/projects/$id/repository/files/${path.urlencode}?ref=$ref');
         return GitlabBlob.fromJson(res);
       },
       action: ActionEntry(iconData: Icons.settings, url: '/choose-code-theme'),

diff --git a/lib/screens/gitlab_project.dart b/lib/screens/gitlab_project.dart
@@ -115,7 +115,7 @@ class GitlabProjectScreen extends StatelessWidget {
                   leftIconData: Octicons.code,
                   text: Text(langs.keys.isEmpty ? 'Code' : langs.keys.first),
                   rightWidget: Text(filesize(p.statistics.repositorySize)),
-                  url: '/gitlab/projects/$id/tree',
+                  url: '/gitlab/projects/$id/tree/${p.defaultBranch}',
                 ),
                 if (p.issuesEnabled)
                   TableViewItem(

diff --git a/lib/screens/gitlab_tree.dart b/lib/screens/gitlab_tree.dart
@@ -10,20 +10,24 @@ import 'package:git_touch/utils/utils.dart';
 
 class GitlabTreeScreen extends StatelessWidget {
   final int id;
+  final String ref;
   final String path;
-  GitlabTreeScreen(this.id, {this.path});
+  GitlabTreeScreen(this.id, this.ref, {this.path});
 
   @override
   Widget build(BuildContext context) {
     final auth = Provider.of<AuthModel>(context);
     return RefreshStatefulScaffold<Iterable<GitlabTreeItem>>(
       title: AppBarTitle(path ?? 'Files'),
       fetchData: () async {
-        var url = '/projects/$id/repository/tree';
-        if (path != null) {
-          url += '?path=' + path;
-        }
-        final res = await auth.fetchGitlab(url);
+        final uri = Uri(
+          path: '/projects/$id/repository/tree',
+          queryParameters: {
+            'ref': ref,
+            ...(path == null ? {} : {'path': path})
+          },
+        );
+        final res = await auth.fetchGitlab(uri.toString());
         return (res as List).map((v) => GitlabTreeItem.fromJson(v));
       },
       bodyBuilder: (data, _) {
@@ -37,9 +41,9 @@ class GitlabTreeScreen extends StatelessWidget {
               url: (() {
                 switch (item.type) {
                   case 'tree':
-                    return '/gitlab/projects/$id/tree?path=${item.path.urlencode}';
+                    return '/gitlab/projects/$id/tree/$ref?path=${item.path.urlencode}';
                   case 'blob':
-                    return '/gitlab/projects/$id/blob?path=${item.path.urlencode}';
+                    return '/gitlab/projects/$id/blob/$ref?path=${item.path.urlencode}';
                   default:
                     return null;
                 }