GitHostRepo: Add name and username

Instead of having to parse this from the fullName. This way the code is
easier to read and it's more reliable.

lib/apis/githost.dart

@@ -28,6 +28,8 @@ class UserInfo {
 }
 
 class GitHostRepo {
+  final String name;
+  final String username;
   final String fullName;
   final String description;
 
@@ -44,6 +46,8 @@ class GitHostRepo {
   final List<String> tags;
 
   GitHostRepo({
+    @required this.name,
+    @required this.username,
     @required this.fullName,
     @required this.description,
     @required this.cloneUrl,
@@ -58,6 +62,8 @@ class GitHostRepo {
   });
 
   Map<String, dynamic> toJson() => {
+        'name': name,
+        'username': username,
         'fullName': fullName,
         'description': description,
         'cloneUrl': cloneUrl,

lib/apis/github.dart

@@ -226,6 +226,15 @@ class GitHub implements GitHost {
       Log.e(e);
     }
     var licenseMap = parsedJson['license'];
+    var fullName = parsedJson['full_name'].toString();
+
+    var owner = parsedJson['owner'];
+    var username = "";
+    if (owner != null) {
+      username = (owner as Map)["login"];
+    } else {
+      username = fullName.split('/').first;
+    }
 
     /*
     print("");
@@ -234,7 +243,9 @@ class GitHub implements GitHost {
     */
 
     return GitHostRepo(
-      fullName: parsedJson['full_name'],
+      name: parsedJson['name'],
+      username: username,
+      fullName: fullName,
       cloneUrl: parsedJson['ssh_url'],
       updatedAt: updatedAt,
       description: parsedJson['description'],

lib/apis/gitlab.dart

@@ -217,8 +217,19 @@ class GitLab implements GitHost {
       tags = tagList.map((e) => e.toString()).toList();
     }
 
+    var fullName = parsedJson['path_with_namespace'].toString();
+    var namespace = parsedJson['namespace'];
+    var username = "";
+    if (namespace != null) {
+      username = (namespace as Map)["path"];
+    } else {
+      username = fullName.split('/').first;
+    }
+
     return GitHostRepo(
-      fullName: parsedJson['path_with_namespace'],
+      name: parsedJson["name"],
+      username: username,
+      fullName: fullName,
       cloneUrl: parsedJson['ssh_url_to_repo'],
       updatedAt: updatedAt,
       description: parsedJson['description'],

lib/setup/repo_selector.dart

@@ -123,19 +123,14 @@ class GitHostSetupRepoSelectorState extends State<GitHostSetupRepoSelector> {
     }
 
     var q = _textController.text.toLowerCase();
-    var filteredRepos = repos.where((r) {
+    var filteredRepos =
-      var repoName = r.fullName.split('/').last;
+        repos.where((r) => r.name.toLowerCase().contains(q)).toList();
-      return repoName.toLowerCase().contains(q);
-    }).toList();
 
-    var repoExists = filteredRepos.indexWhere((r) {
+    var repoExists = filteredRepos.indexWhere((r) =>
-          var l = r.fullName.split('/');
+            r.name.toLowerCase() == q &&
-          var username = l.first;
+            r.username == widget.userInfo.username) !=
-          var repoName = l.last;
-          return repoName.toLowerCase() == _textController.text &&
-              username == widget.userInfo.username;
-        }) !=
         -1;
+
     var createRepoTile = _textController.text.isNotEmpty && !repoExists;
 
     Widget repoBuilder = ListView(