Organize autofill entry points

sections/ajax/anidb.php → sections/ajax/autofill/anime.php

@@ -6,8 +6,8 @@ if (empty($_GET['aid'])) {
 
 $aid = $_GET['aid'];
 
-if ($Cache->get_value('anidb_json_'.$aid)) {
-  json_die("success", $Cache->get_value('anidb_json_'.$aid));
+if ($Cache->get_value('anime_fill_json_'.$aid)) {
+  json_die("success", $Cache->get_value('anime_fill_json_'.$aid));
 } else {
 
   $anidb_url = 'http://api.anidb.net:9001/httpapi?request=anime&client='.API_KEYS['ANIDB'].'&clientver=1&protover=1&aid='.$aid;
@@ -51,7 +51,7 @@ if ($Cache->get_value('anidb_json_'.$aid)) {
     'description' => $desc
   );
 
-  $Cache->cache_value('anidb_json_'.$aid, $json_str, 86400);
+  $Cache->cache_value('anime_fill_json_'.$aid, $json_str, 86400);
 
   json_die("success", $json_str);
 }

sections/ajax/javfill.php → sections/ajax/autofill/jav.php

@@ -12,8 +12,8 @@ if (!strpos($cn, '-')) {
   if ($m) { $cn = substr_replace($cn, '-', $m[0][1], 0); }
 }
 
-if (!$debug && $Cache->get_value('jav_json_'.$cn)) {
-  json_die('success', $Cache->get_value('jav_json_'.$cn));
+if (!$debug && $Cache->get_value('jav_fill_json_'.$cn)) {
+  json_die('success', $Cache->get_value('jav_fill_json_'.$cn));
 } else {
 
   $jlib_jp_url = ('http://www.javlibrary.com/ja/vl_searchbyid.php?keyword='.$cn);
@@ -163,7 +163,7 @@ if (!$debug && $Cache->get_value('jav_json_'.$cn)) {
     'degraded'    => $degraded
   );
 
-  $Cache->cache_value('jav_json_'.$cn, $json, 86400);
+  $Cache->cache_value('jav_fill_json_'.$cn, $json, 86400);
 
   json_die('success', $json);
 

sections/ajax/doujin.php → sections/ajax/autofill/manga.php

@@ -16,8 +16,8 @@ if (empty($gid) || empty($token)) {
   json_die("failure", "Invalid URL");
 }
 
-if ($Cache->get_value('doujin_json_'.$gid)) {
-  json_die("success", $Cache->get_value('doujin_json_'.$gid));
+if ($Cache->get_value('manga_fill_json_'.$gid)) {
+  json_die("success", $Cache->get_value('manga_fill_json_'.$gid));
 } else {
 
   $data = json_encode(["method" => "gdata", "gidlist" => [[$gid, $token]], "namespace" => 1]);
@@ -91,7 +91,7 @@ if ($Cache->get_value('doujin_json_'.$gid)) {
     'cover'       => $cover
   ];
 
-  $Cache->cache_value('doujin_json_'.$gid, $json_str, 86400);
+  $Cache->cache_value('manga_fill_json_'.$gid, $json_str, 86400);
 
   json_die("success", $json_str);
 }

sections/ajax/index.php

@@ -153,14 +153,10 @@ switch ($_GET['action']) {
   case 'clear_user_notification':
     require(SERVER_ROOT . '/sections/ajax/clear_user_notification.php');
     break;
-  case 'anidb':
-    require(SERVER_ROOT . '/sections/ajax/anidb.php');
-    break;
-  case 'javfill':
-    require(SERVER_ROOT . '/sections/ajax/javfill.php');
-    break;
-  case 'doujin':
-    require(SERVER_ROOT . '/sections/ajax/doujin.php');
+  case 'autofill':
+    if ($_GET['cat'] == 'anime') require(SERVER_ROOT . '/sections/ajax/autofill/anime.php');
+    if ($_GET['cat'] == 'jav')   require(SERVER_ROOT . '/sections/ajax/autofill/jav.php');
+    if ($_GET['cat'] == 'manga') require(SERVER_ROOT . '/sections/ajax/autofill/manga.php');
     break;
   default:
     // If they're screwing around with the query string

static/functions/upload.js

@@ -402,7 +402,7 @@ function ToggleUnknown() {
   }
 }
 
-function AnidbAutofill() {
+function AnimeAutofill() {
   var map = { artist: 'idols_0',
               title: 'title',
               title_rj: 'title_rj',
@@ -410,7 +410,7 @@ function AnidbAutofill() {
               year: 'year',
               description: 'album_desc' }
   var aid = $('#anidb').raw().value
-  $.getJSON('/ajax.php?action=anidb&aid='+aid, function(data) {
+  $.getJSON('/ajax.php?action=autofill&cat=anime&aid='+aid, function(data) {
     if (data.status != "success") return
     for (i in data.response) {
       if (map[i] && !($('#'+map[i]).raw().value)) {
@@ -431,7 +431,7 @@ function JavAutofill() {
               tags: 'tags',
               description: 'album_desc' }
   var cn = $('#javdb_tr #catalogue').raw().value.toUpperCase()
-  $.getJSON('/ajax.php?action=javfill&cn='+cn, function(data) {
+  $.getJSON('/ajax.php?action=autofill&cat=jav&cn='+cn, function(data) {
     if (data.status != "success") {
       $('#catalogue').raw().value = 'Failed'
       return
@@ -462,7 +462,7 @@ function JavAutofill() {
   })
 }
 
-function DoujAutofill() {
+function MangaAutofill() {
   var map = {  artists: 'idols',
               title: 'title',
               title_jp: 'title_jp',
@@ -474,7 +474,7 @@ function DoujAutofill() {
               pages: 'pages',
               description: 'release_desc' }
   var nh = $('#ehentai_tr #catalogue').raw().value
-  $.getJSON('/ajax.php?action=doujin&url='+nh, function(data) {
+  $.getJSON('/ajax.php?action=autofill&cat=manga&url='+nh, function(data) {
     if (data.status != "success") {
       $('#catalogue').raw().value = 'Failed'
       return
@@ -566,7 +566,7 @@ function MediaInfoExtract() {
 function initAutofill() {
   $('[autofill]').each(function(i, el) {
     el.addEventListener('click', function(event) {
-      ({'douj':DoujAutofill, 'anime':AnidbAutofill, 'jav':JavAutofill})[el.attributes['autofill'].value]()
+      ({'douj':MangaAutofill, 'anime':AnimeAutofill, 'jav':JavAutofill})[el.attributes['autofill'].value]()
     })
   })
 }