From 83d0c9ba9af272fff4297837107b15141ee55f35 Mon Sep 17 00:00:00 2001 From: difegue Date: Mon, 25 Apr 2022 21:20:45 +0200 Subject: [PATCH 01/88] DIsable live nH tests due to cloudflare. Too bad! --- lib/LANraragi/Plugin/Metadata/nHentai.pm | 57 +++++++++++-------- tests/plugins.t | 20 +++---- .../installing-lanraragi/windows.md | 22 ------- 3 files changed, 42 insertions(+), 57 deletions(-) diff --git a/lib/LANraragi/Plugin/Metadata/nHentai.pm b/lib/LANraragi/Plugin/Metadata/nHentai.pm index 861cd37be..e8db69cad 100644 --- a/lib/LANraragi/Plugin/Metadata/nHentai.pm +++ b/lib/LANraragi/Plugin/Metadata/nHentai.pm @@ -18,12 +18,13 @@ sub plugin_info { return ( #Standard metadata - name => "nHentai", - type => "metadata", - namespace => "nhplugin", - author => "Difegue", - version => "1.7.1", - description => "Searches nHentai for tags matching your archive.
Supports reading the ID from files formatted as \"{Id} Title\" and if not, tries to search for a matching gallery.", + name => "nHentai", + type => "metadata", + namespace => "nhplugin", + author => "Difegue", + version => "1.7.1", + description => + "Searches nHentai for tags matching your archive.
Supports reading the ID from files formatted as \"{Id} Title\" and if not, tries to search for a matching gallery.", icon => "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA\nB3RJTUUH4wYCFA8s1yKFJwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUH\nAAACL0lEQVQ4y6XTz0tUURQH8O+59773nLFcaGWTk4UUVCBFiJs27VxEQRH0AyRo4x8Q/Qtt2rhr\nU6soaCG0KYKSwIhMa9Ah+yEhZM/5oZMG88N59717T4sxM8eZCM/ycD6Xwznn0pWhG34mh/+PA8mk\n8jO5heziP0sFYwfgMDFQJg4IUjmquSFGG+OIlb1G9li5kykgTgvzSoUCaIYlo8/Igcjpj5wOkARp\n8AupP0uzJLijCY4zzoXOxdBLshAgABr8VOp7bpAXDEI7IBrhdksnjNr3WzI4LaIRV9fk2iAaYV/y\nA1dPiYjBAALgpQxnhV2XzTCAGWGeq7ACBvCdzKQyTH+voAm2hGlpcmQt2Bc2K+ymAhWPxTzPDQLt\nOKo1FiNBQaArq9WNRQwEgKl7XQ1duzSRSn/88vX0qf7DPQddx1nI5UfHxt+m0sLYPiP3shRAG8MD\nok1XEEXR/EI2ly94nrNYWG6Nx0/2Hp2b94dv34mlZge1e4hVCJ4jc6tl9ZP803n3/i4lpdyzq2N0\n7M3DkSeF5ZVYS8v1qxcGz5+5eey4nPDbmGdE9FpGeWErVNe2tTabX3r0+Nk3PwOgXFkdfz99+exA\nMtFZITEt9F23mpLG0hYTVQCKpfKPlZ/rqWKpYoAPcTmpginW76QBbb0OBaBaDdjaDbNlJmQE3/d0\nMYoaybU9126oPkrEhpr+U2wjtoVVGBowkslEsVSupRKdu0Mduq7q7kqExjSS3V2dvwDLavx0eczM\neAAAAABJRU5ErkJggg==", parameters => [ { type => "bool", desc => "Save archive title" } ], @@ -49,10 +50,12 @@ sub get_tags { $galleryID = $1; $logger->debug("Skipping search and using gallery $galleryID from oneshot args"); } elsif ( $lrr_info->{existing_tags} =~ /.*source:\s*(?:https?:\/\/)?nhentai\.net\/g\/([0-9]*).*/gi ) { + # Matching URL Scheme like 'https://' is only for backward compatible purpose. $galleryID = $1; - $logger->debug("Skipping search and using gallery $galleryID from source tag") + $logger->debug("Skipping search and using gallery $galleryID from source tag"); } else { + #Get Gallery ID by hand if the user didn't specify a URL $galleryID = get_gallery_id_from_title( $lrr_info->{archive_title} ); } @@ -74,7 +77,7 @@ sub get_tags { my %hashdata = get_tags_from_NH( $galleryID, $savetitle ); - $logger->info("Sending the following tags to LRR: " . $hashdata{tags}); + $logger->info( "Sending the following tags to LRR: " . $hashdata{tags} ); #Return a hash containing the new metadata - it will be integrated in LRR. return %hashdata; @@ -87,7 +90,7 @@ sub get_tags { #Uses the website's search to find a gallery and returns its content. sub get_gallery_dom_by_title { - my ( $title ) = @_; + my ($title) = @_; my $logger = get_plugin_logger(); @@ -100,8 +103,9 @@ sub get_gallery_dom_by_title { my $ua = Mojo::UserAgent->new; my $res = $ua->get($URL)->result; + $logger->debug( "Got response " . $res->body ); - if ($res->is_error) { + if ( $res->is_error ) { return; } @@ -110,7 +114,7 @@ sub get_gallery_dom_by_title { sub get_gallery_id_from_title { - my ( $title ) = @_; + my ($title) = @_; my $logger = get_plugin_logger(); @@ -122,11 +126,14 @@ sub get_gallery_id_from_title { my $dom = get_gallery_dom_by_title($title); if ($dom) { + # Get the first gallery url of the search results - my $gURL = ( $dom->at('.cover') ) - ? $dom->at('.cover')->attr('href') - : ""; + my $gURL = + ( $dom->at('.cover') ) + ? $dom->at('.cover')->attr('href') + : ""; + $logger->debug("Got $gURL from parsing."); if ( $gURL =~ /\/g\/(\d*)\//gm ) { return $1; } @@ -138,14 +145,14 @@ sub get_gallery_id_from_title { # retrieves html page from NH sub get_html_from_NH { - my ( $gID ) = @_; + my ($gID) = @_; my $URL = "https://nhentai.net/g/$gID/"; my $ua = Mojo::UserAgent->new; my $res = $ua->get($URL)->result; - if ($res->is_error) { + if ( $res->is_error ) { return; } @@ -156,7 +163,7 @@ sub get_html_from_NH { #It's located under a N.gallery JS object. sub get_json_from_html { - my ( $html ) = @_; + my ($html) = @_; my $logger = get_plugin_logger(); @@ -178,20 +185,20 @@ sub get_json_from_html { sub get_tags_from_json { - my ( $json ) = @_; + my ($json) = @_; my @json_tags = @{ $json->{"tags"} }; - my @tags = (); + my @tags = (); foreach my $tag (@json_tags) { my $namespace = $tag->{"type"}; - my $name = $tag->{"name"}; + my $name = $tag->{"name"}; if ( $namespace eq "tag" ) { - push ( @tags, $name ); + push( @tags, $name ); } else { - push ( @tags, "$namespace:$name" ); + push( @tags, "$namespace:$name" ); } } @@ -199,7 +206,7 @@ sub get_tags_from_json { } sub get_title_from_json { - my ( $json ) = @_; + my ($json) = @_; return $json->{"title"}{"pretty"}; } @@ -212,12 +219,12 @@ sub get_tags_from_NH { my $html = get_html_from_NH($gID); my $json = get_json_from_html($html); - if ( $json ) { + if ($json) { my @tags = get_tags_from_json($json); push( @tags, "source:nhentai.net/g/$gID" ) if ( @tags > 0 ); # Use NH's "pretty" names (romaji titles without extraneous data we already have like (Event)[Artist], etc) - $hashdata{tags} = join(', ', @tags); + $hashdata{tags} = join( ', ', @tags ); $hashdata{title} = get_title_from_json($json) if ($savetitle); } diff --git a/tests/plugins.t b/tests/plugins.t index 6e5f7c99f..9e8f46a5e 100644 --- a/tests/plugins.t +++ b/tests/plugins.t @@ -47,19 +47,19 @@ note("E-Hentai Tests"); isa_ok( $test_eH_json->{gmetadata}[0]{tags}, 'ARRAY', 'type of tags' ); } -note("nHentai Tests"); +note("nHentai Tests : Disabled due to cloudflare being used on nH"); -{ - my $nH_gID = "52249"; - my $test_nH_gID = trap { LANraragi::Plugin::Metadata::nHentai::get_gallery_id_from_title("\"Pieces 1\" shirow"); }; - - is( $test_nH_gID, $nH_gID, 'nHentai search test' ); +# { +# my $nH_gID = "52249"; +# my $test_nH_gID = LANraragi::Plugin::Metadata::nHentai::get_gallery_id_from_title("\"Pieces 1\" shirow"); +# +# is( $test_nH_gID, $nH_gID, 'nHentai search test' ); - my %nH_hashdata = trap { LANraragi::Plugin::Metadata::nHentai::get_tags_from_NH( $nH_gID, 1 ) }; +# my %nH_hashdata = trap { LANraragi::Plugin::Metadata::nHentai::get_tags_from_NH( $nH_gID, 1 ) }; - ok( length $nH_hashdata{tags} > 0, 'nHentai API Tag retrieval test' ); - ok( length $nH_hashdata{title} > 0, 'nHentai title test' ); -} +# ok( length $nH_hashdata{tags} > 0, 'nHentai API Tag retrieval test' ); +# ok( length $nH_hashdata{title} > 0, 'nHentai title test' ); +# } note("Chaika Tests"); diff --git a/tools/Documentation/installing-lanraragi/windows.md b/tools/Documentation/installing-lanraragi/windows.md index 920490af5..6c715fe1d 100644 --- a/tools/Documentation/installing-lanraragi/windows.md +++ b/tools/Documentation/installing-lanraragi/windows.md @@ -39,28 +39,6 @@ Once the install completes properly, you'll be able to launch the GUI from the s ![](../.screenshots/karen-startmenu.png) -## Installation on Windows 10 1809 (LTSC) - -Recent MSI packages don't install on 1809 anymore due to underlying changes to make the installer lighter, but you can still sideload the latest server version on top of an old 0.7.9 install. - -{% hint style="warning" %} -This method shouldn't break in the foreseeable future, but as the Win32 bootstrapper will still be the 0.7.9 version, you might lose out on future functionalities later on. -You might want to consider switching to a [source install](./source.md) on top of a Debian WSL distro you'd maintain yourself. -{% endhint %} - -1. Install 0.7.9 like normal, this is mostly done to get the Win32 UI application installed on to your taskbar, we'll install the updated Linux image next. -2. If you started the service and the Windows application, make sure to close BOTH. -3. Download the [MSI installer for the latest version](https://github.com/Difegue/LANraragi/releases/latest) -4. Open the MSI file in 7zip, and extract the "package.tar" file, which is the underlying Linux image -5. Download [LxRunOffline](https://github.com/DDoSolitary/LxRunOffline/releases) and put it in the same directory as the "package.tar" file you just extracted -6. Uninstall the old Linux image from 0.7.9 with the following command, make sure to have your command window opened as administrator: - `lxrunoffline ui -n lanraragi` -7. install the new image: - `lxrunoffline i -n lanraragi -d "C:\Users\*your user name*\AppData\Roaming\LANraragi\Distro\rootfs" -f LANraragi.tar` -Note: the name of the install HAS to be "lanraragi", do not change this on the -n argument -8. Start the application again, and you should see that it now shows the newest version of the server - - ## Configuration Starting the GUI for the first time will prompt you to setup your content folder and the port you want the server to listen on. The main GUI is always available from your Taskbar. From 71229942006797ddc7785f87b5b27d614e51f72f Mon Sep 17 00:00:00 2001 From: difegue Date: Mon, 25 Apr 2022 22:46:40 +0200 Subject: [PATCH 02/88] Update docker docs with info for Pi users --- .../installing-lanraragi/docker.md | 58 ++++++++++--------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/tools/Documentation/installing-lanraragi/docker.md b/tools/Documentation/installing-lanraragi/docker.md index 0afc01921..188d4e9ac 100644 --- a/tools/Documentation/installing-lanraragi/docker.md +++ b/tools/Documentation/installing-lanraragi/docker.md @@ -12,43 +12,24 @@ Docker is the best way to install the software on remote servers. I don't recomm ## Cloning the base LRR image -Download [the Docker setup](https://www.docker.com/products/docker) and install it. Once you're done, execute: - -```bash -docker run --name=lanraragi -p 3000:3000 \ ---mount type=bind,source=[YOUR_CONTENT_DIRECTORY],target=/home/koyomi/lanraragi/content \ ---mount type=bind,source=[YOUR_DATABASE_DIRECTORY],target=/home/koyomi/lanraragi/database \ -difegue/lanraragi -``` +Download [the Docker setup](https://www.docker.com/products/docker) and install it. {% hint style="warning" %} -If your Docker version is [_below 17.06_](https://docs.docker.com/storage/bind-mounts/) and you use the --mount option as listed above, you will get the following error: - -```bash -unknown flag: --mount -See 'docker run --help'. -``` - -You can bypass this issue by using the --volume option for bind-mounting like so: +The LRR Docker container uses a fairly recent ([3.14](https://alpinelinux.org/posts/Alpine-3.14.0-released.html)) version of Alpine Linux as its base. I recommend you use at least Docker version **20.10.0** to avoid issues with the `faccessat2` syscall. +You can check your Docker version by executing `docker version`. +{% endhint %} +Once you're done, execute: ```bash docker run --name=lanraragi -p 3000:3000 \ ---volume [YOUR_CONTENT_DIRECTORY]:/home/koyomi/lanraragi/content \ ---volume [YOUR_CONTENT_DIRECTORY]:/home/koyomi/lanraragi/database \ +--mount type=bind,source=[YOUR_CONTENT_DIRECTORY],target=/home/koyomi/lanraragi/content \ +--mount type=bind,source=[YOUR_DATABASE_DIRECTORY],target=/home/koyomi/lanraragi/database \ difegue/lanraragi ``` -{% endhint %} - {% hint style="info" %} You can tell Docker to auto-restart the LRR container on boot by adding the `--restart always` flag to this command. {% endhint %} -{% hint style="warning" %} -If you're running on Windows, please check the syntax for mapping your content directory [here](https://docs.docker.com/docker-for-windows/#shared-drives). - -Windows 7/8 users running the Legacy Docker toolbox will have to explicitly forward port 127.0.0.1:3000 from the host to the container in order to be able to access the app. -{% endhint %} - The content directory you have to specify in the command above will contain archives you either upload through the software or directly drop in, alongside generated thumbnails. The database directory houses the LANraragi database(As database.rdb), allowing you to hotswap containers without losing any data. @@ -84,6 +65,24 @@ If you're feeling **extra dangerous**, you can run the last files directly from `docker run [zoinks] difegue/lanraragi:nightly` {% endhint %} +## Platform-specific caveats + +### Windows +If you're running on Windows, please check the syntax for mapping your content directory [here](https://docs.docker.com/docker-for-windows/#shared-drives). + +Windows 7/8 users running the Legacy Docker toolbox will have to explicitly forward port 127.0.0.1:3000 from the host to the container in order to be able to access the app. +### Raspbian + +If you're using **Raspbian**, it's likely you'll encounter installation issues like `s6-svscan: warning: unable to iopause: Operation not permitted` due to their outdated version of `libseccomp`. +You can fix this by either adding `--security-opt seccomp=unconfined` to your Docker arguments(discouraged, allows LRR wider access to underlying OS), or by installing an up-to-date version of `libseccomp`: + +```bash +wget http://ftp.debian.org/debian/pool/main/libs/libseccomp/libseccomp2_2.5.1-1~bpo10+1_armhf.deb +sudo dpkg -i libseccomp2_2.5.1-1~bpo10+1_armhf.deb +``` + +Regular versions of Debian shouldn't have this issue. + ## Changing the port Since Docker allows for port mapping, you can most of times map the default port of 3000 to another port on your host quickly. @@ -116,10 +115,13 @@ As Docker containers are immutable, you need to destroy your existing container docker pull difegue/lanraragi docker stop lanraragi docker rm lanraragi -docker run --name=lanraragi -p 3000:3000 --mount type=bind,source=[YOUR_CONTENT_DIRECTORY],target=/home/koyomi/lanraragi/content difegue/lanraragi +docker run --name=lanraragi -p 3000:3000 \ + --mount type=bind,source=[YOUR_CONTENT_DIRECTORY],target=/home/koyomi/lanraragi/content \ + --mount type=bind,source=[YOUR_DATABASE_DIRECTORY],target=/home/koyomi/lanraragi/database \ + difegue/lanraragi ``` -As long as you use the same content directory as the mount source, your data will still be there. +As long as you use the same content/database directories as before, your data will still be there. {% hint style="info" %} If you update often, you might want to consider using docker-compose or [Portainer](https://portainer.io) to redeploy containers without entering the entire configuration every time. From 34ab0f9b7790f6935b0b4ba895905f7fd8d349bf Mon Sep 17 00:00:00 2001 From: difegue Date: Mon, 25 Apr 2022 22:47:31 +0200 Subject: [PATCH 03/88] Remove all the vagrant stuff, it's long outdated at this point --- .dockerignore | 3 +- tools/Documentation/SUMMARY.md | 1 - .../extending-lanraragi/architecture.md | 1 - .../installing-lanraragi/methods.md | 13 +---- .../installing-lanraragi/vagrant.md | 52 ------------------- tools/Documentation/plugin-docs/index.md | 2 +- tools/build/vagrant/.gitignore | 2 - tools/build/vagrant/Vagrantfile | 22 -------- tools/build/vagrant/Vagrantfile_nightly | 22 -------- 9 files changed, 4 insertions(+), 114 deletions(-) delete mode 100644 tools/Documentation/installing-lanraragi/vagrant.md delete mode 100644 tools/build/vagrant/.gitignore delete mode 100644 tools/build/vagrant/Vagrantfile delete mode 100644 tools/build/vagrant/Vagrantfile_nightly diff --git a/.dockerignore b/.dockerignore index ae1a43137..5e4312d9c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ tools/_screenshots tools/Documentation tools/build/windows -tools/build/homebrew -tools/build/vagrant +tools/build/homebrew \ No newline at end of file diff --git a/tools/Documentation/SUMMARY.md b/tools/Documentation/SUMMARY.md index f10d7a9cd..a38519b9b 100644 --- a/tools/Documentation/SUMMARY.md +++ b/tools/Documentation/SUMMARY.md @@ -11,7 +11,6 @@ * [πŸ›  Source Code (Linux/macOS)](installing-lanraragi/source.md) * [🐧 Community (Linux)](installing-lanraragi/community.md) * [πŸ‘Ώ Jail (FreeBSD)](installing-lanraragi/jail.md) -* [πŸ•Έ Vagrant (Deprecated)](installing-lanraragi/vagrant.md) ## Basic Operations diff --git a/tools/Documentation/extending-lanraragi/architecture.md b/tools/Documentation/extending-lanraragi/architecture.md index da73ba6ae..44989e556 100644 --- a/tools/Documentation/extending-lanraragi/architecture.md +++ b/tools/Documentation/extending-lanraragi/architecture.md @@ -117,7 +117,6 @@ root/ | |- windows <- Windows build script and submodule link to the Karen WPF Bootstrapper | |- docker <- Dockerfile and configuration files for LRR Docker Container | |- homebrew <- Script and configuration files for the LRR Homebrew cask -| |- vagrant <- Vagrantfile for LRR Vagrant Machine | |- cpanfile <- Perl dependencies description | |- install.pl <- LANraragi Installer | +- lanraragi-systemd.service <- Example SystemD service diff --git a/tools/Documentation/installing-lanraragi/methods.md b/tools/Documentation/installing-lanraragi/methods.md index 4942e9508..7e8d43aac 100644 --- a/tools/Documentation/installing-lanraragi/methods.md +++ b/tools/Documentation/installing-lanraragi/methods.md @@ -23,9 +23,6 @@ Look at the methods below for something that fits your OS and usage. {% hint style="warning" %} This method works on **64-bit** editions of Windows 10 only. - -Since LRR 0.8.0, you need Windows 10 version _1903_ at least. 0.7.9 will work with version _1809_ if you're on an LTSC channel. -If you still want to use further server versions on 1809, a step-by-step workaround is available on the Windows documentation page below. {% endhint %} ![win10](../.screenshots/karen.jpg) @@ -69,17 +66,11 @@ Similar to installing from source with an altered process for FreeBSD compatabil [jail.md](jail.md) {% endcontent-ref %} -## Older Windows: _Legacy Docker Toolbox or Vagrant_ +## Windows 7 or 8: don't ![I really hope you guys don't do this](../.screenshots/shiggy.png) -At this point the only solutions I have to give you are basically glorified VMs. - -You can either download the [Legacy Docker Toolbox](https://docs.docker.com/toolbox/toolbox\_install\_windows/) and follow the Docker tutorial linked above, or try Vagrant. I provide **no support** for either of these methods. - -{% content-ref url="vagrant.md" %} -[vagrant.md](vagrant.md) -{% endcontent-ref %} +Switch to 10 or Linux. ## WARNING: Reverse Proxies diff --git a/tools/Documentation/installing-lanraragi/vagrant.md b/tools/Documentation/installing-lanraragi/vagrant.md deleted file mode 100644 index 8ff94bf00..000000000 --- a/tools/Documentation/installing-lanraragi/vagrant.md +++ /dev/null @@ -1,52 +0,0 @@ ---- -description: >- - For computers that are unable to easily use Docker or WSL(Basically just - Windows 7 and 8), Vagrant allows you to quickly get started nonetheless. ---- - -# πŸ•Έ Vagrant (Deprecated) - -{% hint style="danger" %} -Vagrant installs are **deprecated** as of 0.6.0. They'll work, but come with enough potential issues and slowdowns that I don't recommend you use them at all! -{% endhint %} - -## Using the Vagrantfile - -You can use the available Vagrantfile with [Vagrant](https://www.vagrantup.com/downloads.html) to deploy a virtual machine on your computer with LANraragi preinstalled. - -{% hint style="info" %} -This method requires [VirtualBox](https://www.virtualbox.org) to be installed on your machine! -{% endhint %} - -Download the [Vagrantfile](https://github.com/Difegue/LANraragi/tree/dev/tools/build/vagrant) that's relevant to the version of LANraragi that you want to install, then move it to your future LANraragi folder. If you downloaded the nightly Vagrantfile, be sure to remove `_nightly` from the end of the filename. Once you've done that, open a terminal in that folder and enter the following commands: - -``` -vagrant plugin install vagrant-vbguest -vagrant up -``` - -Once the Vagrant machine is up and provisioned, you can access LANraragi at [http://localhost:3000](http://localhost:3000). -Archives you upload will be placed in the directory of the Vagrantfile. - -The Vagrant machine is a simple Docker wrapper, so the database will also be stored in this directory. (As database.rdb) - -You can use `vagrant halt` to stop the VM when you're done. -To start it up again, use the following commands: - -``` -vagrant up -vagrant provision -``` - -Keep in mind that the Vagrant setup, just like Docker, will always use the latest release. - -## Updating - -From the directory where the Vagrantfile is located: - -```bash -vagrant up -vagrant provision -``` - -Those two commands will update the wrapped Docker image to the latest one(basically automatically doing the commands written up there on the Docker section). No other operations are needed. diff --git a/tools/Documentation/plugin-docs/index.md b/tools/Documentation/plugin-docs/index.md index d5fc23e31..f3375f28f 100644 --- a/tools/Documentation/plugin-docs/index.md +++ b/tools/Documentation/plugin-docs/index.md @@ -24,7 +24,7 @@ Basically, _as long as it can run, it will run_. {% hint style="danger" %} As you might've guessed, Plugins run with the same permissions as the main application. This means they can modify the application database at will, delete files, and execute system commands. -None of this is obviously an issue if the application is installed in a proper fashion.(Docker/Vagrant, or non-root user on Linux _I seriously hope you guys don't run this as root_) +None of this is obviously an issue if the application is installed in a proper fashion.(Docker/VM, or non-root user on Linux _I seriously hope you guys don't run this as root_) Still, as said in the User Documentation, be careful of what you do with Plugins. {% endhint %} diff --git a/tools/build/vagrant/.gitignore b/tools/build/vagrant/.gitignore deleted file mode 100644 index 34c277cca..000000000 --- a/tools/build/vagrant/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.vagrant -database.rdb \ No newline at end of file diff --git a/tools/build/vagrant/Vagrantfile b/tools/build/vagrant/Vagrantfile deleted file mode 100644 index 596b0f173..000000000 --- a/tools/build/vagrant/Vagrantfile +++ /dev/null @@ -1,22 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# All Vagrant configuration is done below. The "2" in Vagrant.configure -# configures the configuration version (we support older styles for -# backwards compatibility). Please don't change it unless you know what -# you're doing. -Vagrant.configure(2) do |config| - - config.vm.box = "debian/jessie64" - config.vm.network :forwarded_port, guest: 3000, host: 3000 - config.vm.synced_folder ".", "/vagrant", type: "virtualbox" - config.vm.provision "shell", - inline: "docker stop lanraragi || true && docker rm lanraragi || true" - config.vm.provision "docker" do |d| - d.pull_images "difegue/lanraragi:latest" - d.run "difegue/lanraragi:latest", - args: "--name=lanraragi -e LRR_UID=1000 -p 3000:3000 --restart=always --mount type=bind,source=/vagrant,target=/home/koyomi/lanraragi/content " - end - config.vm.post_up_message = "LANraragi Vagrant Machine Started, App should be available at http://localhost:3000." - -end diff --git a/tools/build/vagrant/Vagrantfile_nightly b/tools/build/vagrant/Vagrantfile_nightly deleted file mode 100644 index b3f72be23..000000000 --- a/tools/build/vagrant/Vagrantfile_nightly +++ /dev/null @@ -1,22 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# All Vagrant configuration is done below. The "2" in Vagrant.configure -# configures the configuration version (we support older styles for -# backwards compatibility). Please don't change it unless you know what -# you're doing. -Vagrant.configure(2) do |config| - - config.vm.box = "debian/jessie64" - config.vm.network :forwarded_port, guest: 3000, host: 3000 - config.vm.synced_folder ".", "/vagrant", type: "virtualbox" - config.vm.provision "shell", - inline: "docker stop lanraragi || true && docker rm lanraragi || true" - config.vm.provision "docker" do |d| - d.pull_images "difegue/lanraragi" - d.run "difegue/lanraragi:nightly", - args: "--name=lanraragi -e LRR_UID=1000 -p 3000:3000 --restart=always --mount type=bind,source=/vagrant,target=/home/koyomi/lanraragi/content " - end - config.vm.post_up_message = "LANraragi Vagrant Machine Started, App should be available at http://localhost:3000." - -end From f4a62dcc1737eeb72310ed4f8f3db3d537f8cac1 Mon Sep 17 00:00:00 2001 From: difegue Date: Mon, 25 Apr 2022 22:57:39 +0200 Subject: [PATCH 04/88] Add documentation about which plugins support pulling URL from the source: tag commit dedicated to twinaero --- lib/LANraragi/Plugin/Metadata/EHentai.pm | 15 ++++++++------- lib/LANraragi/Plugin/Metadata/nHentai.pm | 15 ++++++++------- tools/Documentation/advanced-usage/downloading.md | 5 +++++ tools/Documentation/basic-operations/metadata.md | 6 ++++++ 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/lib/LANraragi/Plugin/Metadata/EHentai.pm b/lib/LANraragi/Plugin/Metadata/EHentai.pm index 77d2dba2e..a15625317 100644 --- a/lib/LANraragi/Plugin/Metadata/EHentai.pm +++ b/lib/LANraragi/Plugin/Metadata/EHentai.pm @@ -20,13 +20,14 @@ sub plugin_info { return ( #Standard metadata - name => "E-Hentai", - type => "metadata", - namespace => "ehplugin", - login_from => "ehlogin", - author => "Difegue and others", - version => "2.5.1", - description => "Searches g.e-hentai for tags matching your archive.", + name => "E-Hentai", + type => "metadata", + namespace => "ehplugin", + login_from => "ehlogin", + author => "Difegue and others", + version => "2.5.1", + description => + "Searches g.e-hentai for tags matching your archive.
ℹ️ This plugin will use the source: tag of the archive if it exists.", icon => "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI\nWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4wYBFg0JvyFIYgAAAB1pVFh0Q29tbWVudAAAAAAAQ3Jl\nYXRlZCB3aXRoIEdJTVBkLmUHAAAEo0lEQVQ4y02UPWhT7RvGf8/5yMkxMU2NKaYIFtKAHxWloYNU\ncRDeQTsUFPwAFwUHByu4ODq4Oghdiri8UIrooCC0Lx01ONSKfYOioi1WpWmaxtTm5PTkfNzv0H/D\n/9oeePjdPNd13Y8aHR2VR48eEUURpmmiaRqmaXbOAK7r4vs+IsLk5CSTk5P4vo9hGIgIsViMra0t\nCoUCRi6XY8+ePVSrVTRN61yybZuXL1/y7t078vk8mUyGvXv3cuLECWZnZ1lbW6PdbpNIJHAcB8uy\nePr0KYZlWTSbTRKJBLquo5TCMAwmJia4f/8+Sini8Ti1Wo0oikin09i2TbPZJJPJUK/XefDgAefO\nnWNlZQVD0zSUUvi+TxAE6LqOrut8/fqVTCaDbdvkcjk0TSOdTrOysoLrujiOw+bmJmEYMjAwQLVa\nJZVKYXR1ddFut/F9H9M0MU0T3/dZXV3FdV36+/vp7u7m6NGj7Nq1i0qlwuLiIqVSib6+Pubn5wGw\nbZtYLIaxMymVSuH7PpZlEUURSina7TZBEOD7Pp8/fyYMQ3zfZ25ujv3795NOp3n48CE9PT3ouk4Q\nBBi/fv3Ctm0cx6Grq4utrS26u7sREQzDIIoifv78SU9PD5VKhTAMGRoaYnV1leHhYa5evUoQBIRh\niIigiQhRFKHrOs1mE9u2iaKIkydPYhgGAKZp8v79e+LxOPl8Htd1uXbtGrdv3yYMQ3ZyAODFixeb\nrVZLvn//Lq7rSqVSkfX1dREROXz4sBw/flyUUjI6OipXrlyRQ4cOSbPZlCiKxHVdCcNQHMcRz/PE\ndV0BGL53756sra1JrVaT9fV1cRxHRESGhoakr69PUqmUvHr1SsrlsuzI931ptVriuq78+fNHPM+T\nVqslhoikjh075p09e9ba6aKu6/T39zM4OMjS0hIzMzM0Gg12794N0LEIwPd9YrEYrusShiEK4Nmz\nZ41yudyVy+XI5/MMDAyQzWap1+tks1lEhIWFBQqFArZto5QiCAJc1+14t7m5STweRwOo1WoSBAEj\nIyMUi0WSySQiQiqV6lRoYWGhY3673e7sfRAEiAjZbBbHcbaBb9++5cCBA2SzWZLJJLZt43kesViM\nHX379g1d1wnDsNNVEQEgCAIajQZ3797dBi4tLWGaJq7rYpompVKJmZkZ2u12B3j58mWUUmiahoiw\nsbFBEASdD2VsbIwnT55gACil+PHjB7Ozs0xPT/P7929u3ryJZVmEYUgYhhQKBZRSiAie52EYBkop\nLMvi8ePHTE1NUSwWt0OZn5/3hoeHzRs3bqhcLseXL1+YmJjowGzbRtO07RT/F8jO09+8ecP58+dJ\nJBKcPn0abW5uThWLRevOnTv/Li4u8vr1a3p7e9E0jXg8zsePHymVSnz69Kmzr7quY9s2U1NTXLp0\nCc/zOHLkCPv27UPxf6rX63+NjIz8IyKMj48zPT3NwYMHGRwcpLe3FwARodVqcf36dS5evMj4+DhB\nEHDmzBkymQz6DqxSqZDNZr8tLy//DYzdunWL5eVlqtUqHz58IJVKkUwmaTQalMtlLly4gIjw/Plz\nTp06RT6fZ2Njg/8AqMV7tO07rnsAAAAASUVORK5CYII=", parameters => [ diff --git a/lib/LANraragi/Plugin/Metadata/nHentai.pm b/lib/LANraragi/Plugin/Metadata/nHentai.pm index e8db69cad..5d55fb7bd 100644 --- a/lib/LANraragi/Plugin/Metadata/nHentai.pm +++ b/lib/LANraragi/Plugin/Metadata/nHentai.pm @@ -18,13 +18,14 @@ sub plugin_info { return ( #Standard metadata - name => "nHentai", - type => "metadata", - namespace => "nhplugin", - author => "Difegue", - version => "1.7.1", - description => - "Searches nHentai for tags matching your archive.
Supports reading the ID from files formatted as \"{Id} Title\" and if not, tries to search for a matching gallery.", + name => "nHentai", + type => "metadata", + namespace => "nhplugin", + author => "Difegue", + version => "1.7.1", + description => "Searches nHentai for tags matching your archive. +
Supports reading the ID from files formatted as \"{Id} Title\" and if not, tries to search for a matching gallery. +
ℹ️ This plugin will use the source: tag of the archive if it exists.", icon => "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA\nB3RJTUUH4wYCFA8s1yKFJwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUH\nAAACL0lEQVQ4y6XTz0tUURQH8O+59773nLFcaGWTk4UUVCBFiJs27VxEQRH0AyRo4x8Q/Qtt2rhr\nU6soaCG0KYKSwIhMa9Ah+yEhZM/5oZMG88N59717T4sxM8eZCM/ycD6Xwznn0pWhG34mh/+PA8mk\n8jO5heziP0sFYwfgMDFQJg4IUjmquSFGG+OIlb1G9li5kykgTgvzSoUCaIYlo8/Igcjpj5wOkARp\n8AupP0uzJLijCY4zzoXOxdBLshAgABr8VOp7bpAXDEI7IBrhdksnjNr3WzI4LaIRV9fk2iAaYV/y\nA1dPiYjBAALgpQxnhV2XzTCAGWGeq7ACBvCdzKQyTH+voAm2hGlpcmQt2Bc2K+ymAhWPxTzPDQLt\nOKo1FiNBQaArq9WNRQwEgKl7XQ1duzSRSn/88vX0qf7DPQddx1nI5UfHxt+m0sLYPiP3shRAG8MD\nok1XEEXR/EI2ly94nrNYWG6Nx0/2Hp2b94dv34mlZge1e4hVCJ4jc6tl9ZP803n3/i4lpdyzq2N0\n7M3DkSeF5ZVYS8v1qxcGz5+5eey4nPDbmGdE9FpGeWErVNe2tTabX3r0+Nk3PwOgXFkdfz99+exA\nMtFZITEt9F23mpLG0hYTVQCKpfKPlZ/rqWKpYoAPcTmpginW76QBbb0OBaBaDdjaDbNlJmQE3/d0\nMYoaybU9126oPkrEhpr+U2wjtoVVGBowkslEsVSupRKdu0Mduq7q7kqExjSS3V2dvwDLavx0eczM\neAAAAABJRU5ErkJggg==", parameters => [ { type => "bool", desc => "Save archive title" } ], diff --git a/tools/Documentation/advanced-usage/downloading.md b/tools/Documentation/advanced-usage/downloading.md index 60142a371..7983afeb4 100644 --- a/tools/Documentation/advanced-usage/downloading.md +++ b/tools/Documentation/advanced-usage/downloading.md @@ -12,6 +12,11 @@ This allows you to seamlessly add archives from the Internet to your LRR instanc By default, we will try to download any URL you chuck at us! This will mostly work for simple URLs that point directly to a file we support. (For example, something like this very nice Quake booklet: `https://archive.org/download/quake-essays-sep-15-fin-4-graco-l-cl/QUAKE_essays_SEP15_FIN4_GRACoL_CL.pdf` will download without a fuss.) +{% hint style="info" %} +Downloaded archives will automatically get a `source:` tag with the URL they were downloaded from. +Said source tags can often be used with compatible Metadata plugins to fetch metadata precisely. (Supported by E-H and nH) +{% endhint %} + For non-direct links, you will need to have a matching **Downloader Plugin** configured. LANraragi currently ships with Downloaders handling E-H and Chaika links. diff --git a/tools/Documentation/basic-operations/metadata.md b/tools/Documentation/basic-operations/metadata.md index 4cf89a639..d6835276e 100644 --- a/tools/Documentation/basic-operations/metadata.md +++ b/tools/Documentation/basic-operations/metadata.md @@ -40,3 +40,9 @@ Plugins have as much control over your system as the main LANraragi application When installing Plugins from unknown sources, do a little research first. {% endhint %} + +## About source: tags + +If your archive has a `source:` tag (likely from the use of the [built-in downloading feature](../advanced-usage/downloading.md)), many plugins will use said tag to directly fetch metadata from it without having to use heuristics of any kind to guess what your archive is. + +If you have the URL on hand directly, you can either add it as a `source:` tag to your archive, or use it as a one-shot parameter on most downloader plugins. \ No newline at end of file From 01ec22c24a35bd6d09bcacb3495751cc8330511e Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Wed, 27 Apr 2022 17:37:19 +0800 Subject: [PATCH 05/88] change .click() to .trigger("click") .click is deprecated. --- public/js/index.js | 2 +- public/js/reader.js | 2 +- templates/config.html.tt2 | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index 2d5f547e4..124b78e09 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -59,7 +59,7 @@ Index.initializeAll = function () { // Force-open the collapsible if carouselOpen = true if (localStorage.carouselOpen === "1") { localStorage.carouselOpen = "0"; // Bad hack since clicking collapsible-title will trigger toggleCarousel and modify this - $(".collapsible-title").click(); + $(".collapsible-title").trigger("click"); } Index.updateCarousel(); diff --git a/public/js/reader.js b/public/js/reader.js index bcbcf4695..30b7d0c7d 100644 --- a/public/js/reader.js +++ b/public/js/reader.js @@ -315,7 +315,7 @@ Reader.toggleHelp = function () { const existingToast = $(".navigation-help-toast:visible"); if (existingToast.length) { // ugly hack: this is an abandoned plugin, we should be using something like toastr - existingToast.closest(".jq-toast-wrap").find(".close-jq-toast-single").click(); + existingToast.closest(".jq-toast-wrap").find(".close-jq-toast-single").trigger("click"); return false; } diff --git a/templates/config.html.tt2 b/templates/config.html.tt2 index 189a17af2..94fa99882 100644 --- a/templates/config.html.tt2 +++ b/templates/config.html.tt2 @@ -134,9 +134,9 @@ enable_timemodified(); shinobuStatus(); setInterval(shinobuStatus, 5000); - $("#enablepass").click(enable_pass); - $("#enableresize").click(enable_resize); - $("#usedateadded").click(enable_timemodified); + $("#enablepass").on("click", enable_pass); + $("#enableresize").on("click", enable_resize); + $("#usedateadded").on("click", enable_timemodified); }); function rebootShinobu() { From ea6891b9fda4016d993648c4982f96d037d13a5a Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Wed, 27 Apr 2022 19:54:04 +0800 Subject: [PATCH 06/88] make updateCarousel an atomic operation This can avoid duplication of carousel content --- public/js/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index 124b78e09..97ede8173 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -268,8 +268,6 @@ Index.handleCustomSort = function () { Index.updateCarousel = function (e) { e?.preventDefault(); - const carousel = $(".swiper-wrapper"); - carousel.empty(); $("#carousel-loading").show(); // Hit a different API endpoint depending on the requested localStorage carousel type @@ -301,6 +299,8 @@ Index.updateCarousel = function (e) { Server.callAPI(endpoint, "GET", null, "Error getting carousel data!", (results) => { + const carousel = $(".swiper-wrapper"); + carousel.empty(); results.data.forEach((archive) => { carousel.append(LRR.buildThumbnailDiv(archive)); }); From a272cb8a2531d4feaed657b6f98a7baf0d889abb Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Wed, 27 Apr 2022 19:58:02 +0800 Subject: [PATCH 07/88] updateCarousel only need to be executed once --- public/js/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index 97ede8173..4403e2017 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -59,9 +59,10 @@ Index.initializeAll = function () { // Force-open the collapsible if carouselOpen = true if (localStorage.carouselOpen === "1") { localStorage.carouselOpen = "0"; // Bad hack since clicking collapsible-title will trigger toggleCarousel and modify this - $(".collapsible-title").trigger("click"); + $(".collapsible-title").trigger("click"); // updateCarousel will be executed by toggleCarousel + } else { + Index.updateCarousel(); } - Index.updateCarousel(); // Initialize carousel mode menu $.contextMenu({ From f92e17b2f18b167c95076a4366b403aa4a8ef608 Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Wed, 27 Apr 2022 20:04:24 +0800 Subject: [PATCH 08/88] solve hack of firstrun toggleCarousel --- public/js/index.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index 4403e2017..190fbb093 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -58,8 +58,8 @@ Index.initializeAll = function () { // Force-open the collapsible if carouselOpen = true if (localStorage.carouselOpen === "1") { - localStorage.carouselOpen = "0"; // Bad hack since clicking collapsible-title will trigger toggleCarousel and modify this - $(".collapsible-title").trigger("click"); // updateCarousel will be executed by toggleCarousel + $(".collapsible-title").trigger("click", [true]); + // Index.updateCarousel(); will be executed by toggleCarousel } else { Index.updateCarousel(); } @@ -132,8 +132,9 @@ Index.toggleMode = function () { IndexTable.dataTable.draw(); }; -Index.toggleCarousel = function () { - localStorage.carouselOpen = (localStorage.carouselOpen === "1") ? "0" : "1"; +Index.toggleCarousel = function (e, firstrun = false) { + if (!firstrun) + localStorage.carouselOpen = (localStorage.carouselOpen === "1") ? "0" : "1"; if (!Index.carouselInitialized) { Index.carouselInitialized = true; From 76db075ba042482a3f965283638b4f9ed1f278de Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 11:24:01 +0800 Subject: [PATCH 09/88] Use Virtual Slides to fix #614 .swiper-wrapper won't appear together with #carousel-loading swiper upgraded to 8.1.4, no break change --- package.json | 2 +- public/js/index.js | 44 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index cfc6ade76..744379de3 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "marked": "^4.0.10", "open-sans-fontface": "^1.4.0", "roboto-fontface": "^0.8.0", - "swiper": "^7.2.0", + "swiper": "^8.1.4", "tippy.js": "^6.3.1" }, "devDependencies": { diff --git a/public/js/index.js b/public/js/index.js index 190fbb093..9519cb5f4 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -141,14 +141,38 @@ Index.toggleCarousel = function (e, firstrun = false) { $("#reload-carousel").show(); Index.swiper = new Swiper(".index-carousel-container", { - slidesPerView: "auto", - spaceBetween: 8, + breakpoints: (() => { // Virtual Slides realization doesn't work with slidesPerView: 'auto' + const breakpoints = { + 0: { + slidesPerView: 1, + }, + 210: { + slidesPerView: 2, + }, + 360: { + slidesPerView: 2.5, + }, + }; + for (let width = 690, sides = 3; width <= 2760; width += 115, sides += 0.5) { + breakpoints[width] = { + slidesPerView: sides, + }; + }; + return breakpoints; + })(), + breakpointsBase: "container", + centerInsufficientSlides: true, + mousewheel: true, navigation: { nextEl: ".carousel-next", prevEl: ".carousel-prev", }, - mousewheel: true, - freeMode: true, + slidesPerView: 7, + virtual: { + enabled: true, + addSlidesAfter: 2, + addSlidesBefore: 2, + }, }); Index.updateCarousel(); @@ -271,6 +295,7 @@ Index.updateCarousel = function (e) { e?.preventDefault(); $("#carousel-loading").show(); + $(".swiper-wrapper").hide(); // Hit a different API endpoint depending on the requested localStorage carousel type let endpoint; @@ -301,14 +326,15 @@ Index.updateCarousel = function (e) { Server.callAPI(endpoint, "GET", null, "Error getting carousel data!", (results) => { - const carousel = $(".swiper-wrapper"); - carousel.empty(); - results.data.forEach((archive) => { - carousel.append(LRR.buildThumbnailDiv(archive)); + Index.swiper.virtual.removeAllSlides(); + const slides = results.data.map((archive) => { + return LRR.buildThumbnailDiv(archive); }); + Index.swiper.virtual.appendSlide(slides); + Index.swiper.virtual.update(); - Index.swiper.update(); $("#carousel-loading").hide(); + $(".swiper-wrapper").show(); }); } }; From ff013c2b97bc4c910c9421be36daa06302f70bf1 Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 11:25:26 +0800 Subject: [PATCH 10/88] use flex to solve overflow on small width device .collapsible-right is now align with .collapsible-title on iOS devices --- public/css/lrr.css | 15 +++++++++++++-- templates/index.html.tt2 | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/public/css/lrr.css b/public/css/lrr.css index 4ef206ca5..5dfe64a49 100644 --- a/public/css/lrr.css +++ b/public/css/lrr.css @@ -153,7 +153,7 @@ table thead .sorting_disabled a:after { } .index-carousel-container { - margin-top: -20px; + margin-top: -10px; } .carousel-prev { @@ -320,17 +320,28 @@ p#nb { } .collapsible-right { - float: right; padding: 1.2rem 1.2rem 0 0; } .collapsible-body { + flex: 1 0 100%; + overflow: hidden; + box-sizing: border-box; border: none !important; } +.option-flyout { + display: flex; + flex-wrap: wrap; + justify-content: space-between; +} + .option-flyout>.collapsible-title { font-size: 18px; font-weight: bold; + display: flex; + flex: 1 1 0; + overflow: hidden; } .option-flyout>.collapsible-body { diff --git a/templates/index.html.tt2 b/templates/index.html.tt2 index a06473b2c..b82bf0317 100644 --- a/templates/index.html.tt2 +++ b/templates/index.html.tt2 @@ -83,9 +83,9 @@
  • -
    +
    -
    From d18fdbfb571e2933072addd063b1b767bcc89956 Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 11:27:14 +0800 Subject: [PATCH 11/88] Hope to reduce uninitialized warning. may solve "Use of uninitialized value $untaggedf in string eq" --- lib/LANraragi/Controller/Api/Search.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/LANraragi/Controller/Api/Search.pm b/lib/LANraragi/Controller/Api/Search.pm index fca79ef27..9ac081e75 100644 --- a/lib/LANraragi/Controller/Api/Search.pm +++ b/lib/LANraragi/Controller/Api/Search.pm @@ -71,8 +71,8 @@ sub handle_api { my $start = $req->param('start'); my $sortkey = $req->param('sortby'); my $sortorder = $req->param('order'); - my $newfilter = $req->param('newonly'); - my $untaggedf = $req->param('untaggedonly'); + my $newfilter = $req->param('newonly') || "false"; + my $untaggedf = $req->param('untaggedonly') || "false"; $sortorder = ( $sortorder && $sortorder eq 'desc' ) ? 1 : 0; From 27340a49286b6766d8d603472ddc4e600521cade Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 12:32:40 +0800 Subject: [PATCH 12/88] remove tagTooltip on carousel --- public/js/common.js | 7 ++++--- public/js/index.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/public/js/common.js b/public/js/common.js index bdb3cf497..e6492a840 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -193,9 +193,10 @@ LRR.buildTagsDiv = function (tags) { /** * Build a thumbnail div for the given archive data. * @param {*} data The archive data + * @param {Boolean} data The archive data * @returns HTML component string */ -LRR.buildThumbnailDiv = function (data) { +LRR.buildThumbnailDiv = function (data, tagTooltip = true) { const thumbCss = (localStorage.cropthumbs === "true") ? "id3" : "id3 nocrop"; // The ID can be in a different field depending on the archive object... const id = data.arcid || data.id; @@ -215,8 +216,8 @@ LRR.buildThumbnailDiv = function (data) {
    - ${LRR.colorCodeTags(data.tags)} - + ${LRR.colorCodeTags(data.tags)} + ${tagTooltip ? `` : ``}
    `; }; diff --git a/public/js/index.js b/public/js/index.js index 9519cb5f4..12288fb1f 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -328,7 +328,7 @@ Index.updateCarousel = function (e) { (results) => { Index.swiper.virtual.removeAllSlides(); const slides = results.data.map((archive) => { - return LRR.buildThumbnailDiv(archive); + return LRR.buildThumbnailDiv(archive, tagTooltip=false); }); Index.swiper.virtual.appendSlide(slides); Index.swiper.virtual.update(); From be819da98bc88f6b95c4e3445e810b5bce81aeea Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 13:18:04 +0800 Subject: [PATCH 13/88] refactor timestamp transformation into encodeHTML --- public/js/common.js | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/public/js/common.js b/public/js/common.js index e6492a840..d500ce46d 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -6,10 +6,13 @@ const LRR = {}; /** * Quick 'n dirty HTML encoding function. * @param {*} r The HTML to encode + * @param {boolean} isTimestamp Option to convert timestamp to date string * @returns Encoded string */ -LRR.encodeHTML = function (r) { +LRR.encodeHTML = function (r, isTimestamp = false) { if (r === undefined) return r; + if (isTimestamp === true) + return (new Date(r * 1000)).toLocaleDateString(); if (Array.isArray(r)) return r[0].replace(/[\x26\x0A\<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); else return r.replace(/[\x26\x0A\<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); }; @@ -99,12 +102,19 @@ LRR.colorCodeTags = function (tags) { if (tags === "") return line; const tagsByNamespace = LRR.splitTagsByNamespace(tags); - Object.keys(tagsByNamespace).sort().forEach((key) => { - tagsByNamespace[key].forEach((tag) => { - if (key === "date_added" || key === "timestamp") return; + const filteredTags = Object.keys(tagsByNamespace).filter(tag => tag !== "date_added" && tag !== "timestamp"); + let tagsToEncode; + + if (filteredTags.length){ + tagsToEncode = filteredTags.sort(); + } else { + tagsToEncode = Object.keys(tagsByNamespace).sort() + } + tagsToEncode.sort().forEach((key) => { + tagsByNamespace[key].forEach((tag) => { const encodedK = LRR.encodeHTML(key.toLowerCase()); - line += `${LRR.encodeHTML(tag)}, `; + line += `${LRR.encodeHTML(tag, key === "date_added" || key === "timestamp")}, `; }); }); // Remove last comma @@ -170,11 +180,7 @@ LRR.buildTagsDiv = function (tags) { const url = LRR.getTagSearchURL(key, tag); const searchTag = LRR.buildNamespacedTag(key, tag); - let tagText = LRR.encodeHTML(tag); - if (key === "date_added" || key === "timestamp") { - const date = new Date(tag * 1000); - tagText = date.toLocaleDateString(); - } + let tagText = LRR.encodeHTML(tag, key === "date_added" || key === "timestamp"); line += `
    @@ -193,7 +199,7 @@ LRR.buildTagsDiv = function (tags) { /** * Build a thumbnail div for the given archive data. * @param {*} data The archive data - * @param {Boolean} data The archive data + * @param {boolean} tagTooltip Option to build TagTooltip on mouseover * @returns HTML component string */ LRR.buildThumbnailDiv = function (data, tagTooltip = true) { @@ -216,8 +222,8 @@ LRR.buildThumbnailDiv = function (data, tagTooltip = true) {
    - ${LRR.colorCodeTags(data.tags)} - ${tagTooltip ? `` : ``} + ${LRR.colorCodeTags(data.tags)} + ${tagTooltip === true ? `` : ``}
    `; }; From 18ed7cc417a5a88894afc348ae16628b628a3c9d Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 13:37:08 +0800 Subject: [PATCH 14/88] add fa-spin animation for loading --- public/js/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/js/index.js b/public/js/index.js index 12288fb1f..0f2d5e0fa 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -296,6 +296,7 @@ Index.updateCarousel = function (e) { $("#carousel-loading").show(); $(".swiper-wrapper").hide(); + $("#reload-carousel").addClass("fa-spin"); // Hit a different API endpoint depending on the requested localStorage carousel type let endpoint; @@ -335,6 +336,7 @@ Index.updateCarousel = function (e) { $("#carousel-loading").hide(); $(".swiper-wrapper").show(); + $("#reload-carousel").removeClass("fa-spin"); }); } }; From afdbbbf4399edf185170ed29c02de54d66092fae Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 13:46:54 +0800 Subject: [PATCH 15/88] revert changes which breaks other pages option-flyout collapsible-body is used in Admin and other pages. --- public/css/lrr.css | 9 --------- templates/index.html.tt2 | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/public/css/lrr.css b/public/css/lrr.css index 5dfe64a49..c3e187ce6 100644 --- a/public/css/lrr.css +++ b/public/css/lrr.css @@ -330,18 +330,9 @@ p#nb { border: none !important; } -.option-flyout { - display: flex; - flex-wrap: wrap; - justify-content: space-between; -} - .option-flyout>.collapsible-title { font-size: 18px; font-weight: bold; - display: flex; - flex: 1 1 0; - overflow: hidden; } .option-flyout>.collapsible-body { diff --git a/templates/index.html.tt2 b/templates/index.html.tt2 index b82bf0317..4fcb10808 100644 --- a/templates/index.html.tt2 +++ b/templates/index.html.tt2 @@ -82,8 +82,8 @@
      -
    • -
      +
    • +
      @@ -95,7 +95,7 @@ id="carousel-mode-menu" href="#" title="Carousel Options">
      -
      +
      From 04fcfd9edaca853d56ffb611309541b8a0cd6d5c Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 14:53:47 +0800 Subject: [PATCH 16/88] format and lint codes use `npm run lint` to lint use `npx eslint --ext .js public/ --fix` to quick fix --- .eslintrc.json | 4 +- lib/LANraragi/Controller/Category.pm | 2 +- package.json | 1 + public/js/batch.js | 22 ++--- public/js/category.js | 141 +++++++++++++-------------- public/js/common.js | 25 ++--- public/js/edit.js | 2 +- public/js/index.js | 24 ++--- public/js/server.js | 2 +- public/js/upload.js | 88 +++++++++-------- templates/category.html.tt2 | 18 ++-- templates/upload.html.tt2 | 4 +- 12 files changed, 171 insertions(+), 162 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 5ac783acf..6d5223ebb 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -5,7 +5,8 @@ "jquery": true }, "extends": [ - "airbnb-base" + "airbnb-base", + "eslint:recommended" ], "parserOptions": { "ecmaVersion": 12, @@ -23,6 +24,7 @@ "IndexTable": "readonly", "Swiper": "readonly" }, + "ignorePatterns": ["**/vendor/*.js"], "rules": { "func-names": ["error", "never"], "indent": ["error", 4], diff --git a/lib/LANraragi/Controller/Category.pm b/lib/LANraragi/Controller/Category.pm index 10c27838f..54d554c95 100644 --- a/lib/LANraragi/Controller/Category.pm +++ b/lib/LANraragi/Controller/Category.pm @@ -37,7 +37,7 @@ sub index { if ( -e $zipfile ) { $arclist .= - "
    • "; + "
    • "; $arclist .= "
      • "; } } diff --git a/package.json b/package.json index 744379de3..b2dcc9651 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "scripts": { "test": "prove -r -l -v tests/", "lanraragi-installer": "perl ./tools/install.pl", + "lint": "eslint --ext .js public/", "start": "perl ./script/launcher.pl -f ./script/lanraragi", "dev-server": "perl ./script/launcher.pl -m -v ./script/lanraragi ", "docker-build": "docker build -t difegue/lanraragi -f ./tools/build/docker/Dockerfile .", diff --git a/public/js/batch.js b/public/js/batch.js index 349ee0149..232390761 100644 --- a/public/js/batch.js +++ b/public/js/batch.js @@ -91,7 +91,7 @@ Batch.checkUntagged = function () { * This crafts a JSON list to send to the batch tagging websocket service. */ Batch.startBatch = function () { - if (Batch.currentOperation === "delete" && !confirm("This is a destructive operation! Are you sure you want to delete the selected archives?")) { + if (Batch.currentOperation === "delete" && !window.confirm("This is a destructive operation! Are you sure you want to delete the selected archives?")) { return; } @@ -105,12 +105,8 @@ Batch.startBatch = function () { const checkeds = document.querySelectorAll("input[name=archive]:checked"); // Extract IDs from nodelist - const arcs = []; - const args = []; - - for (let i = 0, ref = arcs.length = checkeds.length; i < ref; i++) { - arcs[i] = checkeds[i].id; - } + const arcs = Array.from(checkeds).map((item) => item.id); + let args = []; // Reset counts Batch.treatedArchives = 0; @@ -122,14 +118,14 @@ Batch.startBatch = function () { // Only add values into the override argument array if the checkbox is on const arginputs = $(`.${Batch.currentPlugin}-argvalue`); if ($("#override")[0].checked) { - for (let j = 0, ref = args.length = arginputs.length; j < ref; j++) { + args = Array.from(arginputs).map((item) => { // Checkbox inputs are handled by looking at the checked prop instead of the value. - if (arginputs[j].type !== "checkbox") { - args[j] = arginputs[j].value; + if (item.type !== "checkbox") { + return item.value; } else { - args[j] = arginputs[j].checked ? 1 : 0; + return item.checked ? 1 : 0; } - } + }); } // Initialize websocket connection @@ -142,7 +138,7 @@ Batch.startBatch = function () { // Close any existing connection // eslint-disable-next-line no-empty - try { Batch.socket.close(); } catch {} + try { Batch.socket.close(); } catch { } let wsProto = "ws://"; if (document.location.protocol === "https:") wsProto = "wss://"; diff --git a/public/js/category.js b/public/js/category.js index b5c675307..e5b148465 100644 --- a/public/js/category.js +++ b/public/js/category.js @@ -1,9 +1,9 @@ +const Category = {}; let categories = []; -function addNewCategory(isDynamic) { - +Category.addNewCategory = function (isDynamic) { const catName = prompt("Enter a name for the new category:", "My Category"); - if (catName == null || catName == "") { + if (catName === null || catName === "") { return; } @@ -12,44 +12,40 @@ function addNewCategory(isDynamic) { // Make an API request to create the category, if search is empty -> static, otherwise dynamic Server.callAPI(`/api/categories?name=${catName}&search=${searchtag}`, "PUT", `Category "${catName}" created!`, "Error creating category:", - function (data) { + (data) => { // Reload categories and select the newly created ID - loadCategories(data.category_id); + Category.loadCategories(data.category_id); }); +}; -} - -function loadCategories(selectedID) { - +Category.loadCategories = function (selectedID) { fetch("/api/categories") - .then(response => response.json()) + .then((response) => response.json()) .then((data) => { - // Save data clientside for reference in later functions categories = data; // Clear combobox and fill it again with categories from the API - const catCombobox = document.getElementById('category'); + const catCombobox = document.getElementById("category"); catCombobox.options.length = 0; // Add default catCombobox.options[catCombobox.options.length] = new Option("-- No Category --", "", true, false); // Add categories, select if the ID matches the optional argument - data.forEach(c => { - catCombobox.options[catCombobox.options.length] = new Option(c.name, c.id, false, c.id === selectedID); + data.forEach((c) => { + const newOption = new Option(c.name, c.id, false, c.id === selectedID); + catCombobox.options[catCombobox.options.length] = newOption; }); // Update form with selected category details - updateCategoryDetails(); + Category.updateCategoryDetails(); }) - .catch(error => LRR.showErrorToast("Error getting categories from server", error)); - -} - -function updateCategoryDetails() { + .catch((error) => LRR.showErrorToast("Error getting categories from server", error)); +}; +Category.updateCategoryDetails = function () { // Get selected category ID and find it in the reference array - const categoryID = document.getElementById('category').value; - const category = categories.find(x => x.id === categoryID); + const categoryID = document.getElementById("category").value; + const category = categories.find((x) => x.id === categoryID); $("#archivelist").hide(); $("#dynamicplaceholder").show(); @@ -58,9 +54,9 @@ function updateCategoryDetails() { if (!category) return; $(".tag-options").show(); - document.getElementById('catname').value = category.name; - document.getElementById('catsearch').value = category.search; - document.getElementById('pinned').checked = category.pinned === "1"; + document.getElementById("catname").value = category.name; + document.getElementById("catsearch").value = category.search; + document.getElementById("pinned").checked = category.pinned === "1"; if (category.search === "") { // Show archives if static and check the matching IDs @@ -70,15 +66,21 @@ function updateCategoryDetails() { // Sort archive list alphabetically const arclist = $("#archivelist"); - arclist.find('li').sort(function (a, b) { - var upA = $(a).find('label').text().toUpperCase(); - var upB = $(b).find('label').text().toUpperCase(); - return (upA < upB) ? -1 : (upA > upB) ? 1 : 0; + arclist.find("li").sort((a, b) => { + const upA = $(a).find("label").text().toUpperCase(); + const upB = $(b).find("label").text().toUpperCase(); + if (upA < upB) { + return -1; + } else if (upA > upB) { + return 1; + } else { + return 0; + } }).appendTo("#archivelist"); // Uncheck all $(".checklist > * > input:checkbox").prop("checked", false); - category.archives.forEach(id => { + category.archives.forEach((id) => { const checkbox = document.getElementById(id); if (checkbox != null) { @@ -87,73 +89,68 @@ function updateCategoryDetails() { checkbox.parentElement.parentElement.prepend(checkbox.parentElement); } }); - } else { // Show predicate field if dynamic $("#predicatefield").show(); } +}; -} - -function saveCurrentCategoryDetails() { - +Category.saveCurrentCategoryDetails = function () { // Get selected category ID - const categoryID = document.getElementById('category').value; - const catName = document.getElementById('catname').value; - const searchtag = document.getElementById('catsearch').value; - const pinned = document.getElementById('pinned').checked ? "1" : "0"; + const categoryID = document.getElementById("category").value; + const catName = document.getElementById("catname").value; + const searchtag = document.getElementById("catsearch").value; + const pinned = document.getElementById("pinned").checked ? "1" : "0"; - indicateSaving(); + Category.indicateSaving(); // PUT update with name and search (search is empty if this is a static category) Server.callAPI(`/api/categories/${categoryID}?name=${catName}&search=${searchtag}&pinned=${pinned}`, "PUT", null, "Error updating category:", - function (data) { + (data) => { // Reload categories and select the newly created ID - indicateSaved(); - loadCategories(data.category_id); + Category.indicateSaved(); + Category.loadCategories(data.category_id); }); -} - -function updateArchiveInCategory(id, checked) { +}; - const categoryID = document.getElementById('category').value; - indicateSaving(); +Category.updateArchiveInCategory = function (id, checked) { + const categoryID = document.getElementById("category").value; + Category.indicateSaving(); // PUT/DELETE api/categories/catID/archiveID - Server.callAPI(`/api/categories/${categoryID}/${id}`, checked ? 'PUT' : 'DELETE', null, "Error adding/removing archive to category", - function (data) { + Server.callAPI(`/api/categories/${categoryID}/${id}`, checked ? "PUT" : "DELETE", null, "Error adding/removing archive to category", + () => { // Reload categories and select the archive list properly - indicateSaved(); - loadCategories(categoryID); + Category.indicateSaved(); + Category.loadCategories(categoryID); }); -} - -function deleteSelectedCategory() { - const categoryID = document.getElementById('category').value; - if (confirm("Are you sure? The category will be deleted permanently!")) { +}; +Category.deleteSelectedCategory = function () { + const categoryID = document.getElementById("category").value; + if (window.confirm("Are you sure? The category will be deleted permanently!")) { Server.callAPI(`/api/categories/${categoryID}`, "DELETE", "Category deleted!", "Error deleting category", - function (data) { + () => { // Reload categories to show the archive list properly - loadCategories(); + Category.loadCategories(); }); } -} +}; -function indicateSaving() { - document.getElementById("status").innerHTML = ` Saving your modifications...`; -} +Category.indicateSaving = function () { + document.getElementById("status").innerHTML = " Saving your modifications..."; +}; -function indicateSaved() { - document.getElementById("status").innerHTML = ` Saved!`; -} +Category.indicateSaved = function () { + document.getElementById("status").innerHTML = " Saved!"; +}; -function predicateHelp() { +Category.predicateHelp = function () { $.toast({ - heading: 'Writing a Predicate', - text: 'Predicates follow the same syntax as searches in the Archive Index. Check the Documentation for more information.', + heading: "Writing a Predicate", + text: "Predicates follow the same syntax as searches in the Archive Index. Check the Documentation for more information.", hideAfter: false, - position: 'top-left', - icon: 'info' + position: "top-left", + icon: "info", }); -} \ No newline at end of file +}; diff --git a/public/js/common.js b/public/js/common.js index d500ce46d..cf7e0d225 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -11,10 +11,13 @@ const LRR = {}; */ LRR.encodeHTML = function (r, isTimestamp = false) { if (r === undefined) return r; - if (isTimestamp === true) - return (new Date(r * 1000)).toLocaleDateString(); - if (Array.isArray(r)) return r[0].replace(/[\x26\x0A\<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); - else return r.replace(/[\x26\x0A\<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); + if (isTimestamp === true) return (new Date(r * 1000)).toLocaleDateString(); + if (Array.isArray(r)) { + return r[0].replace(/[\x26\x0A\<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); + } else { + // console.log(r); + return r.replace(/[\x26\x0A\<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); + } }; /** @@ -41,7 +44,7 @@ LRR.isNullOrWhitespace = function (input) { */ LRR.getTagSearchURL = function (namespace, tag) { const namespacedTag = this.buildNamespacedTag(namespace, tag); - if (namespace !== "source"){ + if (namespace !== "source") { return `/?q=${encodeURIComponent(namespacedTag)}`; } else if (/https?:\/\//.test(tag)) { return `${tag}`; @@ -102,13 +105,13 @@ LRR.colorCodeTags = function (tags) { if (tags === "") return line; const tagsByNamespace = LRR.splitTagsByNamespace(tags); - const filteredTags = Object.keys(tagsByNamespace).filter(tag => tag !== "date_added" && tag !== "timestamp"); + const filteredTags = Object.keys(tagsByNamespace).filter((tag) => tag !== "date_added" && tag !== "timestamp"); let tagsToEncode; - if (filteredTags.length){ + if (filteredTags.length) { tagsToEncode = filteredTags.sort(); } else { - tagsToEncode = Object.keys(tagsByNamespace).sort() + tagsToEncode = Object.keys(tagsByNamespace).sort(); } tagsToEncode.sort().forEach((key) => { @@ -180,7 +183,7 @@ LRR.buildTagsDiv = function (tags) { const url = LRR.getTagSearchURL(key, tag); const searchTag = LRR.buildNamespacedTag(key, tag); - let tagText = LRR.encodeHTML(tag, key === "date_added" || key === "timestamp"); + const tagText = LRR.encodeHTML(tag, key === "date_added" || key === "timestamp"); line += `
      @@ -222,8 +225,8 @@ LRR.buildThumbnailDiv = function (data, tagTooltip = true) {
      - ${LRR.colorCodeTags(data.tags)} - ${tagTooltip === true ? `` : ``} + ${LRR.colorCodeTags(data.tags)} + ${tagTooltip === true ? `` : ""}
      `; }; diff --git a/public/js/edit.js b/public/js/edit.js index 50fbf392c..4a6f54ddb 100644 --- a/public/js/edit.js +++ b/public/js/edit.js @@ -125,7 +125,7 @@ Edit.saveMetadata = function () { }; Edit.deleteArchive = function () { - if (confirm("Are you sure you want to delete this archive?")) { + if (window.confirm("Are you sure you want to delete this archive?")) { Server.deleteArchive($("#archiveID").val(), () => { document.location.href = "./"; }); } }; diff --git a/public/js/index.js b/public/js/index.js index 0f2d5e0fa..c61347f15 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -133,15 +133,14 @@ Index.toggleMode = function () { }; Index.toggleCarousel = function (e, firstrun = false) { - if (!firstrun) - localStorage.carouselOpen = (localStorage.carouselOpen === "1") ? "0" : "1"; + if (!firstrun) localStorage.carouselOpen = (localStorage.carouselOpen === "1") ? "0" : "1"; if (!Index.carouselInitialized) { Index.carouselInitialized = true; $("#reload-carousel").show(); Index.swiper = new Swiper(".index-carousel-container", { - breakpoints: (() => { // Virtual Slides realization doesn't work with slidesPerView: 'auto' + breakpoints: (() => { // Virtual Slides doesn't work with slidesPerView: 'auto' const breakpoints = { 0: { slidesPerView: 1, @@ -157,7 +156,7 @@ Index.toggleCarousel = function (e, firstrun = false) { breakpoints[width] = { slidesPerView: sides, }; - }; + } return breakpoints; })(), breakpointsBase: "container", @@ -218,8 +217,8 @@ Index.toggleCategory = function (button) { */ Index.promptCustomColumn = function (column) { const promptText = "Enter the namespace of the tags you want to show in this column. \n\n" - + "Enter a full namespace without the colon, e.g \"artist\".\n" - + "If you have multiple tags with the same namespace, only the last one will be shown in the column."; + + "Enter a full namespace without the colon, e.g \"artist\".\n" + + "If you have multiple tags with the same namespace, only the last one will be shown in the column."; const defaultText = localStorage.getItem(`customColumn${column}`); const input = prompt(promptText, defaultText); @@ -328,9 +327,8 @@ Index.updateCarousel = function (e) { "GET", null, "Error getting carousel data!", (results) => { Index.swiper.virtual.removeAllSlides(); - const slides = results.data.map((archive) => { - return LRR.buildThumbnailDiv(archive, tagTooltip=false); - }); + const slides = results.data + .map((archive) => LRR.buildThumbnailDiv(archive, false)); Index.swiper.virtual.appendSlide(slides); Index.swiper.virtual.update(); @@ -477,7 +475,7 @@ Index.handleContextMenu = function (option, id) { LRR.openInNewTab(`./edit?id=${id}`); break; case "delete": - if (confirm("Are you sure you want to delete this archive?")) { + if (window.confirm("Are you sure you want to delete this archive?")) { Server.deleteArchive(id, () => { document.location.reload(true); }); } break; @@ -614,7 +612,10 @@ Index.migrateProgress = function () { .then((response) => response.json()) .then((data) => { // Don't migrate if the server progress is already further - if (progress !== null && data !== undefined && data !== null && progress > data.progress) { + if (progress !== null + && data !== undefined + && data !== null + && progress > data.progress) { Server.callAPI(`api/archives/${id}/progress/${progress}?force=1`, "PUT", null, "Error updating reading progress!", null); } @@ -632,6 +633,7 @@ Index.migrateProgress = function () { icon: "success", })); } else { + // eslint-disable-next-line no-console console.log("No local reading progression to migrate"); } }; diff --git a/public/js/server.js b/public/js/server.js index efc9c09c6..a9d0f9a47 100644 --- a/public/js/server.js +++ b/public/js/server.js @@ -157,7 +157,7 @@ Server.clearAllNewFlags = function () { }; Server.dropDatabase = function () { - if (confirm("Danger! Are you *sure* you want to do this?")) { + if (window.confirm("Danger! Are you *sure* you want to do this?")) { Server.callAPI("/api/database/drop", "POST", "Sayonara! Redirecting you...", "Error while resetting the database? Check Logs.", () => { setTimeout(() => { document.location.href = "./"; }, 1500); diff --git a/public/js/upload.js b/public/js/upload.js index 94ac2eefd..372559512 100644 --- a/public/js/upload.js +++ b/public/js/upload.js @@ -1,26 +1,33 @@ // Scripting for the Upload page. +const Upload = {}; + let processingArchives = 0; let completedArchives = 0; let failedArchives = 0; let totalUploads = 0; // Handle updating the upload counters. -function updateUploadCounters() { +Upload.updateUploadCounters = function () { $("#progressCount").html(`πŸ€” Processing: ${processingArchives} πŸ™Œ Completed: ${completedArchives} πŸ‘Ή Failed: ${failedArchives}`); - const icon = (completedArchives == totalUploads) ? "fas fa-check-circle" - : failedArchives > 0 ? "fas fa-exclamation-circle" - : "fa fa-spinner fa-spin"; - + let icon; + if (completedArchives === totalUploads) { + icon = "fas fa-check-circle"; + } else if (failedArchives > 0) { + icon = "fas fa-exclamation-circle"; + } else { + icon = "fa fa-spinner fa-spin"; + } $("#progressTotal").html(` Total:${completedArchives + failedArchives}/${totalUploads}`); // At the end of the upload job, dump the search cache! if (processingArchives === 0) { Server.invalidateCache(); } -} +}; -// Handle a completed job from minion. Update the line in upload results with the title, ID, message. -function handleCompletedUpload(jobID, d) { +// Handle a completed job from minion. +// Update the line in upload results with the title, ID, message. +Upload.handleCompletedUpload = function (jobID, d) { $(`#${jobID}-name`).html(d.result.title); if (d.result.id) { @@ -31,28 +38,28 @@ function handleCompletedUpload(jobID, d) { if (d.result.success) { $(`#${jobID}-link`).html(`Click here to edit metadata.
      (${d.result.message})`); $(`#${jobID}-icon`).attr("class", "fa fa-check-circle"); - completedArchives++; + completedArchives += 1; } else { $(`#${jobID}-link`).html(`Error while processing archive.
      (${d.result.message})`); $(`#${jobID}-icon`).attr("class", "fa fa-exclamation-circle"); - failedArchives++; + failedArchives += 1; } - processingArchives--; - updateUploadCounters(); -} + processingArchives -= 1; + Upload.updateUploadCounters(); +}; -function handleFailedUpload(jobID, d) { +Upload.handleFailedUpload = function (jobID, d) { $(`#${jobID}-link`).html(`Error while processing file.
      (${d})`); $(`#${jobID}-icon`).attr("class", "fa fa-exclamation-circle"); - failedArchives++; - processingArchives--; - updateUploadCounters(); -} + failedArchives += 1; + processingArchives -= 1; + Upload.updateUploadCounters(); +}; // Send URLs to the Download API and add a Server.checkJobStatus to track its progress. -function downloadUrl() { +Upload.downloadUrl = function () { const categoryID = document.getElementById("category").value; // One fetch job per non-empty line of the form @@ -73,7 +80,7 @@ function downloadUrl() { .then((response) => response.json()) .then((data) => { if (data.success) { - result = ` + const result = ` ${data.url} @@ -83,32 +90,33 @@ function downloadUrl() { $("#files").append(result); - totalUploads++; - processingArchives++; - updateUploadCounters(); + totalUploads += 1; + processingArchives += 1; + Upload.updateUploadCounters(); // Check minion job state periodically to update the result Server.checkJobStatus(data.job, true, - (d) => handleCompletedUpload(data.job, d), - (error) => handleFailedUpload(data.job, error)); + (d) => Upload.handleCompletedUpload(data.job, d), + (error) => Upload.handleFailedUpload(data.job, error)); } else { throw new Error(data.message); } }) .catch((error) => LRR.showErrorToast("Error while adding download job", error)); }); -} +}; // Set up jqueryfileupload. -function initUpload() { +Upload.initUpload = function () { $("#fileupload").fileupload({ dataType: "json", - formData(form) { + formData() { const array = [{ name: "catid", value: document.getElementById("category").value }]; return array; }, done(e, data) { - if (data.result.success == 0) { + let result; + if (data.result.success === 0) { result = `${data.result.name} ${data.result.error} `; @@ -125,32 +133,32 @@ function initUpload() { $("#progress .bar").css("width", "0%"); $("#files").append(result); - totalUploads++; - processingArchives++; - updateUploadCounters(); + totalUploads += 1; + processingArchives += 1; + Upload.updateUploadCounters(); // Check minion job state periodically to update the result Server.checkJobStatus(data.result.job, true, - (d) => handleCompletedUpload(data.result.job, d), - (error) => handleFailedUpload(data.result.job, error)); + (d) => Upload.handleCompletedUpload(data.result.job, d), + (error) => Upload.handleFailedUpload(data.result.job, error)); }, fail(e, data) { - result = `${data.result.name} + const result = `${data.result.name} ${data.errorThrown} `; $("#progress .bar").css("width", "0%"); $("#files").append(result); - totalUploads++; - failedArchives++; - updateUploadCounters(); + totalUploads += 1; + failedArchives += 1; + Upload.updateUploadCounters(); }, progressall(e, data) { - const progress = parseInt(data.loaded / data.total * 100, 10); + const progress = parseInt((data.loaded / data.total) * 100, 10); $("#progress .bar").css("width", `${progress}%`); }, }); -} +}; diff --git a/templates/category.html.tt2 b/templates/category.html.tt2 index e2309830e..0665ada13 100644 --- a/templates/category.html.tt2 +++ b/templates/category.html.tt2 @@ -23,7 +23,7 @@ - +

      Categories

      @@ -48,8 +48,8 @@ You can create new categories here or edit existing ones.

      - - + +

      Select a category in the combobox below to edit its name, the archives it contains, or its predicate. @@ -62,7 +62,7 @@

      Category:

      - @@ -71,28 +71,28 @@ Name: - + Predicate: - - + + + onchange="Category.saveCurrentCategoryDetails()"> + onclick='Category.deleteSelectedCategory()'> diff --git a/templates/upload.html.tt2 b/templates/upload.html.tt2 index 0a40c7637..be24840d8 100644 --- a/templates/upload.html.tt2 +++ b/templates/upload.html.tt2 @@ -24,7 +24,7 @@ - +

      Adding Archives to the Library

      @@ -70,7 +70,7 @@

      - +
      Add from URL(s)       From ceeb5364960ab0bfb1b52521b8d7e2e1943cb075 Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 14:55:14 +0800 Subject: [PATCH 17/88] lint code --- public/js/common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/common.js b/public/js/common.js index cf7e0d225..441b9cc52 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -13,10 +13,10 @@ LRR.encodeHTML = function (r, isTimestamp = false) { if (r === undefined) return r; if (isTimestamp === true) return (new Date(r * 1000)).toLocaleDateString(); if (Array.isArray(r)) { - return r[0].replace(/[\x26\x0A\<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); + return r[0].replace(/[\x26\x0A<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); } else { // console.log(r); - return r.replace(/[\x26\x0A\<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); + return r.replace(/[\x26\x0A<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); } }; From af2fc83ec6d3436f38861a68c49d200f53b79784 Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 16:21:19 +0800 Subject: [PATCH 18/88] bump version of dependencies --- package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index b2dcc9651..f78c080c7 100644 --- a/package.json +++ b/package.json @@ -24,26 +24,26 @@ }, "homepage": "https://github.com/Difegue/LANraragi#readme", "dependencies": { - "@fortawesome/fontawesome-free": "^5.13.0", - "@jcubic/tagger": "^0.4.0", + "@fortawesome/fontawesome-free": "^5.15.4", + "@jcubic/tagger": "^0.4.2", "allcollapsible": "^1.1.0", "awesomplete": "^1.1.5", - "blueimp-file-upload": "^10.28.0", - "datatables.net": "^1.10.25", - "inter-ui": "^3.3.2", + "blueimp-file-upload": "^10.32.0", + "datatables.net": "^1.11.5", + "inter-ui": "^3.19.3", "jqcloud2": "^2.0.3", "jquery": "^3.6.0", "jquery-contextmenu": "^2.9.2", "jquery-toast-plugin": "^1.3.2", - "marked": "^4.0.10", + "marked": "^4.0.14", "open-sans-fontface": "^1.4.0", "roboto-fontface": "^0.8.0", "swiper": "^8.1.4", - "tippy.js": "^6.3.1" + "tippy.js": "^6.3.7" }, "devDependencies": { - "eslint": "^7.24.0", - "eslint-config-airbnb-base": "^14.2.1", - "eslint-plugin-import": "^2.22.1" + "eslint": "^7.32.0", + "eslint-config-airbnb-base": "^15.0.0", + "eslint-plugin-import": "^2.26.0" } -} \ No newline at end of file +} From a2e2d80dfb63c0de6b587a9c50f4965598bbd1ee Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 16:21:27 +0800 Subject: [PATCH 19/88] lint codes --- public/js/batch.js | 18 ++++++++++--- public/js/category.js | 37 +++++++++++++++++++------- public/js/edit.js | 20 +++++++++++---- public/js/index.js | 37 +++++++++++++++++++------- public/js/reader.js | 41 +++++++++++++++++++++-------- public/js/server.js | 60 ++++++++++++++++++++++++++++++++----------- public/js/upload.js | 14 +++++++--- 7 files changed, 171 insertions(+), 56 deletions(-) diff --git a/public/js/batch.js b/public/js/batch.js index 232390761..0ae541e4c 100644 --- a/public/js/batch.js +++ b/public/js/batch.js @@ -25,7 +25,11 @@ Batch.initializeAll = function () { // Load all archives, showing a spinner while doing so $("#arclist").hide(); - Server.callAPI("/api/archives", "GET", null, "Couldn't load the complete archive list! Please reload the page.", + Server.callAPI( + "/api/archives", + "GET", + null, + "Couldn't load the complete archive list! Please reload the page.", (data) => { // Parse the archive list and add
    • elements to arclist data.forEach((archive) => { @@ -35,7 +39,8 @@ Batch.initializeAll = function () { }); Batch.checkUntagged(); - }) + }, + ) .finally(() => { $("#arclist").show(); $("#loading-placeholder").hide(); @@ -71,7 +76,11 @@ Batch.showOverride = function () { * Check untagged archives, using the matching API endpoint. */ Batch.checkUntagged = function () { - Server.callAPI("api/archives/untagged", "GET", null, "Error getting untagged archives!", + Server.callAPI( + "api/archives/untagged", + "GET", + null, + "Error getting untagged archives!", (data) => { // Check untagged archives data.forEach((id) => { @@ -83,7 +92,8 @@ Batch.checkUntagged = function () { checkbox.parentElement.parentElement.prepend(checkbox.parentElement); } }); - }); + }, + ); }; /** diff --git a/public/js/category.js b/public/js/category.js index e5b148465..b95a6b33d 100644 --- a/public/js/category.js +++ b/public/js/category.js @@ -11,11 +11,16 @@ Category.addNewCategory = function (isDynamic) { const searchtag = isDynamic ? "language:english" : ""; // Make an API request to create the category, if search is empty -> static, otherwise dynamic - Server.callAPI(`/api/categories?name=${catName}&search=${searchtag}`, "PUT", `Category "${catName}" created!`, "Error creating category:", + Server.callAPI( + `/api/categories?name=${catName}&search=${searchtag}`, + "PUT", + `Category "${catName}" created!`, + "Error creating category:", (data) => { // Reload categories and select the newly created ID Category.loadCategories(data.category_id); - }); + }, + ); }; Category.loadCategories = function (selectedID) { @@ -105,35 +110,49 @@ Category.saveCurrentCategoryDetails = function () { Category.indicateSaving(); // PUT update with name and search (search is empty if this is a static category) - Server.callAPI(`/api/categories/${categoryID}?name=${catName}&search=${searchtag}&pinned=${pinned}`, - "PUT", null, "Error updating category:", + Server.callAPI( + `/api/categories/${categoryID}?name=${catName}&search=${searchtag}&pinned=${pinned}`, + "PUT", + null, + "Error updating category:", (data) => { // Reload categories and select the newly created ID Category.indicateSaved(); Category.loadCategories(data.category_id); - }); + }, + ); }; Category.updateArchiveInCategory = function (id, checked) { const categoryID = document.getElementById("category").value; Category.indicateSaving(); // PUT/DELETE api/categories/catID/archiveID - Server.callAPI(`/api/categories/${categoryID}/${id}`, checked ? "PUT" : "DELETE", null, "Error adding/removing archive to category", + Server.callAPI( + `/api/categories/${categoryID}/${id}`, + checked ? "PUT" : "DELETE", + null, + "Error adding/removing archive to category", () => { // Reload categories and select the archive list properly Category.indicateSaved(); Category.loadCategories(categoryID); - }); + }, + ); }; Category.deleteSelectedCategory = function () { const categoryID = document.getElementById("category").value; if (window.confirm("Are you sure? The category will be deleted permanently!")) { - Server.callAPI(`/api/categories/${categoryID}`, "DELETE", "Category deleted!", "Error deleting category", + Server.callAPI( + `/api/categories/${categoryID}`, + "DELETE", + "Category deleted!", + "Error deleting category", () => { // Reload categories to show the archive list properly Category.loadCategories(); - }); + }, + ); } }; diff --git a/public/js/edit.js b/public/js/edit.js index 4a6f54ddb..50fef29ee 100644 --- a/public/js/edit.js +++ b/public/js/edit.js @@ -40,7 +40,11 @@ Edit.initializeAll = function () { // Hide tag input while statistics load Edit.hideTags(); - Server.callAPI("/api/database/stats?minweight=2", "GET", null, "Couldn't load tag statistics", + Server.callAPI( + "/api/database/stats?minweight=2", + "GET", + null, + "Couldn't load tag statistics", (data) => { Edit.suggestions = data.reduce((res, tag) => { let label = tag.text; @@ -48,7 +52,8 @@ Edit.initializeAll = function () { res.push(label); return res; }, []); - }) + }, + ) .finally(() => { const input = $("#tagText")[0]; @@ -136,8 +141,12 @@ Edit.getTags = function () { const pluginID = $("select#plugin option:checked").val(); const archivID = $("#archiveID").val(); const pluginArg = $("#arg").val(); - Server.callAPI(`../api/plugins/use?plugin=${pluginID}&id=${archivID}&arg=${pluginArg}`, "POST", null, - "Error while fetching tags :", (result) => { + Server.callAPI( + `../api/plugins/use?plugin=${pluginID}&id=${archivID}&arg=${pluginArg}`, + "POST", + null, + "Error while fetching tags :", + (result) => { if (result.data.title && result.data.title !== "") { $("#title").val(result.data.title); $.toast({ @@ -173,7 +182,8 @@ Edit.getTags = function () { icon: "info", }); } - }).finally(() => { + }, + ).finally(() => { Edit.showTags(); }); }; diff --git a/public/js/index.js b/public/js/index.js index c61347f15..f84fd54c3 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -323,8 +323,11 @@ Index.updateCarousel = function (e) { } if (Index.carouselInitialized) { - Server.callAPI(endpoint, - "GET", null, "Error getting carousel data!", + Server.callAPI( + endpoint, + "GET", + null, + "Error getting carousel data!", (results) => { Index.swiper.virtual.removeAllSlides(); const slides = results.data @@ -335,7 +338,8 @@ Index.updateCarousel = function (e) { $("#carousel-loading").hide(); $(".swiper-wrapper").show(); $("#reload-carousel").removeClass("fa-spin"); - }); + }, + ); } }; @@ -434,7 +438,11 @@ Index.fetchChangelog = function () { * @returns Categories */ Index.loadContextMenuCategories = function (id) { - return Server.callAPI(`/api/archives/${id}/categories`, "GET", null, `Error finding categories for ${id}!`, + return Server.callAPI( + `/api/archives/${id}/categories`, + "GET", + null, + `Error finding categories for ${id}!`, (data) => { const items = {}; @@ -448,7 +456,8 @@ Index.loadContextMenuCategories = function (id) { } return items; - }); + }, + ); }; /** @@ -495,7 +504,11 @@ Index.handleContextMenu = function (option, id) { */ Index.loadTagSuggestions = function () { // Query the tag cloud API to get the most used tags. - Server.callAPI("/api/database/stats?minweight=2", "GET", null, "Couldn't load tag suggestions", + Server.callAPI( + "/api/database/stats?minweight=2", + "GET", + null, + "Couldn't load tag suggestions", (data) => { // Get namespaces objects in the data array to fill the namespace-sortby combobox const namespacesSet = new Set(data.map((element) => (element.namespace === "parody" ? "series" : element.namespace))); @@ -530,14 +543,19 @@ Index.loadTagSuggestions = function () { this.input.value = `${before + text}, `; }, }); - }); + }, + ); }; /** * Query the category API to build the filter buttons. */ Index.loadCategories = function () { - Server.callAPI("/api/categories", "GET", null, "Couldn't load categories", + Server.callAPI( + "/api/categories", + "GET", + null, + "Couldn't load categories", (data) => { // Sort by LastUsed + pinned // Pinned categories are shown at the beginning @@ -582,7 +600,8 @@ Index.loadCategories = function () { // Add a listener on dropdown selection $("#catdropdown").on("change", () => Index.toggleCategory($("#catdropdown")[0].selectedOptions[0])); - }); + }, + ); }; /** diff --git a/public/js/reader.js b/public/js/reader.js index 30b7d0c7d..3bf56ccfd 100644 --- a/public/js/reader.js +++ b/public/js/reader.js @@ -45,8 +45,13 @@ Reader.initializeAll = function () { }); $(document).on("click.edit_metadata", "#edit-archive", () => LRR.openInNewTab(`./edit?id=${Reader.id}`)); $(document).on("click.add_category", "#add-category", () => Server.addArchiveToCategory(Reader.id, $("#category").val())); - $(document).on("click.set_thumbnail", "#set-thumbnail", () => Server.callAPI(`/api/archives/${Reader.id}/thumbnail?page=${Reader.currentPage + 1}`, - "PUT", `Successfully set page ${Reader.currentPage + 1} as the thumbnail!`, "Error updating thumbnail!", null)); + $(document).on("click.set_thumbnail", "#set-thumbnail", () => Server.callAPI( + `/api/archives/${Reader.id}/thumbnail?page=${Reader.currentPage + 1}`, + "PUT", + `Successfully set page ${Reader.currentPage + 1} as the thumbnail!`, + "Error updating thumbnail!", + null, + )); $(document).on("click.thumbnail", ".quick-thumbnail", (e) => { LRR.closeOverlay(); @@ -68,7 +73,11 @@ Reader.initializeAll = function () { Server.callAPI(`/api/archives/${Reader.id}/isnew`, "DELETE", null, "Error clearing new flag! Check Logs.", null); // Get basic metadata - Server.callAPI(`/api/archives/${Reader.id}/metadata`, "GET", null, "Error getting basic archive info!", + Server.callAPI( + `/api/archives/${Reader.id}/metadata`, + "GET", + null, + "Error getting basic archive info!", (data) => { let { title } = data; @@ -97,11 +106,16 @@ Reader.initializeAll = function () { // Load the actual reader pages now that we have basic info Reader.loadImages(); - }); + }, + ); }; Reader.loadImages = function () { - Server.callAPI(`/api/archives/${Reader.id}/files?force=${Reader.force}`, "GET", null, "Error getting the archive's imagelist!", + Server.callAPI( + `/api/archives/${Reader.id}/files?force=${Reader.force}`, + "GET", + null, + "Error getting the archive's imagelist!", (data) => { Reader.pages = data.pages; Reader.maxPage = Reader.pages.length - 1; @@ -144,10 +158,14 @@ Reader.loadImages = function () { if (Reader.showOverlayByDefault) { Reader.toggleArchiveOverlay(); } // Wait for the extraction job to conclude before getting thumbnails - Server.checkJobStatus(data.job, false, + Server.checkJobStatus( + data.job, + false, () => Reader.initializeArchiveOverlay(), - () => LRR.showErrorToast("The extraction job didn't conclude properly. Your archive might be corrupted.")); - }).finally(() => { + () => LRR.showErrorToast("The extraction job didn't conclude properly. Your archive might be corrupted."), + ); + }, + ).finally(() => { if (Reader.pages === undefined) { $("#img").attr("src", "img/flubbed.gif"); $("#display").append("

      I flubbed it while trying to open the archive.

      "); @@ -672,9 +690,12 @@ Reader.initializeArchiveOverlay = function () { thumbSuccess(); } else if (response.status === 202) { // Wait for Minion job to finish - response.json().then((data) => Server.checkJobStatus(data.job, false, + response.json().then((data) => Server.checkJobStatus( + data.job, + false, () => thumbSuccess(), - () => thumbFail())); + () => thumbFail(), + )); } else { // We don't have a thumbnail for this page thumbFail(); diff --git a/public/js/server.js b/public/js/server.js index a9d0f9a47..4325cc371 100644 --- a/public/js/server.js +++ b/public/js/server.js @@ -112,10 +112,16 @@ Server.triggerScript = function (namespace) { // Save data before triggering script Server.saveFormData("#editPluginForm") - .then(Server.callAPI(`/api/plugins/queue?plugin=${namespace}&arg=${scriptArg}`, "POST", null, "Error while executing Script :", + .then(Server.callAPI( + `/api/plugins/queue?plugin=${namespace}&arg=${scriptArg}`, + "POST", + null, + "Error while executing Script :", (data) => { // Check minion job state periodically while we're on this page - Server.checkJobStatus(data.job, true, + Server.checkJobStatus( + data.job, + true, (d) => { Server.isScriptRunning = false; $(".script-running").hide(); @@ -137,15 +143,22 @@ Server.triggerScript = function (namespace) { Server.isScriptRunning = false; $(".script-running").hide(); $(".stdbtn").show(); - }); - })); + }, + ); + }, + )); }; Server.cleanTemporaryFolder = function () { - Server.callAPI("/api/tempfolder", "DELETE", "Temporary Folder Cleaned!", "Error while cleaning Temporary Folder :", + Server.callAPI( + "/api/tempfolder", + "DELETE", + "Temporary Folder Cleaned!", + "Error while cleaning Temporary Folder :", (data) => { $("#tempsize").html(data.newsize); - }); + }, + ); }; Server.invalidateCache = function () { @@ -158,15 +171,24 @@ Server.clearAllNewFlags = function () { Server.dropDatabase = function () { if (window.confirm("Danger! Are you *sure* you want to do this?")) { - Server.callAPI("/api/database/drop", "POST", "Sayonara! Redirecting you...", "Error while resetting the database? Check Logs.", + Server.callAPI( + "/api/database/drop", + "POST", + "Sayonara! Redirecting you...", + "Error while resetting the database? Check Logs.", () => { setTimeout(() => { document.location.href = "./"; }, 1500); - }); + }, + ); } }; Server.cleanDatabase = function () { - Server.callAPI("/api/database/clean", "POST", null, "Error while cleaning the database! Check Logs.", + Server.callAPI( + "/api/database/clean", + "POST", + null, + "Error while cleaning the database! Check Logs.", (data) => { $.toast({ showHideTransition: "slide", @@ -186,20 +208,26 @@ Server.cleanDatabase = function () { icon: "warning", }); } - }); + }, + ); }; Server.regenerateThumbnails = function (force) { const forceparam = force ? 1 : 0; - Server.callAPI(`/api/regen_thumbs?force=${forceparam}`, "POST", - "Queued up a job to regenerate thumbnails! Stay tuned for updates or check the Minion console.", "Error while sending job to Minion:", + Server.callAPI( + `/api/regen_thumbs?force=${forceparam}`, + "POST", + "Queued up a job to regenerate thumbnails! Stay tuned for updates or check the Minion console.", + "Error while sending job to Minion:", (data) => { // Disable the buttons to avoid accidental double-clicks. $("#genthumb-button").prop("disabled", true); $("#forcethumb-button").prop("disabled", true); // Check minion job state periodically while we're on this page - Server.checkJobStatus(data.job, true, + Server.checkJobStatus( + data.job, + true, (d) => { $("#genthumb-button").prop("disabled", false); $("#forcethumb-button").prop("disabled", false); @@ -217,8 +245,10 @@ Server.regenerateThumbnails = function (force) { $("#genthumb-button").prop("disabled", false); $("#forcethumb-button").prop("disabled", false); LRR.showErrorToast("The thumbnail regen job failed!", error); - }); - }); + }, + ); + }, + ); }; // Adds an archive to a category. Basic implementation to use everywhere. diff --git a/public/js/upload.js b/public/js/upload.js index 372559512..1fbc4bd11 100644 --- a/public/js/upload.js +++ b/public/js/upload.js @@ -95,9 +95,12 @@ Upload.downloadUrl = function () { Upload.updateUploadCounters(); // Check minion job state periodically to update the result - Server.checkJobStatus(data.job, true, + Server.checkJobStatus( + data.job, + true, (d) => Upload.handleCompletedUpload(data.job, d), - (error) => Upload.handleFailedUpload(data.job, error)); + (error) => Upload.handleFailedUpload(data.job, error), + ); } else { throw new Error(data.message); } @@ -138,9 +141,12 @@ Upload.initUpload = function () { Upload.updateUploadCounters(); // Check minion job state periodically to update the result - Server.checkJobStatus(data.result.job, true, + Server.checkJobStatus( + data.result.job, + true, (d) => Upload.handleCompletedUpload(data.result.job, d), - (error) => Upload.handleFailedUpload(data.result.job, error)); + (error) => Upload.handleFailedUpload(data.result.job, error), + ); }, fail(e, data) { From a98d6d2999ee0cce7b5b56ed7c4714ae8f3e388c Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 17:10:40 +0800 Subject: [PATCH 20/88] revert collapsible-body css change --- public/css/lrr.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/public/css/lrr.css b/public/css/lrr.css index c3e187ce6..565be4081 100644 --- a/public/css/lrr.css +++ b/public/css/lrr.css @@ -324,9 +324,6 @@ p#nb { } .collapsible-body { - flex: 1 0 100%; - overflow: hidden; - box-sizing: border-box; border: none !important; } From 3fd655963e5e500d55c19f50a6de08d592fd7d28 Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 17:24:13 +0800 Subject: [PATCH 21/88] match carousel-mode-menu with themes --- public/themes/modern_clear.css | 7 +++++++ public/themes/modern_red.css | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/public/themes/modern_clear.css b/public/themes/modern_clear.css index 8874a5315..81e5d5363 100644 --- a/public/themes/modern_clear.css +++ b/public/themes/modern_clear.css @@ -331,6 +331,13 @@ td.itdc{text-align:center;padding:0 1px 0 2px;margin:0;border-right:1px solid #5 color: #ed2553; } +#carousel-mode-menu { + color: #e1e7e9; +} +#carousel-mode-menu:hover { + color: #ed2553; +} + /* image pages */ div.sni{ text-align:center; diff --git a/public/themes/modern_red.css b/public/themes/modern_red.css index 5e4319b56..00e99241e 100644 --- a/public/themes/modern_red.css +++ b/public/themes/modern_red.css @@ -353,6 +353,14 @@ td.itdc { color: #ed2553; } +#carousel-mode-menu { + color: #414135; +} +#carousel-mode-menu:hover { + color: #ed2553; +} + + div.sni { background-color: #D83B66; box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.16), 0 2px 15px 0 rgba(0, 0, 0, 0.12); From e54fe112d4669cf3a7e1492cfaaa05b4f384721a Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 22:40:29 +0800 Subject: [PATCH 22/88] transfer \x26\x0A to \n& to mute ESLint --- public/js/common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/common.js b/public/js/common.js index 441b9cc52..c33771944 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -13,10 +13,10 @@ LRR.encodeHTML = function (r, isTimestamp = false) { if (r === undefined) return r; if (isTimestamp === true) return (new Date(r * 1000)).toLocaleDateString(); if (Array.isArray(r)) { - return r[0].replace(/[\x26\x0A<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); + return r[0].replace(/[\n&<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); } else { // console.log(r); - return r.replace(/[\x26\x0A<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); + return r.replace(/[\n&<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); } }; From 9e8bcb31ab2c00f5e3298a3b94dfa6e95a92c711 Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 22:48:31 +0800 Subject: [PATCH 23/88] move timestamp converter to seperated function --- public/js/common.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/public/js/common.js b/public/js/common.js index c33771944..c6e0f02d3 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -4,22 +4,28 @@ const LRR = {}; /** - * Quick 'n dirty HTML encoding function. + * Quickly HTML encoding function. * @param {*} r The HTML to encode - * @param {boolean} isTimestamp Option to convert timestamp to date string * @returns Encoded string */ -LRR.encodeHTML = function (r, isTimestamp = false) { +LRR.encodeHTML = function (r) { if (r === undefined) return r; - if (isTimestamp === true) return (new Date(r * 1000)).toLocaleDateString(); if (Array.isArray(r)) { return r[0].replace(/[\n&<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); } else { - // console.log(r); return r.replace(/[\n&<>'"]/g, (r2) => `&#${r2.charCodeAt(0)};`); } }; +/** + * Unix timestamp converting function. + * @param {number} r The timestamp to convert + * @returns Converted string + */ +LRR.convertTimestamp = function (r) { + return (new Date(r * 1000)).toLocaleDateString(); +}; + /** * Check if we're running on a mobile browser. */ @@ -117,7 +123,7 @@ LRR.colorCodeTags = function (tags) { tagsToEncode.sort().forEach((key) => { tagsByNamespace[key].forEach((tag) => { const encodedK = LRR.encodeHTML(key.toLowerCase()); - line += `${LRR.encodeHTML(tag, key === "date_added" || key === "timestamp")}, `; + line += `${LRR.encodeHTML(key === "date_added" || key === "timestamp" ? LRR.convertTimestamp(tag) : tag)}, `; }); }); // Remove last comma @@ -183,7 +189,7 @@ LRR.buildTagsDiv = function (tags) { const url = LRR.getTagSearchURL(key, tag); const searchTag = LRR.buildNamespacedTag(key, tag); - const tagText = LRR.encodeHTML(tag, key === "date_added" || key === "timestamp"); + const tagText = LRR.encodeHTML(key === "date_added" || key === "timestamp" ? LRR.convertTimestamp(tag) : tag); line += `
      From c266e85874f8eec56f3948028bcac27c11b1e992 Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Thu, 28 Apr 2022 22:51:51 +0800 Subject: [PATCH 24/88] generlize toggleCarousel --- public/js/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/js/index.js b/public/js/index.js index f84fd54c3..7a964666e 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -58,7 +58,7 @@ Index.initializeAll = function () { // Force-open the collapsible if carouselOpen = true if (localStorage.carouselOpen === "1") { - $(".collapsible-title").trigger("click", [true]); + $(".collapsible-title").trigger("click", [false]); // Index.updateCarousel(); will be executed by toggleCarousel } else { Index.updateCarousel(); @@ -132,8 +132,8 @@ Index.toggleMode = function () { IndexTable.dataTable.draw(); }; -Index.toggleCarousel = function (e, firstrun = false) { - if (!firstrun) localStorage.carouselOpen = (localStorage.carouselOpen === "1") ? "0" : "1"; +Index.toggleCarousel = function (e, updateLocalStorage = true) { + if (updateLocalStorage) localStorage.carouselOpen = (localStorage.carouselOpen === "1") ? "0" : "1"; if (!Index.carouselInitialized) { Index.carouselInitialized = true; From 8ad21c7692f504c7affbae24dbb2f3957bd195e2 Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Fri, 29 Apr 2022 00:48:09 +0800 Subject: [PATCH 25/88] move js to seperated file --- public/js/backup.js | 38 +++++ public/js/batch.js | 5 +- public/js/category.js | 31 +++- public/js/common.js | 2 + public/js/config.js | 132 ++++++++++++++++++ public/js/edit.js | 43 +++--- public/js/index.js | 4 + public/js/index_datatables.js | 3 + public/js/logs.js | 40 ++++++ public/js/plugins.js | 42 ++++++ public/js/reader.js | 2 +- public/js/server.js | 2 + public/js/stats.js | 47 +++++++ public/js/upload.js | 127 +++++++++-------- templates/backup.html.tt2 | 39 +----- templates/batch.html.tt2 | 7 +- templates/category.html.tt2 | 23 ++- templates/config.html.tt2 | 108 +------------- templates/edit.html.tt2 | 3 +- templates/index.html.tt2 | 12 +- templates/login.html.tt2 | 6 +- templates/logs.html.tt2 | 17 +-- templates/plugins.html.tt2 | 41 +----- templates/reader.html.tt2 | 2 +- templates/stats.html.tt2 | 42 +----- .../templates_config/config_files.html.tt2 | 9 +- .../templates_config/config_global.html.tt2 | 4 +- .../templates_config/config_shinobu.html.tt2 | 5 +- .../templates_config/config_tags.html.tt2 | 6 +- .../templates_config/config_theme.html.tt2 | 73 +++++----- templates/upload.html.tt2 | 6 +- 31 files changed, 533 insertions(+), 388 deletions(-) create mode 100644 public/js/backup.js create mode 100644 public/js/config.js create mode 100644 public/js/logs.js create mode 100644 public/js/plugins.js create mode 100644 public/js/stats.js diff --git a/public/js/backup.js b/public/js/backup.js new file mode 100644 index 000000000..0bf82c4d1 --- /dev/null +++ b/public/js/backup.js @@ -0,0 +1,38 @@ +/** + * Backup Operations. + */ +const Backup = {}; + +Backup.initializeAll = function () { + // bind events to DOM + $(document).on("click.return", "#return", () => { window.location.replace("./"); }); + $(document).on("click.do-backup", "#do-backup", () => { window.open("./backup?dobackup=1", "_blank"); }); + + // Handler for file uploading. + $("#fileupload").fileupload({ + dataType: "json", + done(e, data) { + $("#processing").attr("style", "display:none"); + + if (data.result.success === 1) $("#result").html("Backup restored!"); + else $("#result").html(data.result.error); + }, + + fail() { + $("#processing").attr("style", "display:none"); + $("#result").html("An error occured server-side. woops.
      Maybe your JSON is badly formatted ?"); + }, + + progressall() { + $("#result").html(""); + $("#processing").attr("style", ""); + }, + + }); +}; + +jQuery(() => { + Backup.initializeAll(); +}); + +window.Backup = Backup; diff --git a/public/js/batch.js b/public/js/batch.js index 0ae541e4c..5d640e6e9 100644 --- a/public/js/batch.js +++ b/public/js/batch.js @@ -18,6 +18,9 @@ Batch.initializeAll = function () { $(document).on("click.start-batch", "#start-batch", Batch.startBatch); $(document).on("click.restart-job", "#restart-job", Batch.restartBatchUI); $(document).on("click.cancel-job", "#cancel-job", Batch.cancelBatch); + $(document).on("click.server-config", "#server-config", () => LRR.openInNewTab("./config")); + $(document).on("click.plugin-config", "#plugin-config", () => LRR.openInNewTab("./config/plugins")); + $(document).on("click.return", "#return", () => { window.location.href = "./"; }); Batch.selectOperation(); Batch.showOverride(); @@ -312,7 +315,7 @@ Batch.restartBatchUI = function () { $(".job-status").hide(); }; -$(document).ready(() => { +jQuery(() => { Batch.initializeAll(); }); diff --git a/public/js/category.js b/public/js/category.js index b95a6b33d..756097b78 100644 --- a/public/js/category.js +++ b/public/js/category.js @@ -1,5 +1,24 @@ +/** + * Category Operations. + */ const Category = {}; -let categories = []; + +Category.categories = []; + +Category.initializeAll = function () { + // bind events to DOM + $(document).on("change.category", "#category", Category.updateCategoryDetails); + $(document).on("change.catname", "#catname", Category.saveCurrentCategoryDetails); + $(document).on("change.catsearch", "#catsearch", Category.saveCurrentCategoryDetails); + $(document).on("change.pinned", "#pinned", Category.saveCurrentCategoryDetails); + $(document).on("click.new-static", "#new-static", () => Category.addNewCategory(false)); + $(document).on("click.new-dynamic", "#new-dynamic", () => Category.addNewCategory(true)); + $(document).on("click.predicate-help", "#predicate-help", Category.predicateHelp); + $(document).on("click.delete", "#delete", Category.deleteSelectedCategory); + $(document).on("click.return", "#return", () => { window.location.href = "/"; }); + + Category.loadCategories(); +}; Category.addNewCategory = function (isDynamic) { const catName = prompt("Enter a name for the new category:", "My Category"); @@ -28,7 +47,7 @@ Category.loadCategories = function (selectedID) { .then((response) => response.json()) .then((data) => { // Save data clientside for reference in later functions - categories = data; + Category.categories = data; // Clear combobox and fill it again with categories from the API const catCombobox = document.getElementById("category"); @@ -50,7 +69,7 @@ Category.loadCategories = function (selectedID) { Category.updateCategoryDetails = function () { // Get selected category ID and find it in the reference array const categoryID = document.getElementById("category").value; - const category = categories.find((x) => x.id === categoryID); + const category = Category.categories.find((x) => x.id === categoryID); $("#archivelist").hide(); $("#dynamicplaceholder").show(); @@ -173,3 +192,9 @@ Category.predicateHelp = function () { icon: "info", }); }; + +jQuery(() => { + Category.initializeAll(); +}); + +window.Category = Category; diff --git a/public/js/common.js b/public/js/common.js index c6e0f02d3..b0e7c8c6a 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -299,3 +299,5 @@ LRR.getImgSize = function (target) { }); return imgSize; }; + +window.LRR = LRR; diff --git a/public/js/config.js b/public/js/config.js new file mode 100644 index 000000000..1ab0c848d --- /dev/null +++ b/public/js/config.js @@ -0,0 +1,132 @@ +/** + * Config Operations. + */ +const Config = {}; + +Config.initializeAll = function () { + // bind events to DOM + $(document).on("click.save", "#save", () => { Server.saveFormData("#editConfigForm"); }); + $(document).on("click.plugin-config", "#plugin-config", () => { window.location.href = "/config/plugins"; }); + $(document).on("click.backup", "#backup", () => { window.location.href = "/backup"; }); + $(document).on("click.return", "#return", () => { window.location.href = "/"; }); + $(document).on("click.enablepass", "#enablepass", Config.enable_pass); + $(document).on("click.enableresize", "#enableresize", Config.enable_resize); + $(document).on("click.usedateadded", "#usedateadded", () => Config.enable_timemodified); + + $(document).on("click.rescan-button", "#rescan-button", Config.rescanContentFolder); + $(document).on("click.clean_temp", "#clean_temp", Server.cleanTemporaryFolder); + $(document).on("click.reset_search_cache", "#reset_search_cache", Server.invalidateCache); + $(document).on("click.clear_new_tags", "#clear_new_tags", Server.clearAllNewFlags); + + $(document).on("click.clean_db", "#clean_db", Server.cleanDatabase); + $(document).on("click.drop_db", "#drop_db", Server.dropDatabase); + + $(document).on("click.restart-button", "#restart-button", Config.rebootShinobu); + $(document).on("click.open_minion", "#open_minion", () => LRR.openInNewTab("/minion")); + + $(document).on("click.genthumb-button", "#genthumb-button", () => Server.regenerateThumbnails(false)); + $(document).on("click.forcethumb-button", "#forcethumb-button", () => Server.regenerateThumbnails(true)); + + $(document).on("click.modern_div", "#modern_div", () => Config.switch_style("Hachikuji")); + $(document).on("click.modern_clear_div", "#modern_clear_div", () => Config.switch_style("Yotsugi")); + $(document).on("click.modern_red_div", "#modern_red_div", () => Config.switch_style("Nadeko")); + $(document).on("click.ex_div", "#ex_div", () => Config.switch_style("Sad Panda")); + $(document).on("click.g_div", "#g_div", () => Config.switch_style("H-Verse")); + + Config.enable_pass(); + Config.enable_resize(); + Config.enable_timemodified(); + Config.shinobuStatus(); + setInterval(Config.shinobuStatus, 5000); +}; + +Config.rebootShinobu = function () { + $("#restart-button").prop("disabled", true); + Server.callAPI( + "/api/shinobu/restart", + "POST", + "Background Worker restarted!", + "Error while restarting Worker:", + () => { + $("#restart-button").prop("disabled", false); + Config.shinobuStatus(); + }, + ); +}; + +Config.rescanContentFolder = function () { + $("#rescan-button").prop("disabled", true); + Server.callAPI( + "/api/shinobu/rescan", + "POST", + "Content folder rescan started!", + "Error while restarting Worker:", + () => { + $("#rescan-button").prop("disabled", false); + Config.shinobuStatus(); + }, + ); +}; + +// Update the status of the background worker. +Config.shinobuStatus = function () { + Server.callAPI( + "/api/shinobu", + "GET", + null, + "Error while querying Shinobu status:", + (data) => { + if (data.is_alive) { + $("#shinobu-ok").show(); + $("#shinobu-ko").hide(); + } else { + $("#shinobu-ko").show(); + $("#shinobu-ok").hide(); + } + $("#pid").html(data.pid); + }, + ); +}; + +Config.switch_style = function (cssTitle) { + let i, linkTag, correctStyle, defaultStyle, newStyle; + correctStyle = 0; + + for (i = 0, linkTag = document.getElementsByTagName("link"); i < linkTag.length; i++) { + if ((linkTag[i].rel.indexOf("stylesheet") !== -1) && linkTag[i].title) { + if ((linkTag[i].rel.indexOf("alternate stylesheet") !== -1)) linkTag[i].disabled = true; + else defaultStyle = linkTag[i]; + + if (linkTag[i].title === cssTitle) { + newStyle = linkTag[i]; + correctStyle = 1; + } + } + } + + if (correctStyle === 1) { // if the style that was switched to exists + defaultStyle.disabled = true; // we disable the default style + newStyle.disabled = false; // we enable the new style + } +}; + +Config.enable_pass = function () { + if ($("#enablepass").prop("checked")) $(".passwordfields").show(); + else $(".passwordfields").hide(); +}; + +Config.enable_resize = function () { + if ($("#enableresize").prop("checked")) $(".resizefields").show(); + else $(".resizefields").hide(); +}; + +Config.enable_timemodified = function () { + if ($("#usedateadded").prop("checked")) $(".datemodified").show(); + else $(".datemodified").hide(); +}; + +jQuery(() => { + Config.initializeAll(); +}); + +window.Config = Config; diff --git a/public/js/edit.js b/public/js/edit.js index 50fef29ee..773f3f681 100644 --- a/public/js/edit.js +++ b/public/js/edit.js @@ -7,33 +7,15 @@ const Edit = {}; Edit.tagInput = {}; Edit.suggestions = []; -Edit.hideTags = function () { - $("#tag-spinner").css("display", "block"); - $("#tagText").css("opacity", "0.5"); - $("#tagText").prop("disabled", true); - $("#plugin-table").hide(); -}; - -Edit.showTags = function () { - $("#tag-spinner").css("display", "none"); - $("#tagText").prop("disabled", false); - $("#tagText").css("opacity", "1"); - $("#plugin-table").show(); -}; - -Edit.focusTagInput = function () { - // Focus child of tagger-new - $(".tagger-new").children()[0].focus(); -}; - Edit.initializeAll = function () { // bind events to DOM + $(document).on("change.plugin", "#plugin", Edit.updateOneShotArg); $(document).on("click.show-help", "#show-help", Edit.showHelp); $(document).on("click.run-plugin", "#run-plugin", Edit.runPlugin); $(document).on("click.save-metadata", "#save-metadata", Edit.saveMetadata); $(document).on("click.delete-archive", "#delete-archive", Edit.deleteArchive); - $(document).on("change.plugin", "#plugin", Edit.updateOneShotArg); $(document).on("click.tagger", ".tagger", Edit.focusTagInput); + $(document).on("click.goback", "#goback", () => { window.location.replace("./"); }); Edit.updateOneShotArg(); @@ -74,6 +56,25 @@ Edit.initializeAll = function () { }); }; +Edit.hideTags = function () { + $("#tag-spinner").css("display", "block"); + $("#tagText").css("opacity", "0.5"); + $("#tagText").prop("disabled", true); + $("#plugin-table").hide(); +}; + +Edit.showTags = function () { + $("#tag-spinner").css("display", "none"); + $("#tagText").prop("disabled", false); + $("#tagText").css("opacity", "1"); + $("#plugin-table").show(); +}; + +Edit.focusTagInput = function () { + // Focus child of tagger-new + $(".tagger-new").children()[0].focus(); +}; + Edit.showHelp = function () { $.toast({ heading: "About Plugins", @@ -192,7 +193,7 @@ Edit.runPlugin = function () { Edit.saveMetadata().then(() => Edit.getTags()); }; -$(document).ready(() => { +jQuery(() => { Edit.initializeAll(); }); diff --git a/public/js/index.js b/public/js/index.js index 7a964666e..e6af21e7a 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -657,4 +657,8 @@ Index.migrateProgress = function () { } }; +jQuery(() => { + Index.initializeAll(); +}); + window.Index = Index; diff --git a/public/js/index_datatables.js b/public/js/index_datatables.js index 921c71be3..6191ca333 100644 --- a/public/js/index_datatables.js +++ b/public/js/index_datatables.js @@ -2,6 +2,7 @@ * All the Archive Index functions related to DataTables. */ const IndexTable = {}; + IndexTable.dataTable = {}; IndexTable.originalTitle = document.title; IndexTable.isComingFromPopstate = false; @@ -347,3 +348,5 @@ IndexTable.buildTagTooltip = function (target) { $(target).attr("onmouseover", ""); }; + +window.IndexTable = IndexTable; diff --git a/public/js/logs.js b/public/js/logs.js new file mode 100644 index 000000000..f6b8cfa0f --- /dev/null +++ b/public/js/logs.js @@ -0,0 +1,40 @@ +/** + * Logs Operations. + */ +const Logs = {}; + +Logs.lastType = ""; + +Logs.initializeAll = function () { + // bind events to DOM + $(document).on("click.refresh", "#refresh", Logs.refreshLog); + $(document).on("click.loglines", "#loglines", Logs.refreshLog); + $(document).on("click.show_general", "#show_general", () => Logs.showLog("general")); + $(document).on("click.show_shinobu", "#show_shinobu", () => Logs.showLog("shinobu")); + $(document).on("click.show_plugins", "#show_plugins", () => Logs.showLog("plugins")); + $(document).on("click.show_mojo", "#show_mojo", () => Logs.showLog("mojo")); + $(document).on("click.show_redis", "#show_redis", () => Logs.showLog("redis")); + $(document).on("click.return", "#return", () => { window.location.replace("/"); }); + + Logs.showLog("general"); +}; + +Logs.showLog = function (type) { + $.get(`/logs/${type}?lines=${$("#loglines").val()}`, (data) => { + $("#log-container").html(LRR.encodeHTML(data)); + $("#indicator").html(type); + $("#log-container").scrollTop($("#log-container").prop("scrollHeight")); + }); + + Logs.lastType = type; +}; + +Logs.refreshLog = function () { + Logs.showLog(Logs.lastType); +}; + +jQuery(() => { + Logs.initializeAll(); +}); + +window.Logs = Logs; diff --git a/public/js/plugins.js b/public/js/plugins.js new file mode 100644 index 000000000..9dd4bc890 --- /dev/null +++ b/public/js/plugins.js @@ -0,0 +1,42 @@ +/** + * Plugins Operations. + */ +const Plugins = {}; + +Plugins.initializeAll = function () { + // bind events to DOM + $(document).on("click.save", "#save", () => Server.saveFormData("#editPluginForm")); + $(document).on("click.return", "#return", () => { window.location.replace("/"); }); + + // Handler for file uploading. + $("#fileupload").fileupload({ + url: "/config/plugins/upload", + dataType: "json", + done(e, data) { + if (data.result.success) { + $.toast({ + heading: "Plugin successfully uploaded!", + text: `The plugin "${data.result.name}" has been successfully added. Refresh the page to see it.`, + hideAfter: false, + position: "top-left", + icon: "info", + }); + } else { + $.toast({ + heading: "Error uploading plugin", + text: data.result.error, + hideAfter: false, + position: "top-left", + icon: "error", + }); + } + }, + + }); +}; + +jQuery(() => { + Plugins.initializeAll(); +}); + +window.Plugins = Plugins; diff --git a/public/js/reader.js b/public/js/reader.js index 3bf56ccfd..e6f2e333e 100644 --- a/public/js/reader.js +++ b/public/js/reader.js @@ -753,7 +753,7 @@ Reader.handlePaginator = function () { } }; -$(document).ready(() => { +jQuery(() => { Reader.initializeAll(); }); diff --git a/public/js/server.js b/public/js/server.js index 4325cc371..eed5af6b0 100644 --- a/public/js/server.js +++ b/public/js/server.js @@ -297,3 +297,5 @@ Server.deleteArchive = function (arcId, callback) { }) .catch((error) => LRR.showErrorToast("Error while deleting archive", error)); }; + +window.Server = Server; diff --git a/public/js/stats.js b/public/js/stats.js new file mode 100644 index 000000000..55ea829d0 --- /dev/null +++ b/public/js/stats.js @@ -0,0 +1,47 @@ +/** + * Stats Operations. + */ +const Stats = {}; + +Stats.initializeAll = function () { + // bind events to DOM + $(document).on("click.goback", "#goback", () => { window.location.replace("./"); }); + + Server.callAPI( + "/api/database/stats?minweight=2", + "GET", + null, + "Couldn't load tag statistics", + (data) => { + $("#statsLoading").hide(); + $("#tagcount").html(data.length); + $("#tagCloud").jQCloud(data, { + autoResize: true, + }); + + // Sort data by weight + data.sort((a, b) => b.weight - a.weight); + + // Buildup detailed stats + const tagList = $("#tagList"); + data.forEach((tag) => { + const namespacedTag = LRR.buildNamespacedTag(tag.namespace, tag.text); + const url = LRR.getTagSearchURL(tag.namespace, tag.text); + + const ocss = "max-width: 95%; display: flex;"; + const icss = "text-overflow: ellipsis; white-space: nowrap; overflow: hidden; min-width: 0; max-width: 100%;"; + + const html = `      ${namespacedTag} (${tag.weight})`; + tagList.append(html); + }); + + $("#detailedStats").show(); + }, + ); +}; + +jQuery(() => { + Stats.initializeAll(); +}); + +window.Stats = Stats; diff --git a/public/js/upload.js b/public/js/upload.js index 1fbc4bd11..78faf826e 100644 --- a/public/js/upload.js +++ b/public/js/upload.js @@ -1,5 +1,4 @@ // Scripting for the Upload page. - const Upload = {}; let processingArchives = 0; @@ -7,6 +6,70 @@ let completedArchives = 0; let failedArchives = 0; let totalUploads = 0; +// Set up jqueryfileupload. +Upload.initializeAll = function () { + // bind events to DOM + $(document).on("click.download-url", "#download-url", Upload.downloadUrl); + $(document).on("click.return", "#return", () => { window.location.replace("./"); }); + + $("#fileupload").fileupload({ + dataType: "json", + formData() { + const array = [{ name: "catid", value: document.getElementById("category").value }]; + return array; + }, + done(e, data) { + let result; + if (data.result.success === 0) { + result = `${data.result.name} + ${data.result.error} + `; + } else { + result = ` + ${data.result.name} + + + Processing file... (Job #${data.result.job}) + + `; + } + + $("#progress .bar").css("width", "0%"); + $("#files").append(result); + + totalUploads += 1; + processingArchives += 1; + Upload.updateUploadCounters(); + + // Check minion job state periodically to update the result + Server.checkJobStatus( + data.result.job, + true, + (d) => Upload.handleCompletedUpload(data.result.job, d), + (error) => Upload.handleFailedUpload(data.result.job, error), + ); + }, + + fail(e, data) { + const result = `${data.result.name} + ${data.errorThrown} + `; + $("#progress .bar").css("width", "0%"); + $("#files").append(result); + + totalUploads += 1; + failedArchives += 1; + Upload.updateUploadCounters(); + }, + + progressall(e, data) { + const progress = parseInt((data.loaded / data.total) * 100, 10); + $("#progress .bar").css("width", `${progress}%`); + }, + + }); +}; + // Handle updating the upload counters. Upload.updateUploadCounters = function () { $("#progressCount").html(`πŸ€” Processing: ${processingArchives} πŸ™Œ Completed: ${completedArchives} πŸ‘Ή Failed: ${failedArchives}`); @@ -109,62 +172,8 @@ Upload.downloadUrl = function () { }); }; -// Set up jqueryfileupload. -Upload.initUpload = function () { - $("#fileupload").fileupload({ - dataType: "json", - formData() { - const array = [{ name: "catid", value: document.getElementById("category").value }]; - return array; - }, - done(e, data) { - let result; - if (data.result.success === 0) { - result = `${data.result.name} - ${data.result.error} - `; - } else { - result = ` - ${data.result.name} - - - Processing file... (Job #${data.result.job}) - - `; - } - - $("#progress .bar").css("width", "0%"); - $("#files").append(result); +jQuery(() => { + Upload.initializeAll(); +}); - totalUploads += 1; - processingArchives += 1; - Upload.updateUploadCounters(); - - // Check minion job state periodically to update the result - Server.checkJobStatus( - data.result.job, - true, - (d) => Upload.handleCompletedUpload(data.result.job, d), - (error) => Upload.handleFailedUpload(data.result.job, error), - ); - }, - - fail(e, data) { - const result = `${data.result.name} - ${data.errorThrown} - `; - $("#progress .bar").css("width", "0%"); - $("#files").append(result); - - totalUploads += 1; - failedArchives += 1; - Upload.updateUploadCounters(); - }, - - progressall(e, data) { - const progress = parseInt((data.loaded / data.total) * 100, 10); - $("#progress .bar").css("width", `${progress}%`); - }, - - }); -}; +window.Upload = Upload; diff --git a/templates/backup.html.tt2 b/templates/backup.html.tt2 index 3062c4801..561e7efe8 100644 --- a/templates/backup.html.tt2 +++ b/templates/backup.html.tt2 @@ -19,10 +19,11 @@ + - +

      Database Backup/Restore

      @@ -38,8 +39,7 @@ - +
      Backup Database       @@ -68,44 +68,13 @@


      - +

      - - [% INCLUDE footer %] diff --git a/templates/batch.html.tt2 b/templates/batch.html.tt2 index a75df9efb..25b3dd563 100644 --- a/templates/batch.html.tt2 +++ b/templates/batch.html.tt2 @@ -99,7 +99,7 @@ Archives.

      You can edit your Tag Rules in Server Configuration.

      - @@ -193,9 +193,8 @@

      - - + +
      • [% INCLUDE footer %] diff --git a/templates/category.html.tt2 b/templates/category.html.tt2 index 0665ada13..8ec299073 100644 --- a/templates/category.html.tt2 +++ b/templates/category.html.tt2 @@ -23,7 +23,7 @@ - +

      Categories

      @@ -48,8 +48,8 @@ You can create new categories here or edit existing ones.

      - - + +

      Select a category in the combobox below to edit its name, the archives it contains, or its predicate. @@ -62,8 +62,7 @@

      Category:

      - @@ -71,28 +70,26 @@ Name: - + Predicate: - - + + - + - + @@ -122,7 +119,7 @@

      - +
      [% INCLUDE footer %] diff --git a/templates/config.html.tt2 b/templates/config.html.tt2 index 94fa99882..082b50dec 100644 --- a/templates/config.html.tt2 +++ b/templates/config.html.tt2 @@ -21,6 +21,7 @@ + @@ -38,13 +39,10 @@

      Select a category to show the matching settings.


      -
      - - - +
      + + +
      - - [% INCLUDE footer %] + [% INCLUDE footer %] \ No newline at end of file diff --git a/templates/edit.html.tt2 b/templates/edit.html.tt2 index dac5cd996..758ee0221 100644 --- a/templates/edit.html.tt2 +++ b/templates/edit.html.tt2 @@ -111,8 +111,7 @@
      - +
      diff --git a/templates/index.html.tt2 b/templates/index.html.tt2 index 4fcb10808..fdb343411 100644 --- a/templates/index.html.tt2 +++ b/templates/index.html.tt2 @@ -82,10 +82,12 @@
        -
      • +
      • -
        @@ -175,7 +177,7 @@ @@ -233,7 +233,7 @@

      - - - + - - - [% INCLUDE footer %] diff --git a/templates/templates_config/config_files.html.tt2 b/templates/templates_config/config_files.html.tt2 index 35ac9c51e..d36a22647 100644 --- a/templates/templates_config/config_files.html.tt2 +++ b/templates/templates_config/config_files.html.tt2 @@ -15,8 +15,7 @@ - + Click this button to trigger a rescan of the Archive Directory in case you're missing files,
      @@ -39,7 +38,7 @@ - + Current Size: @@ -52,7 +51,7 @@ - + The last searches done in the archive index are cached for faster loads.
      @@ -65,7 +64,7 @@ - + Newly uploaded archives are marked as "new" in the index until you've opened them.
      diff --git a/templates/templates_config/config_global.html.tt2 b/templates/templates_config/config_global.html.tt2 index 0bcbfe69b..90fb70bfa 100644 --- a/templates/templates_config/config_global.html.tt2 +++ b/templates/templates_config/config_global.html.tt2 @@ -103,7 +103,7 @@ - + Cleaning the database will remove entries that aren't on your filesystem. @@ -112,7 +112,7 @@ - + Danger zone!
      diff --git a/templates/templates_config/config_shinobu.html.tt2 b/templates/templates_config/config_shinobu.html.tt2 index f139749aa..c64f90b22 100644 --- a/templates/templates_config/config_shinobu.html.tt2 +++ b/templates/templates_config/config_shinobu.html.tt2 @@ -18,8 +18,7 @@ - + If Shinobu is dead or unresponsive, you can reboot her by clicking this button. @@ -28,7 +27,7 @@ - + The Minion Worker handles spare tasks that are too long to execute within the request/response lifecycle of web diff --git a/templates/templates_config/config_tags.html.tt2 b/templates/templates_config/config_tags.html.tt2 index cfa99e106..012651378 100644 --- a/templates/templates_config/config_tags.html.tt2 +++ b/templates/templates_config/config_tags.html.tt2 @@ -13,8 +13,7 @@ - + Generate Thumbnails for all archives that don't have one yet. @@ -23,8 +22,7 @@ - + Regenerate all thumbnails. This might take a while! diff --git a/templates/templates_config/config_theme.html.tt2 b/templates/templates_config/config_theme.html.tt2 index af9e4185b..6137af046 100644 --- a/templates/templates_config/config_theme.html.tt2 +++ b/templates/templates_config/config_theme.html.tt2 @@ -1,8 +1,9 @@ - +
      The selected theme will apply to the entire application and be shown to all users.
      - If you're using a browser that supports "theme-color", the theme's primary color will also be applied there.

      + If you're using a browser that supports "theme-color", the theme's primary color will also be applied + there.

      Click on a theme to preview it before saving! @@ -10,63 +11,61 @@ - - -
      - + + +
      +
      -
      - +
      +
      -
      - +
      +
      -
      - +
      +
      -
      - +
      +
      + - + \ No newline at end of file diff --git a/templates/upload.html.tt2 b/templates/upload.html.tt2 index be24840d8..0e2dd0876 100644 --- a/templates/upload.html.tt2 +++ b/templates/upload.html.tt2 @@ -24,7 +24,7 @@ - +

      Adding Archives to the Library

      @@ -70,7 +70,7 @@

      - +
      Add from URL(s)       @@ -98,7 +98,7 @@


      - +
      [% INCLUDE footer %] From fcf0f9b5e65330ee21a84ccbee9c56f67b4920cc Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Fri, 29 Apr 2022 00:55:32 +0800 Subject: [PATCH 26/88] restore function-paren-newline --- .eslintrc.json | 4 ++- public/js/batch.js | 12 ++----- public/js/category.js | 24 +++----------- public/js/config.js | 18 ++--------- public/js/edit.js | 12 ++----- public/js/index.js | 75 +++++++++++++++++-------------------------- public/js/reader.js | 21 +++--------- public/js/server.js | 28 +++------------- public/js/stats.js | 6 +--- 9 files changed, 54 insertions(+), 146 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 6d5223ebb..652830df3 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -43,6 +43,8 @@ ], "one-var": "off", "one-var-declaration-per-line": ["error", "initializations"], - "prefer-destructuring": ["error", {"object": true, "array": false}] + "prefer-destructuring": ["error", {"object": true, "array": false}], + "function-paren-newline": "off", + "function-call-argument-newline": "off" } } diff --git a/public/js/batch.js b/public/js/batch.js index 5d640e6e9..a5c705560 100644 --- a/public/js/batch.js +++ b/public/js/batch.js @@ -28,11 +28,7 @@ Batch.initializeAll = function () { // Load all archives, showing a spinner while doing so $("#arclist").hide(); - Server.callAPI( - "/api/archives", - "GET", - null, - "Couldn't load the complete archive list! Please reload the page.", + Server.callAPI("/api/archives", "GET", null, "Couldn't load the complete archive list! Please reload the page.", (data) => { // Parse the archive list and add
    • elements to arclist data.forEach((archive) => { @@ -79,11 +75,7 @@ Batch.showOverride = function () { * Check untagged archives, using the matching API endpoint. */ Batch.checkUntagged = function () { - Server.callAPI( - "api/archives/untagged", - "GET", - null, - "Error getting untagged archives!", + Server.callAPI("api/archives/untagged", "GET", null, "Error getting untagged archives!", (data) => { // Check untagged archives data.forEach((id) => { diff --git a/public/js/category.js b/public/js/category.js index 756097b78..f4cdb64a1 100644 --- a/public/js/category.js +++ b/public/js/category.js @@ -30,11 +30,7 @@ Category.addNewCategory = function (isDynamic) { const searchtag = isDynamic ? "language:english" : ""; // Make an API request to create the category, if search is empty -> static, otherwise dynamic - Server.callAPI( - `/api/categories?name=${catName}&search=${searchtag}`, - "PUT", - `Category "${catName}" created!`, - "Error creating category:", + Server.callAPI(`/api/categories?name=${catName}&search=${searchtag}`, "PUT", `Category "${catName}" created!`, "Error creating category:", (data) => { // Reload categories and select the newly created ID Category.loadCategories(data.category_id); @@ -129,11 +125,7 @@ Category.saveCurrentCategoryDetails = function () { Category.indicateSaving(); // PUT update with name and search (search is empty if this is a static category) - Server.callAPI( - `/api/categories/${categoryID}?name=${catName}&search=${searchtag}&pinned=${pinned}`, - "PUT", - null, - "Error updating category:", + Server.callAPI(`/api/categories/${categoryID}?name=${catName}&search=${searchtag}&pinned=${pinned}`, "PUT", null, "Error updating category:", (data) => { // Reload categories and select the newly created ID Category.indicateSaved(); @@ -146,11 +138,7 @@ Category.updateArchiveInCategory = function (id, checked) { const categoryID = document.getElementById("category").value; Category.indicateSaving(); // PUT/DELETE api/categories/catID/archiveID - Server.callAPI( - `/api/categories/${categoryID}/${id}`, - checked ? "PUT" : "DELETE", - null, - "Error adding/removing archive to category", + Server.callAPI(`/api/categories/${categoryID}/${id}`, checked ? "PUT" : "DELETE", null, "Error adding/removing archive to category", () => { // Reload categories and select the archive list properly Category.indicateSaved(); @@ -162,11 +150,7 @@ Category.updateArchiveInCategory = function (id, checked) { Category.deleteSelectedCategory = function () { const categoryID = document.getElementById("category").value; if (window.confirm("Are you sure? The category will be deleted permanently!")) { - Server.callAPI( - `/api/categories/${categoryID}`, - "DELETE", - "Category deleted!", - "Error deleting category", + Server.callAPI(`/api/categories/${categoryID}`, "DELETE", "Category deleted!", "Error deleting category", () => { // Reload categories to show the archive list properly Category.loadCategories(); diff --git a/public/js/config.js b/public/js/config.js index 1ab0c848d..1bab649fd 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -42,11 +42,7 @@ Config.initializeAll = function () { Config.rebootShinobu = function () { $("#restart-button").prop("disabled", true); - Server.callAPI( - "/api/shinobu/restart", - "POST", - "Background Worker restarted!", - "Error while restarting Worker:", + Server.callAPI("/api/shinobu/restart", "POST", "Background Worker restarted!", "Error while restarting Worker:", () => { $("#restart-button").prop("disabled", false); Config.shinobuStatus(); @@ -56,11 +52,7 @@ Config.rebootShinobu = function () { Config.rescanContentFolder = function () { $("#rescan-button").prop("disabled", true); - Server.callAPI( - "/api/shinobu/rescan", - "POST", - "Content folder rescan started!", - "Error while restarting Worker:", + Server.callAPI("/api/shinobu/rescan", "POST", "Content folder rescan started!", "Error while restarting Worker:", () => { $("#rescan-button").prop("disabled", false); Config.shinobuStatus(); @@ -70,11 +62,7 @@ Config.rescanContentFolder = function () { // Update the status of the background worker. Config.shinobuStatus = function () { - Server.callAPI( - "/api/shinobu", - "GET", - null, - "Error while querying Shinobu status:", + Server.callAPI("/api/shinobu", "GET", null, "Error while querying Shinobu status:", (data) => { if (data.is_alive) { $("#shinobu-ok").show(); diff --git a/public/js/edit.js b/public/js/edit.js index 773f3f681..6a4ef9682 100644 --- a/public/js/edit.js +++ b/public/js/edit.js @@ -22,11 +22,7 @@ Edit.initializeAll = function () { // Hide tag input while statistics load Edit.hideTags(); - Server.callAPI( - "/api/database/stats?minweight=2", - "GET", - null, - "Couldn't load tag statistics", + Server.callAPI("/api/database/stats?minweight=2", "GET", null, "Couldn't load tag statistics", (data) => { Edit.suggestions = data.reduce((res, tag) => { let label = tag.text; @@ -142,11 +138,7 @@ Edit.getTags = function () { const pluginID = $("select#plugin option:checked").val(); const archivID = $("#archiveID").val(); const pluginArg = $("#arg").val(); - Server.callAPI( - `../api/plugins/use?plugin=${pluginID}&id=${archivID}&arg=${pluginArg}`, - "POST", - null, - "Error while fetching tags :", + Server.callAPI(`../api/plugins/use?plugin=${pluginID}&id=${archivID}&arg=${pluginArg}`, "POST", null, "Error while fetching tags :", (result) => { if (result.data.title && result.data.title !== "") { $("#title").val(result.data.title); diff --git a/public/js/index.js b/public/js/index.js index e6af21e7a..365ae8e96 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -96,33 +96,34 @@ Index.initializeAll = function () { } // Get some info from the server: version, debug mode, local progress - Server.callAPI("/api/info", "GET", null, "Error getting basic server info!", (data) => { - Index.serverVersion = data.version; - Index.debugMode = data.debug_mode === "1"; - Index.isProgressLocal = data.server_tracks_progress !== "1"; - Index.pageSize = data.archives_per_page; - - // Check version if not in debug mode - if (!Index.debugMode) { - Index.checkVersion(); - Index.fetchChangelog(); - } else { - $.toast({ - heading: " You're running in Debug Mode!", - text: "Advanced server statistics can be viewed here.", - hideAfter: false, - position: "top-left", - icon: "warning", - }); - } + Server.callAPI("/api/info", "GET", null, "Error getting basic server info!", + (data) => { + Index.serverVersion = data.version; + Index.debugMode = data.debug_mode === "1"; + Index.isProgressLocal = data.server_tracks_progress !== "1"; + Index.pageSize = data.archives_per_page; + + // Check version if not in debug mode + if (!Index.debugMode) { + Index.checkVersion(); + Index.fetchChangelog(); + } else { + $.toast({ + heading: " You're running in Debug Mode!", + text: "Advanced server statistics can be viewed here.", + hideAfter: false, + position: "top-left", + icon: "warning", + }); + } - Index.migrateProgress(); - Index.loadTagSuggestions(); - Index.loadCategories(); + Index.migrateProgress(); + Index.loadTagSuggestions(); + Index.loadCategories(); - // Initialize DataTables - IndexTable.initializeAll(); - }); + // Initialize DataTables + IndexTable.initializeAll(); + }); Index.updateTableHeaders(); }; @@ -323,11 +324,7 @@ Index.updateCarousel = function (e) { } if (Index.carouselInitialized) { - Server.callAPI( - endpoint, - "GET", - null, - "Error getting carousel data!", + Server.callAPI(endpoint, "GET", null, "Error getting carousel data!", (results) => { Index.swiper.virtual.removeAllSlides(); const slides = results.data @@ -438,11 +435,7 @@ Index.fetchChangelog = function () { * @returns Categories */ Index.loadContextMenuCategories = function (id) { - return Server.callAPI( - `/api/archives/${id}/categories`, - "GET", - null, - `Error finding categories for ${id}!`, + return Server.callAPI(`/api/archives/${id}/categories`, "GET", null, `Error finding categories for ${id}!`, (data) => { const items = {}; @@ -504,11 +497,7 @@ Index.handleContextMenu = function (option, id) { */ Index.loadTagSuggestions = function () { // Query the tag cloud API to get the most used tags. - Server.callAPI( - "/api/database/stats?minweight=2", - "GET", - null, - "Couldn't load tag suggestions", + Server.callAPI("/api/database/stats?minweight=2", "GET", null, "Couldn't load tag suggestions", (data) => { // Get namespaces objects in the data array to fill the namespace-sortby combobox const namespacesSet = new Set(data.map((element) => (element.namespace === "parody" ? "series" : element.namespace))); @@ -551,11 +540,7 @@ Index.loadTagSuggestions = function () { * Query the category API to build the filter buttons. */ Index.loadCategories = function () { - Server.callAPI( - "/api/categories", - "GET", - null, - "Couldn't load categories", + Server.callAPI("/api/categories", "GET", null, "Couldn't load categories", (data) => { // Sort by LastUsed + pinned // Pinned categories are shown at the beginning diff --git a/public/js/reader.js b/public/js/reader.js index e6f2e333e..3368d35f3 100644 --- a/public/js/reader.js +++ b/public/js/reader.js @@ -45,13 +45,8 @@ Reader.initializeAll = function () { }); $(document).on("click.edit_metadata", "#edit-archive", () => LRR.openInNewTab(`./edit?id=${Reader.id}`)); $(document).on("click.add_category", "#add-category", () => Server.addArchiveToCategory(Reader.id, $("#category").val())); - $(document).on("click.set_thumbnail", "#set-thumbnail", () => Server.callAPI( - `/api/archives/${Reader.id}/thumbnail?page=${Reader.currentPage + 1}`, - "PUT", - `Successfully set page ${Reader.currentPage + 1} as the thumbnail!`, - "Error updating thumbnail!", - null, - )); + $(document).on("click.set_thumbnail", "#set-thumbnail", () => Server.callAPI(`/api/archives/${Reader.id}/thumbnail?page=${Reader.currentPage + 1}`, + "PUT", `Successfully set page ${Reader.currentPage + 1} as the thumbnail!`, "Error updating thumbnail!", null)); $(document).on("click.thumbnail", ".quick-thumbnail", (e) => { LRR.closeOverlay(); @@ -73,11 +68,7 @@ Reader.initializeAll = function () { Server.callAPI(`/api/archives/${Reader.id}/isnew`, "DELETE", null, "Error clearing new flag! Check Logs.", null); // Get basic metadata - Server.callAPI( - `/api/archives/${Reader.id}/metadata`, - "GET", - null, - "Error getting basic archive info!", + Server.callAPI(`/api/archives/${Reader.id}/metadata`, "GET", null, "Error getting basic archive info!", (data) => { let { title } = data; @@ -111,11 +102,7 @@ Reader.initializeAll = function () { }; Reader.loadImages = function () { - Server.callAPI( - `/api/archives/${Reader.id}/files?force=${Reader.force}`, - "GET", - null, - "Error getting the archive's imagelist!", + Server.callAPI(`/api/archives/${Reader.id}/files?force=${Reader.force}`, "GET", null, "Error getting the archive's imagelist!", (data) => { Reader.pages = data.pages; Reader.maxPage = Reader.pages.length - 1; diff --git a/public/js/server.js b/public/js/server.js index eed5af6b0..b4aaf8a85 100644 --- a/public/js/server.js +++ b/public/js/server.js @@ -112,11 +112,7 @@ Server.triggerScript = function (namespace) { // Save data before triggering script Server.saveFormData("#editPluginForm") - .then(Server.callAPI( - `/api/plugins/queue?plugin=${namespace}&arg=${scriptArg}`, - "POST", - null, - "Error while executing Script :", + .then(Server.callAPI(`/api/plugins/queue?plugin=${namespace}&arg=${scriptArg}`, "POST", null, "Error while executing Script :", (data) => { // Check minion job state periodically while we're on this page Server.checkJobStatus( @@ -150,11 +146,7 @@ Server.triggerScript = function (namespace) { }; Server.cleanTemporaryFolder = function () { - Server.callAPI( - "/api/tempfolder", - "DELETE", - "Temporary Folder Cleaned!", - "Error while cleaning Temporary Folder :", + Server.callAPI("/api/tempfolder", "DELETE", "Temporary Folder Cleaned!", "Error while cleaning Temporary Folder :", (data) => { $("#tempsize").html(data.newsize); }, @@ -171,11 +163,7 @@ Server.clearAllNewFlags = function () { Server.dropDatabase = function () { if (window.confirm("Danger! Are you *sure* you want to do this?")) { - Server.callAPI( - "/api/database/drop", - "POST", - "Sayonara! Redirecting you...", - "Error while resetting the database? Check Logs.", + Server.callAPI("/api/database/drop", "POST", "Sayonara! Redirecting you...", "Error while resetting the database? Check Logs.", () => { setTimeout(() => { document.location.href = "./"; }, 1500); }, @@ -184,11 +172,7 @@ Server.dropDatabase = function () { }; Server.cleanDatabase = function () { - Server.callAPI( - "/api/database/clean", - "POST", - null, - "Error while cleaning the database! Check Logs.", + Server.callAPI("/api/database/clean", "POST", null, "Error while cleaning the database! Check Logs.", (data) => { $.toast({ showHideTransition: "slide", @@ -214,9 +198,7 @@ Server.cleanDatabase = function () { Server.regenerateThumbnails = function (force) { const forceparam = force ? 1 : 0; - Server.callAPI( - `/api/regen_thumbs?force=${forceparam}`, - "POST", + Server.callAPI(`/api/regen_thumbs?force=${forceparam}`, "POST", "Queued up a job to regenerate thumbnails! Stay tuned for updates or check the Minion console.", "Error while sending job to Minion:", (data) => { diff --git a/public/js/stats.js b/public/js/stats.js index 55ea829d0..4f1c16af7 100644 --- a/public/js/stats.js +++ b/public/js/stats.js @@ -7,11 +7,7 @@ Stats.initializeAll = function () { // bind events to DOM $(document).on("click.goback", "#goback", () => { window.location.replace("./"); }); - Server.callAPI( - "/api/database/stats?minweight=2", - "GET", - null, - "Couldn't load tag statistics", + Server.callAPI("/api/database/stats?minweight=2", "GET", null, "Couldn't load tag statistics", (data) => { $("#statsLoading").hide(); $("#tagcount").html(data.length); From 4b293539478db0c1fc7d40c64af935a8673cb2b2 Mon Sep 17 00:00:00 2001 From: difegue Date: Fri, 29 Apr 2022 11:43:09 +0200 Subject: [PATCH 27/88] Add wsl1 info to docs --- tools/Documentation/installing-lanraragi/windows.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Documentation/installing-lanraragi/windows.md b/tools/Documentation/installing-lanraragi/windows.md index 6c715fe1d..b53c529ba 100644 --- a/tools/Documentation/installing-lanraragi/windows.md +++ b/tools/Documentation/installing-lanraragi/windows.md @@ -13,7 +13,8 @@ winget install lanraragi {% hint style="warning" %} The installer will tell you about this anyways, but LRR for Windows **requires** the Windows Subsystem for Linux to function properly. -Read the tutorial [here](https://docs.microsoft.com/en-us/windows/wsl/install) to see how to enable WSL on your Windows 10 machine. +Read the tutorial [here](https://docs.microsoft.com/en-us/windows/wsl/install) to see how to enable WSL on your Windows 10 machine. +WSL defaults to WSL2, so if the installer doesn't work properly make sure you have virtualization enabled as well, or switch to WSL1. (`wsl --set-default-version 1`) You don't need to install a distribution through the Windows Store, as that is handled by the LRR installer package. {% endhint %} From 031f96240c058cd7312cf3804478d530aaa6d76b Mon Sep 17 00:00:00 2001 From: xiazeyu Date: Sat, 30 Apr 2022 01:53:35 +0800 Subject: [PATCH 28/88] PR request changes. --- public/js/backup.js | 4 +- public/js/batch.js | 4 +- public/js/category.js | 2 - public/js/common.js | 7 ++- public/js/config.js | 24 +++++----- public/js/edit.js | 4 +- public/js/index.js | 31 +++++++------ public/js/index_datatables.js | 2 - public/js/logs.js | 14 +++--- public/js/plugins.js | 4 +- public/js/reader.js | 44 +++++++++---------- public/js/server.js | 2 - public/js/stats.js | 2 - public/js/upload.js | 4 +- templates/index.html.tt2 | 2 +- templates/logs.html.tt2 | 10 ++--- .../templates_config/config_files.html.tt2 | 6 +-- .../templates_config/config_global.html.tt2 | 4 +- .../templates_config/config_shinobu.html.tt2 | 2 +- .../templates_config/config_theme.html.tt2 | 10 ++--- 20 files changed, 81 insertions(+), 101 deletions(-) diff --git a/public/js/backup.js b/public/js/backup.js index 0bf82c4d1..c38c6bf9b 100644 --- a/public/js/backup.js +++ b/public/js/backup.js @@ -5,7 +5,7 @@ const Backup = {}; Backup.initializeAll = function () { // bind events to DOM - $(document).on("click.return", "#return", () => { window.location.replace("./"); }); + $(document).on("click.return", "#return", () => { window.location.href = "/"; }); $(document).on("click.do-backup", "#do-backup", () => { window.open("./backup?dobackup=1", "_blank"); }); // Handler for file uploading. @@ -34,5 +34,3 @@ Backup.initializeAll = function () { jQuery(() => { Backup.initializeAll(); }); - -window.Backup = Backup; diff --git a/public/js/batch.js b/public/js/batch.js index a5c705560..01fc467ea 100644 --- a/public/js/batch.js +++ b/public/js/batch.js @@ -20,7 +20,7 @@ Batch.initializeAll = function () { $(document).on("click.cancel-job", "#cancel-job", Batch.cancelBatch); $(document).on("click.server-config", "#server-config", () => LRR.openInNewTab("./config")); $(document).on("click.plugin-config", "#plugin-config", () => LRR.openInNewTab("./config/plugins")); - $(document).on("click.return", "#return", () => { window.location.href = "./"; }); + $(document).on("click.return", "#return", () => { window.location.href = "/"; }); Batch.selectOperation(); Batch.showOverride(); @@ -310,5 +310,3 @@ Batch.restartBatchUI = function () { jQuery(() => { Batch.initializeAll(); }); - -window.Batch = Batch; diff --git a/public/js/category.js b/public/js/category.js index f4cdb64a1..00082573b 100644 --- a/public/js/category.js +++ b/public/js/category.js @@ -180,5 +180,3 @@ Category.predicateHelp = function () { jQuery(() => { Category.initializeAll(); }); - -window.Category = Category; diff --git a/public/js/common.js b/public/js/common.js index b0e7c8c6a..1dae0047d 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -4,7 +4,7 @@ const LRR = {}; /** - * Quickly HTML encoding function. + * Quick HTML encoding function. * @param {*} r The HTML to encode * @returns Encoded string */ @@ -123,7 +123,8 @@ LRR.colorCodeTags = function (tags) { tagsToEncode.sort().forEach((key) => { tagsByNamespace[key].forEach((tag) => { const encodedK = LRR.encodeHTML(key.toLowerCase()); - line += `${LRR.encodeHTML(key === "date_added" || key === "timestamp" ? LRR.convertTimestamp(tag) : tag)}, `; + const encodedVal = LRR.encodeHTML(key === "date_added" || key === "timestamp" ? LRR.convertTimestamp(tag) : tag); + line += `${encodedVal}, `; }); }); // Remove last comma @@ -299,5 +300,3 @@ LRR.getImgSize = function (target) { }); return imgSize; }; - -window.LRR = LRR; diff --git a/public/js/config.js b/public/js/config.js index 1bab649fd..d4441bf5a 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -14,24 +14,24 @@ Config.initializeAll = function () { $(document).on("click.usedateadded", "#usedateadded", () => Config.enable_timemodified); $(document).on("click.rescan-button", "#rescan-button", Config.rescanContentFolder); - $(document).on("click.clean_temp", "#clean_temp", Server.cleanTemporaryFolder); - $(document).on("click.reset_search_cache", "#reset_search_cache", Server.invalidateCache); - $(document).on("click.clear_new_tags", "#clear_new_tags", Server.clearAllNewFlags); + $(document).on("click.clean-temp", "#clean-temp", Server.cleanTemporaryFolder); + $(document).on("click.reset-search-cache", "#reset-search-cache", Server.invalidateCache); + $(document).on("click.clear-new-tags", "#clear-new-tags", Server.clearAllNewFlags); - $(document).on("click.clean_db", "#clean_db", Server.cleanDatabase); - $(document).on("click.drop_db", "#drop_db", Server.dropDatabase); + $(document).on("click.clean-db", "#clean-db", Server.cleanDatabase); + $(document).on("click.drop-db", "#drop-db", Server.dropDatabase); $(document).on("click.restart-button", "#restart-button", Config.rebootShinobu); - $(document).on("click.open_minion", "#open_minion", () => LRR.openInNewTab("/minion")); + $(document).on("click.open-minion", "#open-minion", () => LRR.openInNewTab("/minion")); $(document).on("click.genthumb-button", "#genthumb-button", () => Server.regenerateThumbnails(false)); $(document).on("click.forcethumb-button", "#forcethumb-button", () => Server.regenerateThumbnails(true)); - $(document).on("click.modern_div", "#modern_div", () => Config.switch_style("Hachikuji")); - $(document).on("click.modern_clear_div", "#modern_clear_div", () => Config.switch_style("Yotsugi")); - $(document).on("click.modern_red_div", "#modern_red_div", () => Config.switch_style("Nadeko")); - $(document).on("click.ex_div", "#ex_div", () => Config.switch_style("Sad Panda")); - $(document).on("click.g_div", "#g_div", () => Config.switch_style("H-Verse")); + $(document).on("click.modern-div", "#modern-div", () => Config.switch_style("Hachikuji")); + $(document).on("click.modern-clear-div", "#modern-clear-div", () => Config.switch_style("Yotsugi")); + $(document).on("click.modern-red-div", "#modern-red-div", () => Config.switch_style("Nadeko")); + $(document).on("click.ex-div", "#ex-div", () => Config.switch_style("Sad Panda")); + $(document).on("click.g-div", "#g-div", () => Config.switch_style("H-Verse")); Config.enable_pass(); Config.enable_resize(); @@ -116,5 +116,3 @@ Config.enable_timemodified = function () { jQuery(() => { Config.initializeAll(); }); - -window.Config = Config; diff --git a/public/js/edit.js b/public/js/edit.js index 6a4ef9682..642fcf041 100644 --- a/public/js/edit.js +++ b/public/js/edit.js @@ -15,7 +15,7 @@ Edit.initializeAll = function () { $(document).on("click.save-metadata", "#save-metadata", Edit.saveMetadata); $(document).on("click.delete-archive", "#delete-archive", Edit.deleteArchive); $(document).on("click.tagger", ".tagger", Edit.focusTagInput); - $(document).on("click.goback", "#goback", () => { window.location.replace("./"); }); + $(document).on("click.goback", "#goback", () => { window.location.href = "/"; }); Edit.updateOneShotArg(); @@ -188,5 +188,3 @@ Edit.runPlugin = function () { jQuery(() => { Edit.initializeAll(); }); - -window.Edit = Edit; diff --git a/public/js/index.js b/public/js/index.js index 365ae8e96..999bc8f1f 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -24,9 +24,9 @@ Index.initializeAll = function () { $(document).on("change.thumbnail-crop", "#thumbnail-crop", Index.toggleCrop); $(document).on("change.namespace-sortby", "#namespace-sortby", Index.handleCustomSort); $(document).on("click.order-sortby", "#order-sortby", Index.toggleOrder); - $(document).on("click.open_carousel", ".collapsible-title", Index.toggleCarousel); + $(document).on("click.open-carousel", ".collapsible-title", Index.toggleCarousel); $(document).on("click.reload-carousel", "#reload-carousel", Index.updateCarousel); - $(document).on("click.close_overlay", "#overlay-shade", LRR.closeOverlay); + $(document).on("click.close-overlay", "#overlay-shade", LRR.closeOverlay); // 0 = List view // 1 = Thumbnail view @@ -141,23 +141,30 @@ Index.toggleCarousel = function (e, updateLocalStorage = true) { $("#reload-carousel").show(); Index.swiper = new Swiper(".index-carousel-container", { - breakpoints: (() => { // Virtual Slides doesn't work with slidesPerView: 'auto' + breakpoints: (() => { const breakpoints = { - 0: { + 0: { // ensure every device have at least 1 slide slidesPerView: 1, }, - 210: { - slidesPerView: 2, - }, - 360: { - slidesPerView: 2.5, - }, }; - for (let width = 690, sides = 3; width <= 2760; width += 115, sides += 0.5) { + // virtual Slides doesn't work with slidesPerView: 'auto' + // the following loops are meant to implement same functionality by doing mathworks + // it also helps avoid writing a billion slidesPerView combos for window widths + // when the screen width <= 560px, every thumbnails have a different width + // from 169px, when the width is 17px bigger, we display 0.1 more slide + for (let width = 169, sides = 1; width <= 424; width += 17, sides += 0.1) { breakpoints[width] = { slidesPerView: sides, }; } + // from 427px, when the width is 46px bigger, we display 0.2 more slide + // the width support up to 4K resolution + for (let width = 427, sides = 1.8; width <= 3840; width += 46, sides += 0.2) { + breakpoints[width] = { + slidesPerView: sides, + }; + } + console.log(breakpoints); return breakpoints; })(), breakpointsBase: "container", @@ -645,5 +652,3 @@ Index.migrateProgress = function () { jQuery(() => { Index.initializeAll(); }); - -window.Index = Index; diff --git a/public/js/index_datatables.js b/public/js/index_datatables.js index 6191ca333..39672ff21 100644 --- a/public/js/index_datatables.js +++ b/public/js/index_datatables.js @@ -348,5 +348,3 @@ IndexTable.buildTagTooltip = function (target) { $(target).attr("onmouseover", ""); }; - -window.IndexTable = IndexTable; diff --git a/public/js/logs.js b/public/js/logs.js index f6b8cfa0f..ed15c073f 100644 --- a/public/js/logs.js +++ b/public/js/logs.js @@ -9,12 +9,12 @@ Logs.initializeAll = function () { // bind events to DOM $(document).on("click.refresh", "#refresh", Logs.refreshLog); $(document).on("click.loglines", "#loglines", Logs.refreshLog); - $(document).on("click.show_general", "#show_general", () => Logs.showLog("general")); - $(document).on("click.show_shinobu", "#show_shinobu", () => Logs.showLog("shinobu")); - $(document).on("click.show_plugins", "#show_plugins", () => Logs.showLog("plugins")); - $(document).on("click.show_mojo", "#show_mojo", () => Logs.showLog("mojo")); - $(document).on("click.show_redis", "#show_redis", () => Logs.showLog("redis")); - $(document).on("click.return", "#return", () => { window.location.replace("/"); }); + $(document).on("click.show-general", "#show-general", () => Logs.showLog("general")); + $(document).on("click.show-shinobu", "#show-shinobu", () => Logs.showLog("shinobu")); + $(document).on("click.show-plugins", "#show-plugins", () => Logs.showLog("plugins")); + $(document).on("click.show-mojo", "#show-mojo", () => Logs.showLog("mojo")); + $(document).on("click.show-redis", "#show-redis", () => Logs.showLog("redis")); + $(document).on("click.return", "#return", () => { window.location.href = "/"; }); Logs.showLog("general"); }; @@ -36,5 +36,3 @@ Logs.refreshLog = function () { jQuery(() => { Logs.initializeAll(); }); - -window.Logs = Logs; diff --git a/public/js/plugins.js b/public/js/plugins.js index 9dd4bc890..13055c2c4 100644 --- a/public/js/plugins.js +++ b/public/js/plugins.js @@ -6,7 +6,7 @@ const Plugins = {}; Plugins.initializeAll = function () { // bind events to DOM $(document).on("click.save", "#save", () => Server.saveFormData("#editPluginForm")); - $(document).on("click.return", "#return", () => { window.location.replace("/"); }); + $(document).on("click.return", "#return", () => { window.location.href = "/"; }); // Handler for file uploading. $("#fileupload").fileupload({ @@ -38,5 +38,3 @@ Plugins.initializeAll = function () { jQuery(() => { Plugins.initializeAll(); }); - -window.Plugins = Plugins; diff --git a/public/js/reader.js b/public/js/reader.js index 3368d35f3..305e11219 100644 --- a/public/js/reader.js +++ b/public/js/reader.js @@ -22,30 +22,30 @@ Reader.initializeAll = function () { $(document).on("keyup", Reader.handleShortcuts); $(document).on("wheel", Reader.handleWheel); - $(document).on("click.toggle_fit_mode", "#fit-mode input", Reader.toggleFitMode); - $(document).on("click.toggle_double_mode", "#toggle-double-mode input", Reader.toggleDoublePageMode); - $(document).on("click.toggle_manga_mode", "#toggle-manga-mode input, .reading-direction", Reader.toggleMangaMode); - $(document).on("click.toggle_header", "#toggle-header input", Reader.toggleHeader); - $(document).on("click.toggle_progress", "#toggle-progress input", Reader.toggleProgressTracking); - $(document).on("click.toggle_infinite_scroll", "#toggle-infinite-scroll input", Reader.toggleInfiniteScroll); - $(document).on("click.toggle_overlay", "#toggle-overlay input", Reader.toggleOverlayByDefault); - $(document).on("submit.container_width", "#container-width-input", Reader.registerContainerWidth); - $(document).on("click.container_width", "#container-width-apply", Reader.registerContainerWidth); + $(document).on("click.toggle-fit-mode", "#fit-mode input", Reader.toggleFitMode); + $(document).on("click.toggle-double-mode", "#toggle-double-mode input", Reader.toggleDoublePageMode); + $(document).on("click.toggle-manga-mode", "#toggle-manga-mode input, .reading-direction", Reader.toggleMangaMode); + $(document).on("click.toggle-header", "#toggle-header input", Reader.toggleHeader); + $(document).on("click.toggle-progress", "#toggle-progress input", Reader.toggleProgressTracking); + $(document).on("click.toggle-infinite-scroll", "#toggle-infinite-scroll input", Reader.toggleInfiniteScroll); + $(document).on("click.toggle-overlay", "#toggle-overlay input", Reader.toggleOverlayByDefault); + $(document).on("submit.container-width", "#container-width-input", Reader.registerContainerWidth); + $(document).on("click.container-width", "#container-width-apply", Reader.registerContainerWidth); $(document).on("submit.preload", "#preload-input", Reader.registerPreload); $(document).on("click.preload", "#preload-apply", Reader.registerPreload); - $(document).on("click.pagination_change_pages", ".page-link", Reader.handlePaginator); - - $(document).on("click.close_overlay", "#overlay-shade", LRR.closeOverlay); - $(document).on("click.toggle_full_screen", "#toggle-full-screen", Reader.toggleFullScreen); - $(document).on("click.toggle_archive_overlay", "#toggle-archive-overlay", Reader.toggleArchiveOverlay); - $(document).on("click.toggle_settings_overlay", "#toggle-settings-overlay", Reader.toggleSettingsOverlay); - $(document).on("click.toggle_help", "#toggle-help", Reader.toggleHelp); - $(document).on("click.regenerate_archive_cache", "#regenerate-cache", () => { + $(document).on("click.pagination-change-pages", ".page-link", Reader.handlePaginator); + + $(document).on("click.close-overlay", "#overlay-shade", LRR.closeOverlay); + $(document).on("click.toggl-_full-screen", "#toggle-full-screen", Reader.toggleFullScreen); + $(document).on("click.toggle-archive-overlay", "#toggle-archive-overlay", Reader.toggleArchiveOverlay); + $(document).on("click.toggle-settings-overlay", "#toggle-settings-overlay", Reader.toggleSettingsOverlay); + $(document).on("click.toggle-help", "#toggle-help", Reader.toggleHelp); + $(document).on("click.regenerate-archive-cache", "#regenerate-cache", () => { window.location.href = `./reader?id=${Reader.id}&force_reload`; }); - $(document).on("click.edit_metadata", "#edit-archive", () => LRR.openInNewTab(`./edit?id=${Reader.id}`)); - $(document).on("click.add_category", "#add-category", () => Server.addArchiveToCategory(Reader.id, $("#category").val())); - $(document).on("click.set_thumbnail", "#set-thumbnail", () => Server.callAPI(`/api/archives/${Reader.id}/thumbnail?page=${Reader.currentPage + 1}`, + $(document).on("click.edit-metadata", "#edit-archive", () => LRR.openInNewTab(`./edit?id=${Reader.id}`)); + $(document).on("click.add-category", "#add-category", () => Server.addArchiveToCategory(Reader.id, $("#category").val())); + $(document).on("click.set-thumbnail", "#set-thumbnail", () => Server.callAPI(`/api/archives/${Reader.id}/thumbnail?page=${Reader.currentPage + 1}`, "PUT", `Successfully set page ${Reader.currentPage + 1} as the thumbnail!`, "Error updating thumbnail!", null)); $(document).on("click.thumbnail", ".quick-thumbnail", (e) => { @@ -219,7 +219,7 @@ Reader.initInfiniteScrollView = function () { }); $("#i3").removeClass("loading"); - $(document).on("click.infinite_scroll_map", "#display .reader-image", () => Reader.changePage(1)); + $(document).on("click.infinite-scroll-map", "#display .reader-image", () => Reader.changePage(1)); Reader.applyContainerWidth(); }; @@ -743,5 +743,3 @@ Reader.handlePaginator = function () { jQuery(() => { Reader.initializeAll(); }); - -window.Reader = Reader; diff --git a/public/js/server.js b/public/js/server.js index b4aaf8a85..38bc2e7fc 100644 --- a/public/js/server.js +++ b/public/js/server.js @@ -279,5 +279,3 @@ Server.deleteArchive = function (arcId, callback) { }) .catch((error) => LRR.showErrorToast("Error while deleting archive", error)); }; - -window.Server = Server; diff --git a/public/js/stats.js b/public/js/stats.js index 4f1c16af7..098e6baf0 100644 --- a/public/js/stats.js +++ b/public/js/stats.js @@ -39,5 +39,3 @@ Stats.initializeAll = function () { jQuery(() => { Stats.initializeAll(); }); - -window.Stats = Stats; diff --git a/public/js/upload.js b/public/js/upload.js index 78faf826e..a1f35e38a 100644 --- a/public/js/upload.js +++ b/public/js/upload.js @@ -10,7 +10,7 @@ let totalUploads = 0; Upload.initializeAll = function () { // bind events to DOM $(document).on("click.download-url", "#download-url", Upload.downloadUrl); - $(document).on("click.return", "#return", () => { window.location.replace("./"); }); + $(document).on("click.return", "#return", () => { window.location.href = "/"; }); $("#fileupload").fileupload({ dataType: "json", @@ -175,5 +175,3 @@ Upload.downloadUrl = function () { jQuery(() => { Upload.initializeAll(); }); - -window.Upload = Upload; diff --git a/templates/index.html.tt2 b/templates/index.html.tt2 index fdb343411..bbb98f3eb 100644 --- a/templates/index.html.tt2 +++ b/templates/index.html.tt2 @@ -87,7 +87,7 @@
      diff --git a/templates/logs.html.tt2 b/templates/logs.html.tt2 index 0430b3805..67d5f3cf8 100644 --- a/templates/logs.html.tt2 +++ b/templates/logs.html.tt2 @@ -61,15 +61,15 @@

      - + - + - + - + - +

      diff --git a/templates/templates_config/config_files.html.tt2 b/templates/templates_config/config_files.html.tt2 index d36a22647..da3423b74 100644 --- a/templates/templates_config/config_files.html.tt2 +++ b/templates/templates_config/config_files.html.tt2 @@ -38,7 +38,7 @@ - + Current Size: @@ -51,7 +51,7 @@ - + The last searches done in the archive index are cached for faster loads.
      @@ -64,7 +64,7 @@ - + Newly uploaded archives are marked as "new" in the index until you've opened them.
      diff --git a/templates/templates_config/config_global.html.tt2 b/templates/templates_config/config_global.html.tt2 index 90fb70bfa..ada385e41 100644 --- a/templates/templates_config/config_global.html.tt2 +++ b/templates/templates_config/config_global.html.tt2 @@ -103,7 +103,7 @@ - + Cleaning the database will remove entries that aren't on your filesystem. @@ -112,7 +112,7 @@ - + Danger zone!
      diff --git a/templates/templates_config/config_shinobu.html.tt2 b/templates/templates_config/config_shinobu.html.tt2 index c64f90b22..c38c3eacd 100644 --- a/templates/templates_config/config_shinobu.html.tt2 +++ b/templates/templates_config/config_shinobu.html.tt2 @@ -27,7 +27,7 @@ - + The Minion Worker handles spare tasks that are too long to execute within the request/response lifecycle of web diff --git a/templates/templates_config/config_theme.html.tt2 b/templates/templates_config/config_theme.html.tt2 index 6137af046..fddddad46 100644 --- a/templates/templates_config/config_theme.html.tt2 +++ b/templates/templates_config/config_theme.html.tt2 @@ -17,7 +17,7 @@