Creepso/miru
1
0
Fork 0
mirror of https://github.com/ThaUnknown/miru.git synced 2026-04-14 00:20:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

subtitle parsing work, use nyaa proxy, standard for SO

Browse source
This commit is contained in:
ThaUnknown 2021-04-14 00:33:06 +02:00
parent ab1ec0b0a2
commit 24cdca08b8
5 changed files with 9282 additions and 5483 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/index.html
View file

@ -685,8 +685,7 @@
autocomplete="off" value="SubsPlease">
<datalist id="torrent4list">
<option value="SubsPlease">https://subsplease.org/rss/?r=</option>
<option value="Erai-raws">
https://miru.kirdow.com/request/?url=https://www.erai-raws.info/rss-</option>
<option value="Erai-raws">https://www.erai-raws.info/rss-</option>
</datalist>
</div>
<div class="input-group w-200 mb-10" data-toggle="tooltip" data-placement="top"

2
app/js/animeHandler.js
View file

@ -566,7 +566,7 @@ if (!('audioTracks' in HTMLVideoElement.prototype)) {
async function nyaaRss (media, episode) {
const frag = document.createDocumentFragment()
const ep = (media.status === 'FINISHED' && settings.torrent9) ? `"01-${media.episodes}"|"01~${media.episodes}"|"Batch"|"Complete"|"+${episode}+"|"+${episode}v"` : `"+${episode}+"|"+${episode}v"`
const url = new URL(`https://miru.kirdow.com/request/?url=https://nyaa.si/?page=rss$c=1_2$f=${settings.torrent3 === true ? 2 : 0}$s=seeders$o=desc$q=(${[...new Set(Object.values(media.title).concat(media.synonyms).filter(name => name != null))].join(')|(')})${ep}"${settings.torrent1}"-(${exclusions[userBrowser].join('|')})`)
const url = new URL(`https://meowinjapanese.cf/?page=rss&c=1_2&f=${settings.torrent3 === true ? 2 : 0}&s=seeders&o=desc&q=(${[...new Set(Object.values(media.title).concat(media.synonyms).filter(name => name != null))].join(')|(')})${ep}"${settings.torrent1}"-(${exclusions[userBrowser].join('|')})`)
res = await fetch(url)
await res.text().then((xmlTxt) => {
try {

31
app/js/player.js
View file

@ -170,11 +170,11 @@ Style: Default,${options.defaultSSAStyles || 'Roboto Medium,26,&H00FFFFFF,&H0000
}
if ('setPositionState' in navigator.mediaSession) this.video.addEventListener('timeupdate', () => this.updatePositionState())
this.subtitleExtensions = ['.srt', '.ass', '.vtt']
this.videoExtensions = ['.3g2', '.3gp', '.asf', '.avi', '.dv', '.flv', '.gxf', '.m2ts', '.m4a', '.m4b', '.m4p', '.m4r', '.m4v', '.mkv', '.mov', '.mp4', '.mpd', '.mpeg', '.mpg', '.mxf', '.nut', '.ogm', '.ogv', '.swf', '.ts', '.vob', '.webm', '.wmv', '.wtv']
this.videoFiles = undefined
this.updateDisplay()
this.currentTorrent = undefined
this.offlineTorrents = JSON.parse(localStorage.getItem('offlineTorrents')) || {}
// adds all offline store torrents to the client
Object.values(this.offlineTorrents).forEach(torrentID => this.offlineDownload(new Blob([new Uint8Array(torrentID)]), true))
@ -318,7 +318,6 @@ Style: Default,${options.defaultSSAStyles || 'Roboto Medium,26,&H00FFFFFF,&H0000
} else {
this.currentFile = this.videoFiles[0]
}
this.currentTorrent = torrent
this.video.src = `/app/webtorrent/${torrent.infoHash}/${encodeURI(this.currentFile.path)}`
this.video.load()
@ -364,7 +363,6 @@ Style: Default,${options.defaultSSAStyles || 'Roboto Medium,26,&H00FFFFFF,&H0000
if (this.subtitleData.fonts) this.subtitleData.fonts.forEach(file => URL.revokeObjectURL(file)) // ideally this should clean up after its been downloaded by the sw renderer, but oh well
this.controls.downloadFile.setAttribute('disabled', '')
this.currentFile = undefined
this.currentTorrent = undefined
this.video.poster = ''
// some attemt at cache clearing
this.video.pause()
@ -459,8 +457,9 @@ Style: Default,${options.defaultSSAStyles || 'Roboto Medium,26,&H00FFFFFF,&H0000
if (this.videoFiles?.indexOf(this.currentFile) < this.videoFiles?.length) {
const nowPlaying = this.nowPlaying
nowPlaying.episodeNumber += 1
const torrent = this.currentFile._torrent
this.cleanupVideo()
this.buildVideo(this.currentTorrent, { media: nowPlaying, file: this.videoFiles[this.videoFiles.indexOf(this.currentFile) + 1] })
this.buildVideo(torrent, { media: nowPlaying, file: this.videoFiles[this.videoFiles.indexOf(this.currentFile) + 1] })
} else {
if (this.onNext) this.onNext()
}
@ -664,11 +663,11 @@ Style: Default,${options.defaultSSAStyles || 'Roboto Medium,26,&H00FFFFFF,&H0000
}
updateDisplay () {
if (this.currentTorrent && this.currentFile) {
if (this.currentFile && this.currentFile._torrent) {
this.player.style.setProperty('--download', this.currentFile.progress * 100 + '%')
this.controls.peers.dataset.value = this.currentTorrent.numPeers
this.controls.downSpeed.dataset.value = this.prettyBytes(this.currentTorrent.downloadSpeed) + '/s'
this.controls.upSpeed.dataset.value = this.prettyBytes(this.currentTorrent.uploadSpeed) + '/s'
this.controls.peers.dataset.value = this.currentFile._torrent.numPeers
this.controls.downSpeed.dataset.value = this.prettyBytes(this.currentFile._torrent.downloadSpeed) + '/s'
this.controls.upSpeed.dataset.value = this.prettyBytes(this.currentFile._torrent.uploadSpeed) + '/s'
}
setTimeout(() => requestAnimationFrame(() => this.updateDisplay()), 200)
}
@ -875,8 +874,17 @@ Style: Default,${options.defaultSSAStyles || 'Roboto Medium,26,&H00FFFFFF,&H0000
return subtitles
}
findSubtitles (targetFile) {
const path = targetFile.path.split(targetFile.name)[0]
const subtitleFiles = []
for (const file of targetFile.torrent_.files.filter(file => this.subtitleExtensions.some(ext => file.name.endsWith(ext)))) {
const split = file.split(path)
if (split.length === 2) subtitleFiles.push(file)
}
}
async downloadFile () {
if (this.currentFile?.done && !this.currentTorrent.store.store._store) {
if (this.currentFile?.done && !this.currentFile._torrent.store.store._store) {
this.currentFile.getBlobURL((err, url) => {
if (err) throw err
const a = document.createElement('a')
@ -896,7 +904,7 @@ Style: Default,${options.defaultSSAStyles || 'Roboto Medium,26,&H00FFFFFF,&H0000
if (this.generateThumbnails) {
this.finishThumbnails(this.video.src)
}
if (!this.currentTorrent.store.store._store) { // only allow download from RAM
if (!this.currentFile._torrent.store.store._store) { // only allow download from RAM
this.controls.downloadFile.removeAttribute('disabled')
}
}
@ -1043,8 +1051,7 @@ const client = new TorrentPlayer({
fillType: ''
})
},
onWatched: () => { // TODO: fix
console.log('ran')
onWatched: () => {
if (client.nowPlaying.media?.episodes || client.nowPlaying.media?.nextAiringEpisode?.episode) {
if (settings.other2 && (client.nowPlaying.media?.episodes || client.nowPlaying.media?.nextAiringEpisode?.episode > client.nowPlaying.episodeNumber)) {
alEntry()

14665
app/js/subtitles-octopus-worker.js
View file

File diff suppressed because one or more lines are too long

64
request/index.php
View file

@ -1,64 +0,0 @@
<?php
error_reporting(0);
header("Access-Control-Allow-Origin: https://mirumoe.netlify.app");
$url = str_replace("$", "&", $_GET['url']);
if (substr($url, 0, 25) === "https://nyaa.si/?page=rss")
{
$query = explode("?page=rss", $url) [1];
$query_check = basename(realpath($query));
if ($query_check === "") {
if (strpos($query, '/') === false) {
$cache_file = './cache_nyaa/' . $query;
//echo $url.'\n';
//echo $cache_file.'\n';
if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 60 * 1)))
{
// Cache file is less than five minutes old.
// Don't bother refreshing, just use the file as-is.
$file = file_get_contents($cache_file);
header('Content-Type: text/xml');
//echo 'case fucking 1';
echo $file;
}
else
{
// Our cache is out-of-date, so load the data from our remote server,
// and also save it over our cache for next time.
$file = file_get_contents(str_replace(" ", "+", $url));
file_put_contents($cache_file, $file, LOCK_EX);
header('Content-Type: text/xml');
// echo 'case fucking 2';
echo $file;
}
}
}
}
elseif (substr($url, 0, 31) === "https://www.erai-raws.info/rss-") {
$query = explode("https://www.erai-raws.info/rss-", $url) [1];
$query_check = basename(realpath($query));
if ($query_check === "") {
if (strpos($query, '/') === false) {
$cache_file = './cache_erai/' . $query;
// echo $url.'\n';
// echo $cache_file.'\n';
if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 60 * 1))) {
// Cache file is less than five minutes old.
// Don't bother refreshing, just use the file as-is.
$file = file_get_contents($cache_file);
header('Content-Type: text/xml');
//echo 'case fucking 1';
echo $file;
}
else {
// Our cache is out-of-date, so load the data from our remote server,
// and also save it over our cache for next time.
$file = file_get_contents(str_replace(" ", "+", $url));
file_put_contents($cache_file, $file, LOCK_EX);
header('Content-Type: text/xml');
// echo 'case fucking 2';
echo $file;
}
}
}
}
?>