@ -1,12 +1,11 @@
import { PluginClient } from "@remixproject/plugin" ; import { Profile } from '@remixproject/plugin-utils'
import { Profile } from "@remixproject/plugin-utils" ; import { ElectronBasePlugin , ElectronBasePluginClient } from '@remixproject/plugin-electron'
import { ElectronBasePlugin , ElectronBasePluginClient } from "@remixproject/plugin-electron"
import fs from 'fs/promises' import fs from 'fs/promises'
import git from 'isomorphic-git' import git from 'isomorphic-git'
import { dialog } from "electron" ;
import http from 'isomorphic-git/http/web' import http from 'isomorphic-git/http/web'
import { gitProxy } from "../tools/git" ; import { gitProxy } from '../tools/git'
import { remote } from "../types" ; import { isoGit } from '@remix-git'
import { branchDifference , branchInputType , checkoutInputType , cloneInputType , commitChange , commitInputType , compareBranchesInput , currentBranchInput , fetchInputType , initInputType , logInputType , pullInputType , pushInputType , remote , resolveRefInput , statusInput } from '@remix-api'
const profile : Profile = { const profile : Profile = {
name : 'isogit' , name : 'isogit' ,
@ -14,7 +13,7 @@ const profile: Profile = {
description : 'isogit plugin' , description : 'isogit plugin' ,
} }
// used in e2e tests
// used in e2e tests
const useIsoGit = process . argv . includes ( '--useIsoGit' ) ; const useIsoGit = process . argv . includes ( '--use-isogit' )
export class IsoGitPlugin extends ElectronBasePlugin { export class IsoGitPlugin extends ElectronBasePlugin {
clients : IsoGitPluginClient [ ] = [ ] clients : IsoGitPluginClient [ ] = [ ]
constructor ( ) { constructor ( ) {
@ -22,33 +21,18 @@ export class IsoGitPlugin extends ElectronBasePlugin {
} }
startClone ( webContentsId : any ) : void { startClone ( webContentsId : any ) : void {
const client = this . clients . find ( c = > c . webContentsId === webContentsId ) const client = this . clients . find ( ( c ) = > c . webContentsId === webContentsId )
if ( client ) { if ( client ) {
client . startClone ( ) client . startClone ( )
} }
} }
} }
const parseInput = ( input : any ) = > {
return {
corsProxy : 'https://corsproxy.remixproject.org/' ,
http ,
onAuth : ( url : any ) = > {
url
const auth = {
username : input.token ,
password : ''
}
return auth
}
}
}
const clientProfile : Profile = { const clientProfile : Profile = {
name : 'isogit' , name : 'isogit' ,
displayName : 'isogit' , displayName : 'isogit' ,
description : 'isogit plugin' , description : 'isogit plugin' ,
methods : [ 'init' , 'localStorageUsed' , 'version' , 'addremote' , 'delremote' , 'remotes' , 'fetch' , 'clone' , 'export' , 'import' , 'status' , 'log' , 'commit' , 'add' , 'remove' , 'reset' , 'r m' , 'lsfiles ' , 'readblob' , 'resolveref' , 'branches' , 'branch' , 'checkout' , 'currentbranch' , 'push' , 'pin' , 'pull' , 'pinList' , 'unPin' , 'setIpfsConfig' , 'zip' , 'setItem' , 'getItem' , 'openFolder' ] methods : [ 'init' , 'localStorageUsed' , 'version' , 'addremote' , 'delremote' , 'remotes' , 'fetch' , 'clone' , 'export' , 'import' , 'status' , 'log' , 'commit' , 'add' , 'remove' , 'rm' , 'readblob' , 'resolveref' , 'branches' , 'branch' , 'checkout' , 'currentbranch' , 'push' , 'pin' , 'pull' , 'pinList' , 'unPin' , 'setIpfsConfig' , 'zip' , 'setItem' , 'getItem' , 'openFolder' , 'getCommitChanges' , 'compareBranches' , 'startClone' , 'updateSubmodules' ] ,
} }
class IsoGitPluginClient extends ElectronBasePluginClient { class IsoGitPluginClient extends ElectronBasePluginClient {
@ -59,15 +43,15 @@ class IsoGitPluginClient extends ElectronBasePluginClient {
this . onload ( async ( ) = > { this . onload ( async ( ) = > {
this . on ( 'fs' as any , 'workingDirChanged' , async ( path : string ) = > { this . on ( 'fs' as any , 'workingDirChanged' , async ( path : string ) = > {
this . workingDir = path this . workingDir = path
this . gitIsInstalled = await gitProxy . version ( ) ? true : false this . gitIsInstalled = ( await gitProxy . version ( ) ) && ! useIsoGit ? true : false
} ) } )
this . workingDir = await this . call ( 'fs' as any , 'getWorkingDir' ) this . workingDir = await this . call ( 'fs' as any , 'getWorkingDir' )
this . gitIsInstalled = await gitProxy . version ( ) && ! useIsoGit ? true : false this . gitIsInstalled = ( await gitProxy . version ( ) ) && ! useIsoGit ? true : false
} ) } )
} }
async version() { async version() {
return gitProxy . version ( ) return this . gitIsInstalled ? gitProxy . version ( ) : 'built-in'
} }
async getGitConfig() { async getGitConfig() {
@ -77,13 +61,12 @@ class IsoGitPluginClient extends ElectronBasePluginClient {
} }
} }
async status ( cmd : any ) { async status ( cmd : statusInput ) {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
throw new Error ( 'No working directory' ) throw new Error ( 'No working directory' )
} }
if ( this . workingDir === '' ) { if ( this . workingDir === '' ) {
return [ ] return [ ]
} }
@ -94,30 +77,25 @@ class IsoGitPluginClient extends ElectronBasePluginClient {
} }
const status = await git . statusMatrix ( { const status = await git . statusMatrix ( {
. . . await this . getGitConfig ( ) , . . . ( await this . getGitConfig ( ) ) ,
. . . cmd . . . cmd ,
} ) } )
//console.log('STATUS', status, await this.getGitConfig())
return status return status
} }
async log ( cmd : any ) { async log ( cmd : logInputType ) {
/ * w e w i l l u s e i s o m o r p h i c g i t f o r n o w const token = await this . call ( 'config' as any , 'getAppParameter' , 'settings/gist-access-token' )
if ( this . gitIsInstalled ) {
const log = await gitProxy . log ( this . workingDir , cmd . ref )
console . log ( 'LOG' , log )
return log
}
* /
if ( this . workingDir === '' ) { if ( this . workingDir === '' ) {
return [ ] return [ ]
} }
const log = await git . log ( { const log = await git . log ( {
. . . await this . getGitConfig ( ) , . . . ( await this . getGitConfig ( ) ) ,
. . . cmd . . . cmd ,
depth : cmd.depth || 10 ,
} ) } )
return log return log
@ -129,62 +107,45 @@ class IsoGitPluginClient extends ElectronBasePluginClient {
} }
const add = await git . add ( { const add = await git . add ( {
. . . await this . getGitConfig ( ) , . . . ( await this . getGitConfig ( ) ) ,
. . . cmd . . . cmd ,
} ) } )
return add return add
} }
async rm ( cmd : any ) { async rm ( cmd : any ) {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
throw new Error ( 'No working directory' ) throw new Error ( 'No working directory' )
} }
const rm = await git . remove ( { const rm = await git . remove ( {
. . . await this . getGitConfig ( ) , . . . ( await this . getGitConfig ( ) ) ,
. . . cmd . . . cmd ,
} ) } )
return rm return rm
} }
async reset ( cmd : any ) { async commit ( cmd : commitInputType ) {
if ( ! this . workingDir || this . workingDir === '' ) {
throw new Error ( 'No working directory' )
}
const reset = await git . resetIndex ( {
. . . await this . getGitConfig ( ) ,
. . . cmd
} )
return reset
}
async commit ( cmd : any ) {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
throw new Error ( 'No working directory' ) throw new Error ( 'No working directory' )
} }
if ( this . gitIsInstalled ) { if ( this . gitIsInstalled ) {
const status = await gitProxy . commit ( this . workingDir , cmd . message ) const status = await gitProxy . commit ( this . workingDir , cmd )
return status return status
} }
const commit = await git . commit ( { const commit = await git . commit ( {
. . . await this . getGitConfig ( ) , . . . ( await this . getGitConfig ( ) ) ,
. . . cmd . . . cmd ,
} ) } )
return commit return commit
} }
async init ( input : any ) { async init ( input : initInputType ) {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
throw new Error ( 'No working directory' ) throw new Error ( 'No working directory' )
} }
@ -193,158 +154,119 @@ class IsoGitPluginClient extends ElectronBasePluginClient {
return status return status
} }
await git . init ( { await git . init ( {
. . . await this . getGitConfig ( ) , . . . ( await this . getGitConfig ( ) ) ,
defaultBranch : ( input && input . b ranch) || 'main' defaultBranch : ( input && input . defaultB ranch) || 'main' ,
} ) } )
} }
async branch ( cmd : any ) { async branch ( cmd : br anchInputT ype ) {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
return null return null
} }
const branch = await git . branch ( { const branch = await git . branch ( {
. . . await this . getGitConfig ( ) , . . . ( await this . getGitConfig ( ) ) ,
. . . cmd . . . cmd ,
} ) } )
return branch return branch
} }
async lsfiles ( cmd : any ) { async resolveref ( cmd : resolveRefInput ) {
if ( ! this . workingDir || this . workingDir === '' ) {
return [ ]
}
const lsfiles = await git . listFiles ( {
. . . await this . getGitConfig ( ) ,
. . . cmd
} )
return lsfiles
}
async resolveref ( cmd : any ) {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
return null return null
} }
const resolveref = await git . resolveRef ( { const resolveref = await git . resolveRef ( {
. . . await this . getGitConfig ( ) , . . . ( await this . getGitConfig ( ) ) ,
. . . cmd . . . cmd ,
} ) } )
return resolveref return resolveref
} }
async readblob ( cmd : any ) { async readblob ( cmd : any ) {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
throw new Error ( 'No working directory' ) throw new Error ( 'No working directory' )
} }
const readblob = await git . readBlob ( { const readblob = await git . readBlob ( {
. . . await this . getGitConfig ( ) , . . . ( await this . getGitConfig ( ) ) ,
. . . cmd . . . cmd ,
} ) } )
return readblob return readblob
} }
async checkout ( cmd : any ) { async checkout ( cmd : checkoutInputType ) {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
throw new Error ( 'No working directory' ) throw new Error ( 'No working directory' )
} }
if ( this . gitIsInstalled ) {
const checkout = await git . checkout ( { return await gitProxy . checkout ( this . workingDir , cmd )
. . . await this . getGitConfig ( ) , } else {
. . . cmd const checkout = await git . checkout ( {
} ) . . . ( await this . getGitConfig ( ) ) ,
. . . cmd ,
return checkout } )
return checkout
}
} }
async push ( cmd : any ) { async push ( input : pushInputType ) {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
throw new Error ( 'No working directory' ) throw new Error ( 'No working directory' )
} }
if ( this . gitIsInstalled ) { if ( this . gitIsInstalled ) {
await gitProxy . push ( this . workingDir , cmd . remote , cmd . ref , cmd . remoteRef , cmd . force ) return await gitProxy . push ( this . workingDir , input )
} else { } else {
const push = await isoGit . push ( input , await this . getGitConfig ( ) , this )
const push = await git . push ( {
. . . await this . getGitConfig ( ) ,
. . . cmd ,
. . . parseInput ( cmd . input )
} )
return push return push
} }
} }
async pull ( cmd : any ) { async pull ( input : pullInputType ) {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
throw new Error ( 'No working directory' ) throw new Error ( 'No working directory' )
} }
if ( this . gitIsInstalled ) { if ( this . gitIsInstalled ) {
await gitProxy . pull ( this . workingDir , cmd . remote , cmd . ref , cmd . remoteRef ) return await gitProxy . pull ( this . workingDir , input )
} else { } else {
const pull = await isoGit . pull ( input , await this . getGitConfig ( ) , this )
const pull = await git . pull ( {
. . . await this . getGitConfig ( ) ,
. . . cmd ,
. . . parseInput ( cmd . input )
} )
return pull return pull
} }
} }
async fetch ( cmd : any ) { async fetch ( input : fetchInputType ) {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
throw new Error ( 'No working directory' ) throw new Error ( 'No working directory' )
} }
if ( this . gitIsInstalled ) { if ( this . gitIsInstalled ) {
await gitProxy . fetch ( this . workingDir , cmd . remote , cmd . remoteRef ) await gitProxy . fetch ( this . workingDir , input )
} else { } else {
const fetch = await isoGit . fetch ( input , await this . getGitConfig ( ) , this )
const fetch = await git . fetch ( {
. . . await this . getGitConfig ( ) ,
. . . cmd ,
. . . parseInput ( cmd . input )
} )
return fetch return fetch
} }
} }
async clone ( cmd : any ) { async clone ( cmd : cloneInputType ) {
if ( this . gitIsInstalled ) { if ( this . gitIsInstalled ) {
try { try {
await gitProxy . clone ( cmd . url , cmd . dir ) this . call ( 'terminal' as any , 'log' , 'Cloning using git... please wait.' )
await gitProxy . clone ( cmd )
} catch ( e ) { } catch ( e ) {
throw e throw e
} }
} else { } else {
try { try {
this . call ( 'terminal' as any , 'log' , 'Cloning using builtin git... please wait.' ) this . call ( 'terminal' as any , 'log' , 'Cloning using builtin git... please wait.' )
const clone = await git . clone ( { const clone = await isoGit . clone ( cmd , await this . getGitConfig ( ) , this )
. . . await this . getGitConfig ( ) ,
. . . cmd ,
. . . parseInput ( cmd . input ) ,
dir : cmd.dir || this . workingDir
} )
return clone return clone
} catch ( e ) { } catch ( e ) {
console . log ( 'CLONE ERROR' , e ) console . log ( 'CLONE ERROR' , e )
@ -353,85 +275,74 @@ class IsoGitPluginClient extends ElectronBasePluginClient {
} }
} }
async addremote ( cmd : any ) { async addremote ( input : remote ) {
const addremote = await git . addRemote ( { const addremote = await git . addRemote ( {
. . . await this . getGitConfig ( ) , . . . ( await this . getGitConfig ( ) ) ,
. . . cmd url : input.url ,
remote : input.name ,
} ) } )
return addremote return addremote
} }
async delremote ( cmd : any ) { async delremote ( input : remote ) {
const delremote = await git . deleteRemote ( { const delremote = await git . deleteRemote ( {
. . . await this . getGitConfig ( ) , . . . ( await this . getGitConfig ( ) ) ,
. . . cmd remote : input.name ,
} ) } )
return delremote return delremote
} }
async remotes() {
remotes = async ( ) = > {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
return [ ] return [ ]
} }
let remotes : remote [ ] = [ ] const defaultConfig = await this . getGitConfig ( )
remotes = ( await git . listRemotes ( { . . . await this . getGitConfig ( ) } ) ) . map ( ( remote ) = > { return { name : remote.remote , url : remote.url } } return await isoGit . remotes ( defaultConfig )
)
return remotes
} }
async currentbranch() { async currentbranch ( input : currentBranchInput ) {
if ( ! this . workingDir || this . workingDir === '' ) {
return ''
}
try {
const defaultConfig = await this . getGitConfig ( )
const name = await git . currentBranch ( defaultConfig )
return name if ( ! this . workingDir || this . workingDir === '' ) {
} catch ( e ) {
return '' return ''
} }
const defaultConfig = await this . getGitConfig ( )
return await isoGit . currentbranch ( input , defaultConfig )
} }
async branches ( config : any ) {
async branches() {
if ( ! this . workingDir || this . workingDir === '' ) { if ( ! this . workingDir || this . workingDir === '' ) {
return [ ] return [ ]
} }
try {
let cmd : any = { . . . await this . getGitConfig ( ) }
const remotes = await this . remotes ( )
let branches = [ ]
branches = ( await git . listBranches ( cmd ) ) . map ( ( branch ) = > { return { remote : undefined , name : branch } } )
for ( const remote of remotes ) {
cmd = {
. . . cmd ,
remote : remote.name
}
const remotebranches = ( await git . listBranches ( cmd ) ) . map ( ( branch ) = > { return { remote : remote.name , name : branch } } )
branches = [ . . . branches , . . . remotebranches ]
}
return branches const defaultConfig = await this . getGitConfig ( )
} catch ( e ) { return await isoGit . branches ( defaultConfig )
return [ ]
}
} }
async startClone() { async startClone() {
this . call ( 'filePanel' as any , 'clone' ) this . call ( 'filePanel' as any , 'clone' )
} }
} async getCommitChanges ( commitHash1 : string , commitHash2 : string ) : Promise < commitChange [ ] > {
return await isoGit . getCommitChanges ( commitHash1 , commitHash2 , await this . getGitConfig ( ) )
}
async compareBranches ( { branch , remote } : compareBranchesInput ) : Promise < branchDifference > {
return await isoGit . compareBranches ( { branch , remote } , await this . getGitConfig ( ) )
}
async updateSubmodules ( input ) {
if ( this . gitIsInstalled ) {
try {
return await gitProxy . updateSubmodules ( this . workingDir )
} catch ( e ) {
throw e
}
} else {
this . call ( 'terminal' , 'log' , { type : 'error' , value : 'Please install git into your OS to use this functionality...' } )
}
}
}
STetsing
5 months ago