README.md

@@ -6,7 +6,6 @@ A plugin that keeps track of how long you played your games, and an app to show
 - As it's rewritten as a kernel plugin, the files that record the playtime won't ever get corrupted.
 - It only writes to file when you close/launch or suspend/resume the games so it doesn't murder your memory card, unlike the old one.
 - Complete support for Adrenaline and Adrenaline Bubbles.
-- You can add apps/games you selected to a blacklist (located at ux0:/data/TrackPlug/blacklist.txt)
 - The app works at 60FPS instead of 30FPS.
 
 # How do I install this?
@@ -15,16 +14,13 @@ Just put BetterTrackPlug.skprx under *KERNEL in config.txt
 *KERNEL
 ur0:tai/BetterTrackPlug.skprx
 ```
-install the vpk.
-Reboot.
+and install the vpk.
 
-# How do I use this?
-- UP/DOWN to navigate.
-- Triangle to prompt clearing playtime of the selected record, asks if you want to blacklist if you do clear the playtime.
+# Features To Be Added
+- Blacklist support so you don't have to see how much time you've spent on VitaShell.
 
 # Notes
 ![Bubbles](https://i.imgur.com/qZwPMXU.png)
-
 I would advise you to set up your bubbles in a way that their title ID's will be the same as the corresponding PSP game's title ID instead of the default PSPEMUXXX, this way, they will use the same file that stores the playtime and you won't see the game twice on the list if you launch it both from bubble or directly from adrenaline.
 
 As it's currently not possible for me to extract icons from inside Adrenaline, games launched directly from Adrenaline won't have any icons if there is no corresponding bubble for the said game. I also don't think it would be efficient even if I knew how to do it.

app/index.lua

@@ -3,22 +3,21 @@ System.createDirectory("ux0:/data/TrackPlug/")
 System.createDirectory("ux0:/data/TrackPlug/Records")
 System.createDirectory("ux0:/data/TrackPlug/Config")
 System.createDirectory("ux0:/data/TrackPlug/Assets")
--- Creating blacklist file if it doesn't exist
-if not System.doesFileExist("ux0:/data/TrackPlug/blacklist.txt") then
-    local blacklist_file = System.openFile("ux0:/data/TrackPlug/blacklist.txt", FCREATE)
-    System.closeFile(blacklist_file)
-end
--- Reading blacklist file
-local blacklist_file = System.openFile("ux0:/data/TrackPlug/blacklist.txt", FREAD)
-local blacklist_fsize = System.sizeFile(blacklist_file)
-local blacklist_var = System.readFile(blacklist_file, blacklist_fsize)
-System.closeFile(blacklist_file)
--- Removing blacklisted titles
-for line in blacklist_var:gmatch("([^\n]*)\n?") do
-   System.deleteFile("ux0:/data/TrackPlug/Records/" .. line .. ".bin")
-end
--- Read entries to a table
+-- Scanning TrackPlug folder
 local tbl = System.listDirectory("ux0:/data/TrackPlug/Records")
+local blacklist = {}
+-- Removing blacklisted games
+--[[for i, file in pairs(tbl) do
+	local titleid = string.sub(file.name,1,-5)
+    for k, toberemoved in pairs(blacklist) do
+	    if titleid == blacklist[k] then
+            System.deleteFile("ux0:/data/TrackPlug/Records"..file.name)
+        end
+    end
+end
+-- Reset the table
+tbl = System.listDirectory("ux0:/data/TrackPlug/Records")]]--
+
 if tbl == nil then
     tbl = {}
 end
@@ -148,20 +147,19 @@ for i, file in pairs(tbl) do
     else
         local titleid = string.sub(file.name,1,-5)
         file.region = getRegion(titleid)
+
         if System.doesFileExist("ux0:/data/TrackPlug/Assets/" .. titleid .. "/icon0.png") then
 			file.icon = Graphics.loadImage("ux0:/data/TrackPlug/Assets/" .. titleid .. "/icon0.png")
-		else
+		elseif System.doesFileExist("ur0:/appmeta/" .. titleid .. "/icon0.png") then
+            file.icon = Graphics.loadImage("ur0:/appmeta/" .. titleid .. "/icon0.png")
 			System.createDirectory("ux0:/data/TrackPlug/Assets/" .. titleid .. "")
-			if System.doesFileExist("ur0:/appmeta/" .. titleid .. "/icon0.png") then
-				file.icon = Graphics.loadImage("ur0:/appmeta/" .. titleid .. "/icon0.png")
-				copyIcon(titleid)
-			else
-				file.icon = unk
-			end
-		end
+			copyIcon(titleid)
+        else
+            file.icon = unk
+        end
         
 		
-	if System.doesFileExist("ux0:/data/TrackPlug/Assets/" .. titleid .. "/title.txt") then
+		if System.doesFileExist("ux0:/data/TrackPlug/Assets/" .. titleid .. "/title.txt") then
             file.title = recoverTitle(titleid)
         elseif System.doesFileExist("ux0:/app/" .. titleid .. "/sce_sys/param.sfo") then
             file.title = extractTitle("ux0:/app/" .. titleid .. "/sce_sys/param.sfo", titleid)
@@ -260,7 +258,6 @@ end
 local sel_val = 128
 local decrease = true
 local freeze = false
-local freeze_blacklist = false
 local mov_y = 0
 local mov_step = 0
 local new_list_idx = nil
@@ -313,7 +310,7 @@ function RenderList()
 		if i ~= list_idx + 5 then
 			Graphics.drawImage(5, y + mov_y, big_tbl[i].icon)
 		end
-		Graphics.debugPrint(150, y + 35 + mov_y, string.gsub(big_tbl[i].title, "\n", " "), Color.new(230,140,175))
+		Graphics.debugPrint(150, y + 35 + mov_y, big_tbl[i].title, Color.new(230,140,175))
 		--Graphics.debugPrint(150, y + 45 + mov_y, "Title ID: " .. big_tbl[i].id, white)
 		--Graphics.debugPrint(150, y + 65 + mov_y, "Region: " .. big_tbl[i].region, white)
 		Graphics.debugPrint(150, y + 65 + mov_y, "Playtime: " .. big_tbl[i].ptime, white)
@@ -321,7 +318,7 @@ function RenderList()
 		if r_idx == 0 then
 			r_idx = #tbl
 		end
-		Graphics.debugPrint(910, y + 100 + mov_y, "#" .. r_idx, white)
+		Graphics.debugPrint(920, y + 100 + mov_y, "#" .. r_idx, white)
 		y = y + 132
 		if real_i <= 0 then
 			i = real_i
@@ -333,32 +330,23 @@ end
 
 -- Main loop
 local f_idx = 1
-local f_idx_2 = 1
 local useless = 0
-local blacklisted_title = "kek"
-local blacklisted_title_id = "kek"
 local oldpad = Controls.read()
 while #tbl > 0 do
 	Graphics.initBlend()
-    Graphics.fillRect(0,960,0,544,Color.new(10,5,15))
-    Graphics.fillRect(0,960,4,140,Color.new(20,20,20))
+	Graphics.fillRect(0,960,0,544,Color.new(10,5,15))
 	wav:init()
 	RenderList()
 	if freeze then
-        showAlarm("Do you want to clear playtime of this record? \n" .. string.gsub(tbl[list_idx].title, "\n", " "), f_idx)
-    end
-    if freeze_blacklist then
-        showAlarm("Do you want to blacklist this record? \n" .. blacklisted_title, f_idx_2)
-    end
+		showAlarm("Do you want to delete this record permanently? \n" .. tbl[list_idx].title, f_idx)
+	end
 	Graphics.termBlend()
 	Screen.flip()
 	Screen.waitVblankStart()
     local pad = Controls.read()
 	if Controls.check(pad, SCE_CTRL_UP) and mov_y == 0 then
 		if freeze then
-            f_idx = 1
-        elseif freeze_blacklist then
-            f_idx_2 = 1
+			f_idx = 1
 		else
 			new_list_idx = list_idx - 1
 			if new_list_idx == 0 then
@@ -368,9 +356,7 @@ while #tbl > 0 do
 		end
 	elseif Controls.check(pad, SCE_CTRL_DOWN) and mov_y == 0 then
 		if freeze then
-            f_idx = 2
-        elseif freeze_blacklist then
-            f_idx_2 = 2
+			f_idx = 2
 		else
 			new_list_idx = list_idx + 1
 			if new_list_idx > #tbl then
@@ -379,30 +365,17 @@ while #tbl > 0 do
 			mov_y = -11
 		end
 	elseif Controls.check(pad, SCE_CTRL_TRIANGLE) and not Controls.check(oldpad, SCE_CTRL_TRIANGLE) and not freeze then
-        freeze = true
-        f_idx = 2
-        f_idx_2 = 2
-    elseif Controls.check(pad, SCE_CTRL_CROSS) and not Controls.check(oldpad, SCE_CTRL_CROSS) and freeze then
-        freeze = false
-        if f_idx == 1 then -- Delete
-            blacklisted_title_id = tbl[list_idx].id
-            blacklisted_title = string.gsub(tbl[list_idx].title, "\n", " ")
-            System.deleteFile("ux0:/data/TrackPlug/Records/" .. tbl[list_idx].id .. ".bin")
-            freeze_blacklist = true
+		freeze = true
+		f_idx = 1
+	elseif Controls.check(pad, SCE_CTRL_CROSS) and not Controls.check(oldpad, SCE_CTRL_CROSS) and freeze then
+		freeze = false
+		if f_idx == 1 then -- Delete
+			System.deleteFile("ux0:/data/TrackPlug/" .. tbl[list_idx].title)
 			table.remove(tbl, list_idx)
 			big_tbl = {}
 			list_idx = list_idx - 1
         end
-    elseif Controls.check(pad, SCE_CTRL_CROSS) and not Controls.check(oldpad, SCE_CTRL_CROSS) and freeze_blacklist then
-        freeze_blacklist = false
-        if f_idx_2 == 1 then -- Blacklist
-            local file = System.openFile("ux0:/data/TrackPlug/blacklist.txt", FRDWR)
-            local file_size = System.sizeFile(file)
-            local file_var = System.readFile(file, file_size)
-            System.writeFile(file, blacklisted_title_id .. "\n", string.len(blacklisted_title_id) + 1)
-            System.closeFile(file)
-        end
-    end
+	end
 	oldpad = pad
 end
 

app/sce_sys/livearea/contents/template.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<livearea style="a1" format-ver="01.00" content-rev="1">
-	<livearea-background>
-		<image>bg.png</image>
-	</livearea-background>
-	
-	<gate>
-		<startup-image>startup.png</startup-image>
-	</gate>
-</livearea>

src/CMakeLists.txt

@@ -1,15 +1,15 @@
 cmake_minimum_required(VERSION 2.8)
 
 if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
-  if(DEFINED ENV{DOLCESDK})
-	set(CMAKE_TOOLCHAIN_FILE "$ENV{DOLCESDK}/share/dolce.toolchain.cmake" CACHE PATH "toolchain file")
+  if(DEFINED ENV{VITASDK})
+    set(CMAKE_TOOLCHAIN_FILE "$ENV{VITASDK}/share/vita.toolchain.cmake" CACHE PATH "toolchain file")
   else()
-	message(FATAL_ERROR "Please define DOLCESDK to point to your SDK path!")
+    message(FATAL_ERROR "Please define VITASDK to point to your SDK path!")
   endif()
 endif()
 
 project(BetterTrackPlug)
-include("$ENV{DOLCESDK}/share/dolce.cmake" REQUIRED)
+include("$ENV{VITASDK}/share/vita.cmake" REQUIRED)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-q -Wall -O3 -std=gnu99")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib")
@@ -36,7 +36,7 @@ target_link_libraries(${PROJECT_NAME}
   gcc
   -nostdlib
 )
-dolce_create_self(${PROJECT_NAME}.skprx ${PROJECT_NAME}
+vita_create_self(${PROJECT_NAME}.skprx ${PROJECT_NAME}
   UNSAFE
   CONFIG ${CMAKE_SOURCE_DIR}/BetterTrackPlug.yml
 )

src/main.c

@@ -1,9 +1,12 @@
 #include <stdio.h>
 #include <taihen.h>
+#include <psp2/io/fcntl.h> 
 #include <psp2kern/kernel/sysmem.h> 
-#include <psp2kern/kernel/modulemgr.h>
-#include <psp2kern/kernel/iofilemgr.h>
 #include <string.h>
+#include <stdarg.h>
+#include <vitasdkkern.h>
+#include <stdlib.h>
+#include <psp2/appmgr.h> 
 
 #define printf ksceDebugPrintf
 #define SECOND        1000000
@@ -94,7 +97,7 @@ static void adrenaline_titlewriter(char *dummy_id,char *dummy_title){
     char pathfolder[128];
     snprintf(path, 128, "ux0:/data/TrackPlug/Assets/%s/title.txt", dummy_id);
     snprintf(pathfolder, 128, "ux0:/data/TrackPlug/Assets/%s/", dummy_id);
-    ksceIoMkdir(pathfolder,6);
+    int dfd = ksceIoMkdir(pathfolder,6);
     SceUID fd = ksceIoOpen(path,
         SCE_O_WRONLY | SCE_O_CREAT | SCE_O_TRUNC, 0777);
     if (fd < 0) return;
@@ -194,7 +197,7 @@ int event_handler(int pid, int ev, int a3, int a4, int *a5, int a6) {
                 //Write games playtime and reset the variable. If Adrenaline was in XMB, no need
                 //to write it again as it will be handled by the thread.
                 if (!isxmb) write_playtime(adrenaline_id);
-                snprintf(adrenaline_id,12,"pleasePLEAS");
+                snprintf(adrenaline_id,12,"pleasePLEASE");
                 pspemu = 0;
             } else
                 write_playtime(id);