Compare commits
10
Commits
85ec0def1e
...
upstream
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
af2ac7043d | ||
|
|
240ae6cecc | ||
|
|
6cebe5780e | ||
|
|
857e63c326 | ||
|
|
9d535033cf | ||
|
|
1520e8d571 | ||
|
|
ad8ea6212c | ||
|
|
946d78f02a | ||
|
|
1867ae5c74 | ||
|
|
c65bc9b23d |
@@ -5,7 +5,7 @@ jobs:
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest, macOS-11]
|
||||
os: [ubuntu-latest, macOS-latest]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
#!/usr/bin/env sh
|
||||
yarn dist
|
||||
@@ -273,6 +273,7 @@ export class AdbClientService {
|
||||
p !== 'org.codeaurora.bluetooth' &&
|
||||
p !== 'com.facebook.wearable.system.location.proxy' &&
|
||||
p !== 'com.facebook.arvr.quillplayer' &&
|
||||
p !== 'com.facebook.orca' &&
|
||||
p !== 'com.facebook.wearable.system.location.service' &&
|
||||
p !== 'com.facebook.spatial_persistence_service' &&
|
||||
p !== 'meta.skymap.service'
|
||||
@@ -854,6 +855,7 @@ This can sometimes be caused by changes to your hosts file. Don't make changes u
|
||||
let obbBackupPath = this.appService.path.join(this.appService.backupPath, packageName, 'data', folderName, 'obb');
|
||||
if (this.appService.fs.existsSync(obbBackupPath)) {
|
||||
this.appService.fs.readdir(obbBackupPath, async (err, entries) => {
|
||||
await this.runAdbCommand('adb shell mkdir -p /sdcard/Android/obb/' + packageName, true);
|
||||
for (let i = 0; i < entries.length; i++) {
|
||||
await this.adbCommand(
|
||||
'push',
|
||||
@@ -1097,7 +1099,10 @@ This can sometimes be caused by changes to your hosts file. Don't make changes u
|
||||
if (task) {
|
||||
task.status = name + ': Transferring...';
|
||||
}
|
||||
let p: any = this.runAdbCommand('adb push "' + filepath + '" /sdcard/Android/obb/' + packageId + '/' + filename, true);
|
||||
const obbDirectory: string = '/sdcard/Android/obb/' + packageId;
|
||||
let p: any = this.runAdbCommand('adb shell mkdir -p ' + obbDirectory, true).then(() =>
|
||||
this.runAdbCommand('adb push "' + filepath + '" ' + obbDirectory + '/' + filename, true)
|
||||
);
|
||||
if (cb) {
|
||||
cb();
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<div class="inner-app-container">
|
||||
<div class="inner-app-container no-select">
|
||||
<div class="screen-description">Manage tasks for downloading, transferring and installing to your headset.</div>
|
||||
<div class="sync-songs">
|
||||
<div class="pure-material-button-contained spaced" data-position="bottom"
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
<div *ngIf="isConnected()" class="top-bar">
|
||||
<div *ngIf="isConnected()" class="top-bar no-drag">
|
||||
<nav class="pink lighten-2 breadcrumb-wrapper ">
|
||||
<div class="nav-wrapper inner-app-container">
|
||||
<div class="col s12 truncate">
|
||||
<a *ngFor="let breadcrumb of breadcrumbs; let i = index" href="javascript:void(0)" class="breadcrumb"
|
||||
<a *ngFor="let breadcrumb of breadcrumbs; let i = index" href="javascript:void(0)" class="breadcrumb no-drag"
|
||||
(click)="open('/'+breadcrumb.path)">{{breadcrumb.name}}<span *ngIf="i === breadcrumbs.length-1 && folderSize"> ({{folderSize}})</span> </a>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</div>
|
||||
<div class="inner-app-container files-section">
|
||||
<div class="inner-app-container files-section no-drag">
|
||||
<div *ngIf="!isConnected()" class="white-text">
|
||||
<br>You are not currently connected.
|
||||
<br><br>
|
||||
<div class="pure-material-button-contained" routerLink="/setup">Open Setup Instructions</div>
|
||||
</div>
|
||||
<div *ngIf="isConnected()">
|
||||
<div *ngIf="isConnected()" class="no-drag">
|
||||
<div *ngIf="!files.length">
|
||||
<h4 class="text-dark-theme">
|
||||
No files here...</h4>
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
<div class="beast-saber-buttons">
|
||||
<ng-container *ngFor="let favourite of appService.headerComponent.favourites.fileFavourites">
|
||||
<a href="javascript:void(0)" class="waves-effect waves-light synthrideerz margin-right"
|
||||
<a href="javascript:void(0)" class="waves-effect waves-light synthrideerz margin-right no-drag"
|
||||
(click)="appService.filesComponent.open(favourite.uri)"
|
||||
mTooltip [attr.data-tooltip]="favourite.name">
|
||||
<img *ngIf="favourite.icon" src="{{favourite.icon}}" class="responsive-img" /></a>
|
||||
@@ -73,11 +73,11 @@
|
||||
<li *ngIf="quickSaveSupported()" data-position="left" mTooltip data-tooltip="Save screenshots and recordings"
|
||||
(click)="downloadMediaModal.openModal()"><a class="btn-floating green"><i class="material-icons">get_app</i></a>
|
||||
</li>
|
||||
<li *ngIf="selectedFiles.length > 0" class="divider"></li>
|
||||
<li *ngIf="selectedFiles.length > 0" data-position="left" mTooltip data-tooltip="Delete selected items"
|
||||
<li [class.hidden]="selectedFiles.length === 0" class="divider"></li>
|
||||
<li [class.hidden]="selectedFiles.length === 0" data-position="left" mTooltip data-tooltip="Delete selected items"
|
||||
(click)="filesToBeDeleted = selectedFiles; confirmModal.openModal()"><a class="btn-floating red darken-2"><i
|
||||
class="material-icons">delete</i></a></li>
|
||||
<li *ngIf="selectedFiles.length > 0" data-position="left" mTooltip data-tooltip="Save selected items to computer"
|
||||
<li [class.hidden]="selectedFiles.length === 0" data-position="left" mTooltip data-tooltip="Save selected items to computer"
|
||||
(click)="filesToBeSaved = selectedFiles; filesModal.openModal()">
|
||||
<a class="btn-floating orange"><i class="material-icons">get_app</i></a>
|
||||
</li>
|
||||
|
||||
@@ -12,14 +12,17 @@
|
||||
height: 40px;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.drag-indicator{
|
||||
font-size: 2rem;
|
||||
line-height: 3rem;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.filename-padding-top{
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
.selected{
|
||||
background: #e93c96;
|
||||
border-radius: 10px;
|
||||
@@ -30,9 +33,14 @@
|
||||
margin-right: 0.5em;
|
||||
margin-left: 0.5em;
|
||||
}
|
||||
|
||||
.top-bar{
|
||||
direction: rtl;
|
||||
white-space: nowrap;
|
||||
text-align: left;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.hidden {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
<div class="sideenvironment {{headerClass}}">{{headerText}}</div>
|
||||
|
||||
<div class="title-menu-container">
|
||||
<div class="title-menu-container no-select">
|
||||
<div class="user-menu command-menu" #commandMenu>
|
||||
<div class="btn-flat waves-light waves-light full-width center-align white-text truncate"
|
||||
(click)="commandMenu.style.display = 'none';commandMenuBack.style.display = 'none';adbModal.openModal()"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
<div class="inner-app-container">
|
||||
<div class="inner-app-container no-select">
|
||||
<!-- <div class="screen-description">Manage settings on your headset.</div>
|
||||
<div class="divider divider-margin-top margin-bottom"></div> -->
|
||||
<div *ngIf="!adbService.isReady" class="diagnostics-inner white-text">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<div class="col s10 package-height chip-padding package-item">
|
||||
<div *ngIf="package.icon" [style.background-image]="'url(' + package.icon + ')'" class="app-icon circle"></div><span class="app-name">{{package.name?package.name:package.packageName}}</span>
|
||||
<div *ngIf="package.icon" [style.background-image]="'url(' + package.icon + ')'" class="app-icon circle"></div><span class="app-name select-text">{{package.name?package.name:package.packageName}}</span>
|
||||
</div>
|
||||
<div class="col s2 package-height centered package-item">
|
||||
<i class="material-icons cursor grey-text settings" (click)="openSettings()">settings</i>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<div class="inner-app-container">
|
||||
<div class="inner-app-container no-select">
|
||||
<div class="right">
|
||||
<div class="input-field search-width">
|
||||
<input id="SearchPackage" [(ngModel)]="search" type="text" class="no-margin" />
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<div class="relative">
|
||||
<div class="relative no-select">
|
||||
<div class="tab" [ngClass]="{'active': !isSupport}" (click)="isSupport = false">Setup Instructions</div>
|
||||
<div class="tab" [ngClass]="{'active': isSupport}" (click)="isSupport = true">Support Options</div>
|
||||
<!-- <div class="tab-underline"></div>-->
|
||||
</div>
|
||||
|
||||
<div class="inner-app-container text-dark-theme relative margin-top" *ngIf="isSupport">
|
||||
<div class="inner-app-container text-dark-theme relative margin-top no-select" *ngIf="isSupport">
|
||||
<app-connection-status #connectionStatus></app-connection-status>
|
||||
<div class="setup-container">
|
||||
<div class="screen-description">Get help and support from SideQuest.</div>
|
||||
@@ -33,7 +33,7 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="inner-app-container text-dark-theme relative inner-app-container-margin-top" *ngIf="!isSupport">
|
||||
<div class="inner-app-container text-dark-theme relative inner-app-container-margin-top no-select" *ngIf="!isSupport">
|
||||
<div class="pure-material-button-contained flat" [ngClass]="{'active': page === 1}" (click)="page = 1">Step 1: Create Org</div> >
|
||||
<div class="pure-material-button-contained flat" [ngClass]="{'active': page === 2}" (click)="page = 2">Step 2: Dev Mode</div> >
|
||||
<div class="pure-material-button-contained flat clearfix" [ngClass]="{'active': page === 3}" (click)="page = 3">Step 3: Connect</div>
|
||||
@@ -58,7 +58,7 @@
|
||||
To allow installing apps & games to your headset we need to enable developer mode. To do this,
|
||||
you have to be a registered "developer" on the Meta website, it's free, quick and easy. Open
|
||||
</ng-container>
|
||||
<a class="diagnosticator" (click)="open('https://developer.oculus.com/sign-up/ ')">developer.oculus.com/sign-up/</a>
|
||||
<a class="diagnosticator select-text" (click)="open('https://developer.oculus.com/sign-up/')">developer.oculus.com/sign-up/</a>
|
||||
<ng-container i18n>
|
||||
and create an 'organization'.
|
||||
You'll need to accept the developer agreement and to verify your account using either a credit card
|
||||
|
||||
@@ -276,6 +276,10 @@ code > pre, .code{
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.select-text {
|
||||
user-select: text;
|
||||
}
|
||||
|
||||
.no-drag {
|
||||
user-drag: none;
|
||||
-webkit-user-drag: none;
|
||||
|
||||
+38
-1
@@ -43,6 +43,38 @@ const makeDeferred = () => {
|
||||
return deferred;
|
||||
}
|
||||
|
||||
function isDropboxUrl(url: URL): boolean {
|
||||
const hostname = url.hostname.toLowerCase();
|
||||
return hostname === 'dropbox.com' || hostname.endsWith('.dropbox.com');
|
||||
}
|
||||
|
||||
function getRemoteApkDownloadUrl(apkPath: string): string {
|
||||
try {
|
||||
const url = new URL(apkPath);
|
||||
if (isDropboxUrl(url)) {
|
||||
url.searchParams.delete('raw');
|
||||
url.searchParams.set('dl', '1');
|
||||
}
|
||||
url.searchParams.set('t', Date.now().toString());
|
||||
return url.toString();
|
||||
} catch (e) {
|
||||
const separator = apkPath.indexOf('?') === -1 ? '?' : '&';
|
||||
return apkPath + separator + 't=' + Date.now();
|
||||
}
|
||||
}
|
||||
|
||||
function getUnsupportedApkResponseError(response: Response): string | null {
|
||||
const contentType = (response.headers.get('Content-Type') || '').toLowerCase();
|
||||
if (
|
||||
contentType.includes('text/html') ||
|
||||
contentType.includes('text/plain') ||
|
||||
contentType.includes('application/json')
|
||||
) {
|
||||
return 'Download did not return an APK file. The host returned ' + contentType + ' instead.';
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
export class ReadableStreamClone extends Readable {
|
||||
constructor(readableStream, options?) {
|
||||
super(options);
|
||||
@@ -254,11 +286,16 @@ class ADB {
|
||||
if (isLocal) {
|
||||
stream = fs.createReadStream(apkpath);
|
||||
} else {
|
||||
const response = await fetch(apkpath + '?t=' + Date.now());
|
||||
const response = await fetch(getRemoteApkDownloadUrl(apkpath));
|
||||
if (!response.ok || response.body == null) {
|
||||
console.log(response.statusText, response.status, response.headers);
|
||||
return ecb('Unable to fetch package');
|
||||
}
|
||||
const unsupportedResponseError = getUnsupportedApkResponseError(response);
|
||||
if (unsupportedResponseError) {
|
||||
console.log(unsupportedResponseError, response.statusText, response.status, response.headers);
|
||||
return ecb(unsupportedResponseError);
|
||||
}
|
||||
|
||||
let size = parseInt(response.headers.get('Content-Length') || '0', 10);
|
||||
if (size <= 0) {
|
||||
|
||||
+3
-2
@@ -1,16 +1,17 @@
|
||||
{
|
||||
"name": "SideQuest",
|
||||
"productName": "SideQuest",
|
||||
"version": "0.10.43",
|
||||
"version": "0.10.44",
|
||||
"description": "A open app store for mobile android based VR devices such as the Levovo Mirage, Oculus Go, Oculus Quest, Vive Focus.",
|
||||
"repository": "https://github.com/SideQuestVR/SideQuest.git",
|
||||
"license": "UNLICENCED",
|
||||
"author": "Shane Harris",
|
||||
"main": "build-electron/app.js",
|
||||
"main": "build-electron/app.js",
|
||||
"scripts": {
|
||||
"concurrently": "concurrently",
|
||||
"start": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev electron .\" \"cd desktop-app && ng serve --port 4205\"",
|
||||
"start:test": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=test electron .\" \"cd desktop-app && ng serve -c test --port 4205\"",
|
||||
"start:prod": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=production SQ_ENV_CFG=prod electron .\" \"cd desktop-app && ng serve -c test --port 4205\"",
|
||||
"start:sidetest": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=test electron .\" \"cd desktop-app && ng serve -c test --port 4205\"",
|
||||
"start:test2": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=test2 electron .\" \"cd desktop-app && ng serve -c test2 --port 4205\"",
|
||||
"start:local": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=local electron .\" \"cd desktop-app && ng serve -c local --port 4205\"",
|
||||
|
||||
Reference in New Issue
Block a user