Working on fetch data from cloud.

Author: gnu4cn

electron/src/book.backend.ts

@@ -169,7 +169,6 @@ export class BookBackend {
                     this.book.downloaded = true;
 
                     this.book.commit = (msg.data as IBookDownloaded).commit;
-                    this.book.headBranch = (msg.data as IBookDownloaded).branch;
 
                     query = {
                         table: 'Book',

electron/src/git-ops.ts

@@ -37,11 +37,11 @@ export const clone = async (bookDir: string, bookUri: string) => {
         Clone.clone(bookUri, bookDir, opts)
             .then(async (repo) => {
                 const commit = await repo.getHeadCommit();
-                const branch = await repo.getCurrentBranch();
+                //const branch = await repo.getCurrentBranch();
 
                 const msg: IBookDownloaded = {
                     commit: commit.sha(),
-                    branch: await Branch.name(branch)
+                    //branch: await Branch.name(branch)
                 }
                 if(process.send){
                     const message: IIpcMessage = {title: 'book-downloaded', data: msg};

electron/src/models.ts

@@ -48,6 +48,12 @@ export class Website extends Meta{
 
 @Entity()
 export class Writer extends Meta{
+    @Column({default: 0})
+    platformId: number;
+
+    @Column({default: ''})
+    htmlUrl: string;
+
     @Column({default: ''})
     name: string;
 

electron/src/vendor.ts

@@ -24,7 +24,6 @@ export interface IProgressMessage {
 
 export interface IBookDownloaded {
     commit: string;
-    branch: string;
 }
 
 export interface IError {

src/app/home/components/book-list.component.html

@@ -35,7 +35,7 @@
                         (click)="openReadingRecordDialog(book)">
                             <ion-icon name="list-outline"></ion-icon>阅读记录
                     </button>
-                    <button mat-button *ngIf="book.downloaded" (click)="openReadmeDialog(book)">
+                    <button mat-button (click)="openReadmeDialog(book)">
                             <ion-icon name="compass-outline"></ion-icon>README
                     </button>
                     <button mat-button *ngIf="book.downloaded" (click)="openBook(book)">

src/app/home/components/readme-dialog.component.ts

@@ -10,6 +10,8 @@ import {
     MAT_DIALOG_DATA 
 } from '@angular/material/dialog';
 
+import { join } from 'path';
+
 import { Book } from '../../models';
 
 @Component({
@@ -23,11 +25,23 @@ export class ReadmeDialog implements OnInit{
     ) {}
 
     get readmeUrl () {
-        const giteeReadmeUrl = "https://gitee.com/hainanwu/18.06-linalg-notes/raw/master/README.md";
-        const gitlabReadmeUrl = 'https://gitlab.com/aviman1109/devops/-/raw/master/README.md';
-        const githubReadmeUrl = 'https://raw.githubusercontent.com/gnu4cn/ccna60d/main/README.md';
+        if(/github/.test(this.data.website.uri)) {
+            return this.data.downloaded 
+                ? join(this.data.website.uri, this.data.writer.name, this.data.name, 'README.md') 
+                : join('https://raw.githubusercontent.com', this.data.writer.name, this.data.name, this.data.defaultBranch, 'README.md');
+        }
+
+        if(/gitee/.test(this.data.website.uri)) {
+            return this.data.downloaded
+                ? join(this.data.website.uri, this.data.writer.name, this.data.name, 'README.md')
+                : join('https://gitee.com', this.data.writer.name, this.data.name, 'raw', this.data.defaultBranch, 'README.md');
+        }
 
-        return '';
+        if(/gitlab/.test(this.data.website.uri)) {
+            return this.data.downloaded
+                ? join(this.data.website.uri, this.data.writer.name, this.data.name, 'README.md')
+                : join('https://gitlab.com', this.data.writer.name, this.data.name, '-', 'raw', this.data.defaultBranch, 'README.md');
+        }
     }
 
     ngOnInit() {}

src/app/home/services/book.service.ts

@@ -74,10 +74,37 @@ export class BookService {
         newBook.name = re.test(name) ? name.replace(re, '') : name;
 
         newBook.website = await this.website.newWebsit(site);
-        newBook.writer = await this.writer.newWriter(writerName, newBook.website);
+        
+        if(/gitee/.test(site)){
+            await this.fetchService.getRepoProfile(site, newBook.name, writerName).subscribe(async (res) => {
+                newBook.writer = await this.writer.newWriter(writerName, newBook.website, res['owner']['login']); 
+            });
+        }
+        else {
+            newBook.writer = await this.writer.newWriter(writerName, newBook.website);
+        }
+
         newBook.cateList = await this.cate.saveList(res.cateList);
         newBook.recordList = [];
 
+        // 这里要获取到 Repository 的更多信息
+        if(/gitlab/.test(site)) {
+            await this.fetchService.getRepoProfile(site, newBook.name, writerName, newBook.writer.platformId)
+                .subscribe(res => {
+                    const repo = (res as object[]).find(repo => repo['path'] === newBook.name)
+
+                    newBook.desc = repo['description'];
+                    newBook.defaultBranch = repo['default_branch'];
+                });
+        }
+        else {
+            await this.fetchService.getRepoProfile(site, newBook.name, writerName)
+                .subscribe(res => {
+                    newBook.desc = res['description'];
+                    newBook.defaultBranch = res['default_branch'];
+                });
+        }
+
         const query: IQuery = {
             table: 'Book',
             item: newBook

src/app/home/services/fetch.service.ts

@@ -9,7 +9,7 @@ import { PrivateTokensService } from './private-tokens.service';
     providedIn: 'root'
 })
 export class FetchService {
-    private inFlight = new Map<string, Observable<JSON>>();
+    private inFlight = new Map<string, Observable<object|object[]>>();
 
     constructor(
         private http: HttpClient,
@@ -20,7 +20,7 @@ export class FetchService {
      *
      * @param url {string} Full path relative to root
      */
-    get = (url: string, header: string): Observable<JSON> => {
+    get = (url: string, header: string): Observable<object|object[]> => {
         if (!url) {
             return of(JSON.parse(''));
         }
@@ -47,7 +47,7 @@ export class FetchService {
         return obs;
     }
 
-    fetchWriterProfile = (writerName: string, websiteUri: string): Observable<JSON> => {
+    getWriterProfile = (writerName: string, websiteUri: string): Observable<object|object[]> => {
         let url: string;
         let header: string;
 
@@ -71,7 +71,7 @@ export class FetchService {
         return this.get(url, header);
     }
 
-    getRepoProfile = (website: string, repo: string, owner?: string, ownerId?: number): Observable<JSON> => {
+    getRepoProfile = (website: string, repo: string, owner: string, ownerId?: number): Observable<object|object[]> => {
         let url: string;
         let header: string;
 
@@ -95,7 +95,7 @@ export class FetchService {
         return this.get(url, header);
     }
 
-    searchBooks = (websiteUri: string, keywords: string): Observable<JSON> => {
+    searchBooks = (websiteUri: string, keywords: string): Observable<object|object[]> => {
         let url: string;
         let header: string;
 

src/app/home/services/writer.service.ts

@@ -4,6 +4,8 @@ import { CrudService } from '../../services/crud.service';
 import { Writer, Website } from '../../models';
 
 import { OpMessageService } from './op-message.service';
+import { FetchService } from './fetch.service';
+
 import { 
     IQuery,
     IQueryResult,
@@ -17,6 +19,7 @@ export class WriterService {
 
     constructor(
         private crud: CrudService,
+        private fetchService: FetchService,
         private opMessage: OpMessageService,
     ) {
         this.crud.getItems({table: 'Writer'})
@@ -27,7 +30,7 @@ export class WriterService {
             });
     }
 
-    newWriter = async (writerName: string, website: Website) => {
+    newWriter = async (writerName: string, website: Website, platformName?: string) => {
         const writer = await this.list.find(w => w.name === writerName);
 
         if (writer){
@@ -62,6 +65,18 @@ export class WriterService {
             _writer.websiteList = [];
             _writer.websiteList.push(website);
 
+            // 获取writer的更多信息
+            await this.fetchService.getWriterProfile(platformName ? platformName : writerName, website.uri).subscribe(res => {
+                console.log(res);
+
+                _writer.platformId = res['id'];
+                _writer.avatar_url = res['avatar_url'];
+                _writer.fullName = res['name'];
+                _writer.htmlUrl = res['html_url'];
+                _writer.desc = res['bio'];
+                if(/github/.test(website.uri))_writer.location = res['location'];
+            });
+
             const query: IQuery = {
                 table: "Writer",
                 item: _writer

src/app/models.ts

@@ -48,6 +48,12 @@ export class Website extends Meta{
 
 @Entity()
 export class Writer extends Meta{
+    @Column({default: 0})
+    platformId: number;
+
+    @Column({default: ''})
+    htmlUrl: string;
+
     @Column({default: ''})
     name: string;