logger updates

frontend/src/api/meta.js

@@ -8,11 +8,13 @@ const debugURLs = {
   debug: `${prefix}`,
   lastRecipe: `${prefix}/last-recipe-json`,
   demo: `${prefix}/is-demo`,
+  log: num => `${prefix}/log/${num}`,
+  statistics: `${prefix}/statistics`,
 };
 
 export const metaAPI = {
   async getAppInfo() {
-    let response = await apiReq.get(debugURLs.version);
+    const response = await apiReq.get(debugURLs.version);
     return response.data;
   },
 
@@ -21,13 +23,23 @@ export const metaAPI = {
     return response.data;
   },
 
+  async getLogText(num) {
+    const response = await apiReq.get(debugURLs.log(num));
+    return response.data;
+  },
+
   async getLastJson() {
-    let response = await apiReq.get(debugURLs.lastRecipe);
+    const response = await apiReq.get(debugURLs.lastRecipe);
     return response.data;
   },
 
   async getIsDemo() {
-    let response = await apiReq.get(debugURLs.demo);
+    const response = await apiReq.get(debugURLs.demo);
+    return response.data;
+  },
+
+  async getStatistics() {
+    const response = await apiReq.get(debugURLs.statistics);
     return response.data;
   },
 };

frontend/src/components/UI/Buttons/TheDownloadBtn.vue

@@ -1,7 +1,11 @@
 <template>
-  <v-btn color="accent" text :loading="downloading" @click="downloadFile">
-    {{ showButtonText }}
-  </v-btn>
+  <div>
+    <slot v-bind="{ downloading, downloadFile }">
+      <v-btn color="accent" text :loading="downloading" @click="downloadFile">
+        {{ showButtonText }}
+      </v-btn>
+    </slot>
+  </div>
 </template>
 
 <script>

frontend/src/components/UI/LogCard.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="mt-2">
+    <v-card>
+      <v-card-title class="headline">
+        Log
+        <v-spacer></v-spacer>
+        <v-text-field
+          class="ml-auto shrink mb-n7"
+          solo
+          label="Log Lines"
+          type="number"
+          append-icon="mdi-refresh-circle"
+          v-model="lines"
+          @click:append="getLogText"
+          suffix="lines"
+          single-line
+        >
+        </v-text-field>
+        <TheDownloadBtn :button-text="$t('about.download-log')" download-url="/api/debug/log">
+          <template v-slot:default="{ downloadFile }">
+            <v-btn bottom right relative fab icon color="primary" @click="downloadFile">
+              <v-icon> mdi-download </v-icon>
+            </v-btn>
+          </template>
+        </TheDownloadBtn>
+      </v-card-title>
+      <v-divider></v-divider>
+      <v-card-text>
+        <div v-for="(item, index) in splitText" :key="index" :class="getClass(item)">
+          {{ item }}
+        </div>
+      </v-card-text>
+    </v-card>
+  </div>
+</template>
+
+<script>
+import TheDownloadBtn from "@/components/UI/Buttons/TheDownloadBtn";
+import { api } from "@/api";
+export default {
+  components: { TheDownloadBtn },
+  data() {
+    return {
+      lines: 200,
+      text: "",
+    };
+  },
+  mounted() {
+    this.getLogText();
+  },
+  computed: {
+    splitText() {
+      return this.text.split("/n");
+    },
+  },
+  methods: {
+    async getLogText() {
+      this.text = await api.meta.getLogText(this.lines);
+    },
+    getClass(text) {
+      const isError = text.includes("ERROR:");
+      if (isError) {
+        return "log--error";
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.log-text {
+  background-color: #e0e0e077;
+}
+.log--error {
+  color: #ef5350;
+}
+.line-number {
+  color: black;
+  font-weight: bold;
+}
+</style>

frontend/src/components/UI/TheSidebar.vue

@@ -147,6 +147,11 @@ export default {
     },
     adminLinks() {
       return [
+        {
+          icon: "mdi-view-dashboard",
+          to: "/admin/dashboard",
+          title: this.$t("general.dashboard"),
+        },
         {
           icon: "mdi-cog",
           to: "/admin/settings",

frontend/src/locales/messages/en-US.json

@@ -14,7 +14,7 @@
     "demo-status": "Demo Status",
     "development": "Development",
     "download-log": "Download Log",
-    "download-recipe-json": "Download Recipe JSON",
+    "download-recipe-json": "Last Scraped JSON",
     "not-demo": "Not Demo",
     "production": "Production",
     "database-url": "Database URL",
@@ -36,6 +36,7 @@
     "confirm": "Confirm",
     "create": "Create",
     "current-parenthesis": "(Current)",
+    "dashboard": "Dashboard",
     "delete": "Delete",
     "disabled": "Disabled",
     "download": "Download",

mealie/core/root_logger.py

@@ -4,8 +4,8 @@ import sys
 from mealie.core.config import DATA_DIR
 
 LOGGER_FILE = DATA_DIR.joinpath("mealie.log")
-LOGGER_FORMAT = "%(levelname)s: \t%(message)s"
 DATE_FORMAT = "%d-%b-%y %H:%M:%S"
+LOGGER_FORMAT = "%(levelname)s: %(asctime)s \t%(message)s"
 
 logging.basicConfig(level=logging.INFO, format=LOGGER_FORMAT, datefmt="%d-%b-%y %H:%M:%S")
 
@@ -30,6 +30,9 @@ def logger_init() -> logging.Logger:
     return logger
 
 
+root_logger = logger_init()
+
+
 def get_logger(module=None) -> logging.Logger:
     """ Returns a child logger for mealie """
     global root_logger
@@ -38,6 +41,3 @@ def get_logger(module=None) -> logging.Logger:
         return root_logger
 
     return root_logger.getChild(module)
-
-
-root_logger = logger_init()

mealie/routes/debug_routes.py

@@ -2,8 +2,11 @@ from fastapi import APIRouter, Depends
 from mealie.core.config import APP_VERSION, app_dirs, settings
 from mealie.core.root_logger import LOGGER_FILE
 from mealie.core.security import create_file_token
+from mealie.db.database import db
+from mealie.db.db_setup import generate_session
 from mealie.routes.deps import get_current_user
-from mealie.schema.debug import AppInfo, DebugInfo
+from mealie.schema.about import AppInfo, AppStatistics, DebugInfo
+from sqlalchemy.orm.session import Session
 
 router = APIRouter(prefix="/api/debug", tags=["Debug"])
 
@@ -24,6 +27,17 @@ async def get_debug_info(current_user=Depends(get_current_user)):
     )
 
 
+@router.get("/statistics")
+async def get_app_statistics(session: Session = Depends(generate_session)):
+    return AppStatistics(
+        total_recipes=db.recipes.count_all(session),
+        uncategorized_recipes=db.recipes.count_uncategorized(session),
+        untagged_recipes=db.recipes.count_untagged(session),
+        total_users=db.users.count_all(session),
+        total_groups=db.groups.count_all(session),
+    )
+
+
 @router.get("/version")
 async def get_mealie_version():
     """ Returns the current version of mealie"""

mealie/schema/about.py

@@ -2,6 +2,13 @@ from pathlib import Path
 
 from fastapi_camelcase import CamelModel
 
+class AppStatistics(CamelModel):
+    total_recipes: int
+    total_users: int
+    total_groups: int
+    uncategorized_recipes: int
+    untagged_recipes: int
+
 
 class AppInfo(CamelModel):
     production: bool

mealie/services/recipe/media.py

@@ -27,3 +27,4 @@ def check_assets(original_slug, recipe: Recipe) -> Path:
 def delete_assets(recipe_slug):
     recipe_dir = Recipe(slug=recipe_slug).directory
     rmtree(recipe_dir, ignore_errors=True)
+    logger.info(f"Recipe Directory Removed: {recipe_slug}")