MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 06:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upload screenshot to gallery

Browse Source
This commit is contained in:
Natsumi
2023-02-27 21:02:55 +13:00
parent a27f3f390e
commit 8b59e0fab1
5 changed files with 106 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
html/src/app.js
View File

@@ -20212,33 +20212,40 @@ speechSynthesis.getVoices();
var json = JSON.parse(metadata);
D.metadata = json;
// VRChat_3840x2160_2022-02-02_03-21-39.771
// VRChat_2023-02-16_10-39-25.274_3840x2160
var regex = json.fileName.match(
/VRChat_((\d{3,})x(\d{3,})_(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})\.(\d{1,})|(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})\.(\d{3})_(\d{3,})x(\d{3,}))/
);
if (regex) {
if (typeof regex[2] !== 'undefined') {
if (typeof regex[2] !== 'undefined' && regex[4].length === 4) {
// old format
// VRChat_3840x2160_2022-02-02_03-21-39.771
var date = `${regex[4]}-${regex[5]}-${regex[6]}`;
var time = `${regex[7]}:${regex[8]}:${regex[9]}`;
D.metadata.dateTime = Date.parse(`${date} ${time}`);
D.metadata.resolution = `${regex[2]}x${regex[3]}`;
} else if (typeof regex[11] !== 'undefined') {
// D.metadata.resolution = `${regex[2]}x${regex[3]}`;
} else if (
typeof regex[11] !== 'undefined' &&
regex[11].length === 4
) {
// new format
// VRChat_2023-02-16_10-39-25.274_3840x2160
var date = `${regex[11]}-${regex[12]}-${regex[13]}`;
var time = `${regex[14]}:${regex[15]}:${regex[16]}`;
D.metadata.dateTime = Date.parse(`${date} ${time}`);
D.metadata.resolution = `${regex[18]}x${regex[19]}`;
// D.metadata.resolution = `${regex[18]}x${regex[19]}`;
}
}
if (!D.metadata.dateTime) {
D.metadata.dateTime = Date.parse(json.creationDate);
}
this.showScreenshotMetadataDialog();
};
$app.data.screenshotMetadataDialog = {
visible: false,
metadata: {}
metadata: {},
isUploading: false
};
$app.methods.showScreenshotMetadataDialog = function () {
@@ -20270,6 +20277,40 @@ speechSynthesis.getVoices();
}
};
$app.methods.uploadScreenshotToGallery = function () {
var D = this.screenshotMetadataDialog;
if (D.metadata.fileSizeBytes > 10000000) {
$app.$message({
message: 'File size too large',
type: 'error'
});
return;
}
D.isUploading = true;
AppApi.GetFileBase64(D.metadata.filePath)
.then((base64Body) => {
API.uploadGalleryImage(base64Body)
.then((args) => {
$app.$message({
message: 'Gallery image uploaded',
type: 'success'
});
return args;
})
.finally(() => {
D.isUploading = false;
});
})
.catch((err) => {
$app.$message({
message: 'Failed to upload gallery image',
type: 'error'
});
console.error(err);
D.isUploading = false;
});
};
// YouTube API
$app.data.youTubeApiKey = '';
@@ -21475,6 +21516,9 @@ speechSynthesis.getVoices();
}
this.photonLastEvent7List = Date.parse(data.dt);
break;
case 'VrcxMessage':
this.eventVrcxMessage(data);
break;
case 'Ping':
if (!this.photonLoggingEnabled) {
this.photonLoggingEnabled = true;
@@ -21512,6 +21556,18 @@ speechSynthesis.getVoices();
$app.data.photonEventCount = 0;
$app.data.photonEventIcon = false;
$app.methods.eventVrcxMessage = function (data) {
console.log(data);
var entry = {
created_at: new Date().toJSON(),
type: 'Event',
data: data.Data
};
database.addGamelogEventToDatabase(entry);
this.queueGameLogNoty(entry);
this.addGameLog(entry);
};
$app.methods.photonEventPulse = function () {
this.photonEventCount++;
this.photonEventIcon = true;

6
html/src/index.pug
View File

@@ -3800,9 +3800,11 @@ html
el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="screenshotMetadataDialog" :visible.sync="screenshotMetadataDialog.visible" :title="$t('dialog.screenshot_metadata.header')" width="1050px")
div(v-if="screenshotMetadataDialog.visible")
el-button(size="small" icon="el-icon-folder-opened" @click="AppApi.OpenScreenshotFileDialog()") {{ $t('dialog.screenshot_metadata.browse') }}
span(v-if="!screenshotMetadataDialog.metadata.resolution" v-text="screenshotMetadataDialog.metadata.fileName" style="margin-left:5px")
el-button(v-if="API.currentUser.$isVRCPlus && screenshotMetadataDialog.metadata.filePath" size="small" icon="el-icon-upload2" @click="uploadScreenshotToGallery") {{ $t('dialog.screenshot_metadata.upload') }}
span(v-text="screenshotMetadataDialog.metadata.fileName" style="margin-left:5px")
br
span(v-if="screenshotMetadataDialog.metadata.dateTime" style="margin-left:5px") {{ screenshotMetadataDialog.metadata.dateTime | formatDate('long') }}
span(v-if="screenshotMetadataDialog.metadata.resolution" v-text="screenshotMetadataDialog.metadata.resolution" style="margin-left:5px")
span(v-if="screenshotMetadataDialog.metadata.fileResolution" v-text="screenshotMetadataDialog.metadata.fileResolution" style="margin-left:5px")
el-tag(v-if="screenshotMetadataDialog.metadata.fileSize" type="info" effect="plain" size="mini" style="margin-left:5px" v-text="screenshotMetadataDialog.metadata.fileSize")
br
location(v-if="screenshotMetadataDialog.metadata.world" :location="screenshotMetadataDialog.metadata.world.instanceId" :hint="screenshotMetadataDialog.metadata.world.name")

3
html/src/localization/strings/en.json
View File

@@ -1055,7 +1055,8 @@
},
"screenshot_metadata": {
"header": "Screenshot Metadata",
"browse": "Browse"
"browse": "Browse",
"upload": "Upload"
}
},
"prompt": {