.gitignore

@@ -29,5 +29,3 @@ images/
 
 ?.php
 sess.php
-
-vendor/

ajax/getimages.php

@@ -2,18 +2,10 @@
 
 require "../header.php";
 
-$filter = "";
-if ( isset($_REQUEST["filter"]) ) $filter = $_REQUEST["filter"];
-if ( $filter === "" ) {
-   $filter = null;
-} else {
-   $filter = "%" . str_replace("%", "", $filter) . "%";
-}
-
 $data = array();
 $data["error"] = false;
 $data["message"] = "";
-$data["images"] = MTGImage::getList($filter);
+$data["images"] = MTGImage::getList();
 $data["validated"] = $_SESSION["validated"];
 
 header('Content-Type: application/json');

ajax/savecard.php

@@ -43,8 +43,6 @@ if ( $filename != $image->getFileName() ) {
    }
 }
 
-$image->setOCR($_REQUEST["cardtext"]);
-
 $image->setEnabled(($_REQUEST["enabled"] == "1") ? true : false);
 $image->save();
 $data["image"] = $image;

ajax/uploadimages.php

@@ -40,7 +40,6 @@ foreach ( $_FILES['images']['name'] as $key => $name ) {
          $image->setFileName($filename);
          $image->setWidth($width);
          $image->setHeight($height);
-         $image->updateOCR();
          $image->save();
       }
    }

class_image.php

@@ -1,7 +1,5 @@
 <?php
 
-use thiagoalessio\TesseractOCR\TesseractOCR;
-
 class MTGImage implements JsonSerializable {
 
    const VALID_EXTENSIONS = array("gif", "jpg", "jpeg", "png", "webp");
@@ -14,7 +12,6 @@ class MTGImage implements JsonSerializable {
    private $filename = "";
    private $enabled = true;
    private $played = false;
-   private $ocr = "";
    private $width = 0;
    private $height = 0;
    private $created = "1972-08-16 00:00:00";
@@ -53,10 +50,6 @@ class MTGImage implements JsonSerializable {
       }
    }
 
-   public function getOCR() {
-      return $this->ocr;
-   }
-
    public function getWidth() {
       return $this->width;
    }
@@ -124,12 +117,6 @@ class MTGImage implements JsonSerializable {
       return true;
    }
 
-   public function setOCR($value = null) {
-      if ( is_null($value) || !is_string($value) ) return false;
-      $this->ocr = $value;
-      return true;
-   }
-
    public function setWidth($value = null) {
       if ( is_null($value) ) return false;
       if ( !is_int($value) || ($value < 0) ) return false;
@@ -144,18 +131,6 @@ class MTGImage implements JsonSerializable {
       return true;
    }
 
-   public function updateOCR() {
-      try {
-          $text = (new TesseractOCR(IMAGEPATH . $this->getFileName()))
-              ->lang('eng')
-              ->run();
-          $text = str_replace("\n", " ", $text);
-          return $this->setOCR($text);
-      } catch ( Exception $e ) {
-          return $e->getMessage();
-      }
-   }
-
    public function renameImage($value = "") {
       $oldname = $this->getFileName();
       $conflictImage = MTGImage::getImageByFileName($value);
@@ -227,18 +202,11 @@ class MTGImage implements JsonSerializable {
       }
    }
 
-   public static function getList($filter = null) {
+   public static function getList() {
       global $globaldbh;
 
-      $query = "SELECT id FROM images ";
+      $query = "SELECT id FROM images ORDER BY LOWER(filename)";
-      if ( !is_null($filter) ) {
-         $query .= "WHERE filename LIKE :filter OR ocr LIKE :filter ";
-      }
-      $query .= "ORDER BY LOWER(filename)";
       $sth = $globaldbh->prepare($query);
-      if ( !is_null($filter) ) {
-         $sth->bindValue(":filter", $filter, PDO::PARAM_STR);
-      }
       $sth->execute();
       $thelist = array();
       while ( $row = $sth->fetch(PDO::FETCH_ASSOC) ) {
@@ -261,7 +229,6 @@ class MTGImage implements JsonSerializable {
          'title' => pathinfo($this->getFileName(), PATHINFO_FILENAME),
          'enabled' => $this->getEnabled(),
          'played' => $this->getPlayed(),
-         'cardtext' => $this->getOCR(),
          'width' => $this->getWidth(),
          'height' => $this->getHeight(),
          'dimensions' => $this->getDimensions(),
@@ -289,13 +256,12 @@ class MTGImage implements JsonSerializable {
    public function save() {
       global $globaldbh;
 
-      $query = "INSERT INTO images (id, filename, ocr, width, height) VALUES(:id, :filename, :ocr, :width, :height) ON DUPLICATE KEY UPDATE filename=:filename, enabled=:enabled, played=:played, ocr=:ocr, width=:width, height=:height";
+      $query = "INSERT INTO images (id, filename, width, height) VALUES(:id, :filename, :width, :height) ON DUPLICATE KEY UPDATE filename=:filename, enabled=:enabled, played=:played, width=:width, height=:height";
       $sth = $globaldbh->prepare($query);
       $sth->bindValue(":id", (int) $this->getId(), PDO::PARAM_INT);
       $sth->bindValue(":filename", $this->getFileName(), PDO::PARAM_STR);
       $sth->bindValue(":enabled", (int) $this->getEnabled(MTGImage::MTGI_BOOLEANDB), PDO::PARAM_INT);
       $sth->bindValue(":played", (int) $this->getPlayed(MTGImage::MTGI_BOOLEANDB), PDO::PARAM_INT);
-      $sth->bindValue(":ocr", $this->getOCR(), PDO::PARAM_STR);
       $sth->bindValue(":width", (int) $this->getWidth(), PDO::PARAM_INT);
       $sth->bindValue(":height", (int) $this->getHeight(), PDO::PARAM_INT);
       $sth->execute();
@@ -307,7 +273,7 @@ class MTGImage implements JsonSerializable {
       global $globaldbh;
 
       if ( !is_int($imgid) || $imgid == 0 ) return;
-      $query = "SELECT id, filename, enabled, played, ocr, width, height, created FROM images where id=:id";
+      $query = "SELECT id, filename, enabled, played, width, height, created FROM images where id=:id";
       $sth = $globaldbh->prepare($query);
       $sth->bindValue(":id", (int) $imgid, PDO::PARAM_INT);
       $sth->execute();
@@ -316,7 +282,6 @@ class MTGImage implements JsonSerializable {
          $this->setFileName($row["filename"]);
          $this->setEnabled($row["enabled"]);
          $this->setPlayed($row["played"]);
-         $this->setOCR($row["ocr"]);
          $this->setWidth($row["width"]);
          $this->setHeight($row["height"]);
          $this->created = $row["created"];

composer.json

@@ -1,5 +0,0 @@
-{
-   "require": {
-      "thiagoalessio/tesseract_ocr": "2.*"
-   }
-}

composer.lock

@@ -1,68 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "2fcc4ad110dab2a1eb87ee31f83940b4",
-    "packages": [
-        {
-            "name": "thiagoalessio/tesseract_ocr",
-            "version": "2.13.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thiagoalessio/tesseract-ocr-for-php.git",
-                "reference": "232a8cb9d571992f9bd1e263f2f6909cf6c173a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thiagoalessio/tesseract-ocr-for-php/zipball/232a8cb9d571992f9bd1e263f2f6909cf6c173a1",
-                "reference": "232a8cb9d571992f9bd1e263f2f6909cf6c173a1",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/php-code-coverage": "^2.2.4 || ^9.0.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "thiagoalessio\\TesseractOCR\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "thiagoalessio",
-                    "email": "thiagoalessio@me.com"
-                }
-            ],
-            "description": "A wrapper to work with Tesseract OCR inside PHP.",
-            "keywords": [
-                "OCR",
-                "Tesseract",
-                "text recognition"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.net/tesseract-ocr-for-php",
-                "issues": "https://github.com/thiagoalessio/tesseract-ocr-for-php/issues",
-                "source": "https://github.com/thiagoalessio/tesseract-ocr-for-php"
-            },
-            "time": "2023-10-05T21:14:48+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
-    "plugin-api-version": "2.6.0"
-}

css/main.css

@@ -182,25 +182,5 @@ button {
    border-color: rgb(255,23,54);
    border-width: 3px;
 }
-.header {
-   width: 80%;
-   font-family: MatrixBold;
-   font-weight: bold;
-   font-size: 45pt;
-   color: limegreen;
-   margin-top: 0;
-   margin-bottom: 0;
-   text-align: center;
-   margin-left: auto;
-   margin-right: auto;
-}
-.searchfilter {
-   font-family: MatrixBold;
-   font-weight: bold;
-   font-size: 30pt;
-   color: limegreen;
-   border-radius: 10px;
-   background-color: #555555;
-}
 
 /* vim:ts=3 sw=3 et:

header.php

@@ -2,7 +2,6 @@
 
 require_once "config.php";
 require_once "functions.php";
-require_once 'vendor/autoload.php';
 
 require_once "class_image.php";
 

install/initial_db_mysql.sql

@@ -28,12 +28,10 @@ CREATE TABLE `images` (
   `filename` varchar(255) NOT NULL,
   `enabled` tinyint(1) DEFAULT 1,
   `played` tinyint(1) DEFAULT 0,
-  `ocr` text DEFAULT '',
   `width` mediumint(8) unsigned NOT NULL DEFAULT 0,
   `height` mediumint(8) unsigned NOT NULL DEFAULT 0,
   `created` datetime NOT NULL DEFAULT current_timestamp(),
-  PRIMARY KEY (`id`),
+  PRIMARY KEY (`id`)
-  FULLTEXT KEY `idx_ocr` (`ocr`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

install/refreshocr.php

@@ -1,19 +0,0 @@
-<?php
-
-require __DIR__ . "/../header.php";
-
-$images = MTGImage::getList();
-
-echo "\n";
-echo "Running OCR on all images...\n";
-foreach ( $images as $image ) {
-    $updated = $image->updateOCR();
-    if ( $updated === true ) {
-        $image->save();
-        echo "   Success on: {$image->getFileName()}\n";
-    } else {
-        echo "Error: " . $updated;
-    }
-}
-
-// vim: ts=4 sw=4:

install/testocr.php

@@ -1,32 +0,0 @@
-<?php
-
-if ( php_sapi_name() != "cli" ) exit();
-
-require_once 'vendor/autoload.php';
-
-use thiagoalessio\TesseractOCR\TesseractOCR;
-
-if ( $argc != 2 ) {
-    echo "Must specify image file on command line\n";
-    echo "\n";
-    exit();
-}
-
-$imagefile = $argv[1];
-if ( !file_exists($imagefile) ) {
-   echo "Error: could not find file \"{$imagefile}\"\n";
-   echo "\n";
-   exit();
-}
-
-try {
-    $text = (new TesseractOCR($imagefile))
-        ->lang('eng') // Set languages
-        ->run();
-
-    echo $text;
-} catch (Exception $e) {
-    echo 'Error: ' . $e->getMessage(), "\n";
-}
-
-// vim: ts=4 sw=4:

js/manage.js

@@ -1,5 +1,4 @@
 var validated = false;
-var typingTimer;
 
 $(document).ready(function() {
   $("#dialog-login").dialog({
@@ -26,24 +25,17 @@ $(document).ready(function() {
         $(this).dialog("close");
         $("#edit-props-id").val("0");
         $("#edit-props-filename").val("");
-        $("#edit-props-cardtext").val("");
         $("#edit-props-enabled").prop("checked", false);
       },
       "Save": saveCardProperties
     }
   });
-  $("#searchfilter").on("keyup", function(event) {
-    clearTimeout(typingTimer);
-    typingTimer = setTimeout(showGallery, 750);
-  });
   showGallery();
 });
 
 function showGallery() {
-  filter =  $("#searchfilter").val();
   $.ajax({
     url: 'ajax/getimages.php',
-    data: {filter: filter},
     dataType: 'json',
     success: function(data, stat, jqo) {
       validated = data.validated;
@@ -181,7 +173,6 @@ function openEditDialog(imageId) {
       $("#edit-image").attr("src", "thumb.php?id="+imageId);
       $("#edit-props-id").val(imageId);
       $("#edit-props-filename").val(data.image.title);
-      $("#edit-props-cardtext").val(data.image.cardtext);
       $("#edit-props-enabled").prop("checked", data.image.enabled);
       $("#edit-props-dimensions").html(data.image.dimensions);
       $("#edit-props-size").html(data.image.size);
@@ -195,7 +186,6 @@ function clearEditDialog() {
   $("#edit-image").attr("src", "img/error.png");
   $("#edit-props-id").val("0");
   $("#edit-props-filename").val("");
-  $("#edit-props-cardtext").val("");
   $("#edit-props-enabled").prop("checked", false);
   $("#edit-props-dimensions").html("");
   $("#edit-props-size").html("");
@@ -230,10 +220,8 @@ function saveCardProperties() {
     data: {
       id: $("#edit-props-id").val(),
       filename: $("#edit-props-filename").val(),
-      cardtext: $("#edit-props-cardtext").val(),
       enabled: ($("#edit-props-enabled").prop("checked")) ? 1 : 0
     },
-    type: 'POST',
     success: function(data, stat, jqo) {
       if ( !data.error ) {
         clearEditDialog();

manage.php

@@ -27,10 +27,6 @@ $files = MTGImage::getList();
       <span class="edit-props-label">File Name:</span>
       <input size="20" id="edit-props-filename" />
     </p>
-    <p>
-      <span class="edit-props-label">Card Text:</span>
-      <textarea cols="20" rows="4" id="edit-props-cardtext"></textarea>
-    </p>
     <p>
       <span class="edit-props-label">Enabled:</span>
       <input type="checkbox" id="edit-props-enabled" />
@@ -49,10 +45,6 @@ $files = MTGImage::getList();
     </p>
   </div>
 </div>
-<div class="header">
-  <span class="header-label">Manage Cards: </span>
-  <input size='20' id="searchfilter" placeholder="Enter Search Filter" class="searchfilter" />
-</div>
 <div id="gallery" class="imagegallery"></div>
 <?php