Skip to content
GitLab
Commit 98a651ea authored by Rob Swindell's avatar Rob Swindell 💬
Browse files

Merge branch 'issue_494_ddfilelister_scan_more_detail' into 'master' 

Fix for issue #494 (DD File Lister searching and scanning)

Closes #494

See merge request !242
parents ca5cf8e0 2ce0a5fa
Hide whitespace changes
Inline Side-by-side
xtrn/ddfilelister/ddfilelister.js
View file @ 98a651ea
......@@ -52,6 +52,12 @@
* downloaded and date/time last downloaded. Also, fixed a bug
* where some descriptions were blank in the Frame object because
* of a leading normal attribute (the fix may be a kludge though).
* 2023-01-18 Eric Oulashin Version 2.08
* When doing a file search in multiple directories, the file
* library & directory is now shown in the header as the user
* scrolls through the file list/search results. Also,
* used lfexpand() to ensure the extended description has
* CRLF endings, useful for splitting it into multiple lines properly.
*/
"use strict";
......@@ -109,8 +115,8 @@ if (system.version_num < 31900)
}
// Lister version information
var LISTER_VERSION = "2.07";
var LISTER_DATE = "2022-12-02";
var LISTER_VERSION = "2.08";
var LISTER_DATE = "2023-01-18";
///////////////////////////////////////////////////////////////////////////////
......@@ -1985,7 +1991,8 @@ function doFrameInputLoop(pFrame, pScrollbar, pFrameContentStr, pAdditionalQuitK
// Parameters:
// pTextOnly: Only draw the library & directory text (no decoration or other text).
// This is optional & defaults to false.
function displayFileLibAndDirHeader(pTextOnly)
// pDirCodeOverride: Optional string: If this is valid, this will be used for the library & directory name
function displayFileLibAndDirHeader(pTextOnly, pDirCodeOverride)
{
var textOnly = (typeof(pTextOnly) === "boolean" ? pTextOnly : false);
......@@ -2008,7 +2015,7 @@ function displayFileLibAndDirHeader(pTextOnly)
var dirCode = "";
if (gScriptMode == MODE_LIST_CURDIR)
dirCode = bbs.curdir_code;
else if (typeof(gFileList.allSameDir) == "boolean" && gFileList.allSameDir && gFileList.length > 0)
else if (typeof(gFileList.allSameDir) === "boolean" && gFileList.allSameDir && gFileList.length > 0)
dirCode = gFileList[0].dirCode;
if (dirCode.length > 0)
{
......@@ -2017,6 +2024,13 @@ function displayFileLibAndDirHeader(pTextOnly)
libDesc = file_area.lib_list[libIdx].description;
dirDesc = file_area.dir[dirCode].description;
}
else if (typeof(pDirCodeOverride) === "string" && file_area.dir.hasOwnProperty(pDirCodeOverride))
{
libIdx = file_area.dir[pDirCodeOverride].lib_index;
dirIdx = file_area.dir[pDirCodeOverride].index;
libDesc = file_area.lib_list[libIdx].description;
dirDesc = file_area.dir[pDirCodeOverride].description;
}
else
{
libIdx = -1;
......@@ -2161,6 +2175,17 @@ function createFileListMenu(pQuitKeys)
// Define the menu function for getting an item
fileListMenu.GetItem = function(pIdx) {
// If doing a file search, then update the header with the file library & directory
// name of the currently selected file (instead of displaying "Various"). This seems
// like a bit of a hack, but it works.
var allSameDir = (typeof(gFileList.allSameDir) === "boolean" ? gFileList.allSameDir : false);
if (isDoingFileSearch() && !allSameDir)
{
var originalCurPos = console.getxy();
displayFileLibAndDirHeader(true, gFileList[pIdx].dirCode);
console.gotoxy(originalCurPos);
}
var menuItemObj = this.MakeItemWithRetval(pIdx);
var filename = shortenFilename(gFileList[pIdx].name, this.filenameLen, true);
// FileBase.format_name() could also be called to format the filename for display:
......@@ -2177,6 +2202,7 @@ function createFileListMenu(pQuitKeys)
filename,
getFileSizeStr(gFileList[pIdx].size, this.fileSizeLen),
desc.substr(0, this.shortDescLen));
return menuItemObj;
}
......@@ -3419,11 +3445,15 @@ function searchDirWithFilespec(pDirCode, pFilespec)
var filebase = new FileBase(pDirCode);
if (filebase.open())
{
var fileList = filebase.get_list(pFilespec, FileBase.DETAIL.NORM, 0, true, gFileSortOrder); // Or EXTENDED
var fileDetail = (extendedDescEnabled() ? FileBase.DETAIL.EXTENDED : FileBase.DETAIL.NORM);
var fileList = filebase.get_list(pFilespec, fileDetail, 0, true, gFileSortOrder);
retObj.foundFiles = (fileList.length > 0);
filebase.close();
for (var i = 0; i < fileList.length; ++i)
{
// Fix line endings in extdesc if necessary
if (fileList[i].hasOwnProperty("extdesc") && /\r\n$/.test(fileList[i].extdesc))
fileList[i].extdesc = lfexpand(fileList[i].extdesc);
fileList[i].dirCode = pDirCode;
gFileList.push(fileList[i]);
}
......@@ -3472,6 +3502,8 @@ function searchDirWithDescUpper(pDirCode, pDescUpper)
}
if (!fileIsMatch && fileList[i].hasOwnProperty("extdesc"))
{
// Fix line endings if necessary
fileList[i].extdesc = lfexpand(fileList[i].extdesc);
var descLines = fileList[i].extdesc.split("\r\n");
var fileDesc = strip_ctrl(descLines.join(" ")).toUpperCase();
fileIsMatch = (fileDesc.indexOf(pDescUpper) > -1);
......@@ -3515,13 +3547,17 @@ function searchDirNewFiles(pDirCode, pSinceTime)
var filebase = new FileBase(pDirCode);
if (filebase.open())
{
var fileList = filebase.get_list("*", FileBase.DETAIL.NORM, 0, true, gFileSortOrder);
var fileDetail = (extendedDescEnabled() ? FileBase.DETAIL.EXTENDED : FileBase.DETAIL.NORM);
var fileList = filebase.get_list("*", fileDetail, 0, true, gFileSortOrder);
filebase.close();
for (var i = 0; i < fileList.length; ++i)
{
if (fileList[i].added >= pSinceTime)
{
retObj.foundFiles = true;
// Fix line endings in extdesc if necessary
if (fileList[i].hasOwnProperty("extdesc"))
fileList[i].extdesc = lfexpand(fileList[i].extdesc);
fileList[i].dirCode = pDirCode;
gFileList.push(fileList[i]);
}
......@@ -3823,4 +3859,10 @@ function refreshScreenMainContent(pUpperLeftX, pUpperLeftY, pWidth, pHeight, pSe
displayFileExtDescOnMainScreen(gFileListMenu.selectedItemIdx, firstRow, lastRow, width);
}
}
}
// Returns whether or not the lister is doing a file search
function isDoingFileSearch()
{
return (gScriptMode == MODE_SEARCH_FILENAME || gScriptMode == MODE_SEARCH_DESCRIPTION || gScriptMode == MODE_NEW_FILE_SEARCH);
}
\ No newline at end of file
xtrn/ddfilelister/readme.txt
View file @ 98a651ea
Digital Distortion File Lister
Version 2.07
Release date: 2022-12-02
Version 2.08
Release date: 2023-01-18
by
......
xtrn/ddfilelister/revision_history.txt
View file @ 98a651ea
......@@ -5,11 +5,14 @@ Revision History (change log)
=============================
Version Date Description
------- ---- -----------
2.08 2023-01-18 When doing a file search in multiple directories, the
file library & directory is now shown in the header as
the user scrolls through the file list/search results.
Also, improved searching with extended descriptions to
ensure all lines of the description are displayed.
2.07 2022-12-02 In a file's extended description, added the number of
times downloaded and date/time last downloaded. Also,
fixed a bug where some descriptions were blank in the
extended description box because of a leading normal
attribute.
fixed a bug where some descriptions were blank
2.06 2022-04-13 When extended file descriptions are enabled, the file date
is now shown with the file description on the last line.
2.05a 2022-03-13 Fix for "fileDesc is not defined" error when displaying
......@@ -38,4 +41,4 @@ Version Date Description
info. Fixed command bar refreshing when pressing the
hotkeys. Added an option to pause after viewing a file
(defaults to true).
2.00 2022-02-06 Initial version.
2.00 2022-02-06 Initial version.
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment