From 304213cfa47728244bb243061d8b560a5566a919 Mon Sep 17 00:00:00 2001 From: Sami Mokaddem Date: Tue, 12 Dec 2017 11:00:26 +0100 Subject: [PATCH] update: Possibility to change the authorized max line length in the config for the diff of duplicates --- bin/packages/config.cfg.sample | 8 +++++--- var/www/modules/Flask_config.py | 1 + var/www/modules/showpaste/Flask_showpaste.py | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/packages/config.cfg.sample b/bin/packages/config.cfg.sample index da50932f..cb45da06 100644 --- a/bin/packages/config.cfg.sample +++ b/bin/packages/config.cfg.sample @@ -21,15 +21,17 @@ sentiment_lexicon_file = sentiment/vader_lexicon.zip/vader_lexicon/vader_lexicon ##### Flask ##### [Flask] #Maximum number of character to display in the toolip -max_preview_char = 250 +max_preview_char = 250 #Maximum number of character to display in the modal -max_preview_modal = 800 +max_preview_modal = 800 #Default number of header to display in trending graphs default_display = 10 #Number of minutes displayed for the number of processed pastes. minute_processed_paste = 10 +#Maximum line length authorized to make a diff between duplicates +DiffMaxLineLength = 10000 -#### Modules #### +#### Modules #### [Modules_Duplicates] #Number of month to look back maximum_month_range = 3 diff --git a/var/www/modules/Flask_config.py b/var/www/modules/Flask_config.py index 5e51c4ac..256ddfd8 100644 --- a/var/www/modules/Flask_config.py +++ b/var/www/modules/Flask_config.py @@ -63,3 +63,4 @@ max_preview_char = int(cfg.get("Flask", "max_preview_char")) # Maximum number of max_preview_modal = int(cfg.get("Flask", "max_preview_modal")) # Maximum number of character to display in the modal tlsh_to_percent = 1000.0 #Use to display the estimated percentage instead of a raw value +DiffMaxLineLength = int(cfg.get("Flask", "DiffMaxLineLength"))#Use to display the estimated percentage instead of a raw value diff --git a/var/www/modules/showpaste/Flask_showpaste.py b/var/www/modules/showpaste/Flask_showpaste.py index eedfda17..1acb26a2 100644 --- a/var/www/modules/showpaste/Flask_showpaste.py +++ b/var/www/modules/showpaste/Flask_showpaste.py @@ -21,6 +21,7 @@ r_serv_pasteName = Flask_config.r_serv_pasteName max_preview_char = Flask_config.max_preview_char max_preview_modal = Flask_config.max_preview_modal tlsh_to_percent = Flask_config.tlsh_to_percent +DiffMaxLineLength = Flask_config.DiffMaxLineLength showsavedpastes = Blueprint('showsavedpastes', __name__, template_folder='templates') @@ -122,7 +123,7 @@ def showDiff(): p2 = Paste.Paste(s2) maxLengthLine1 = p1.get_lines_info()[1] maxLengthLine2 = p2.get_lines_info()[1] - if maxLengthLine1 > 100000 or maxLengthLine2 > 100000: + if maxLengthLine1 > DiffMaxLineLength or maxLengthLine2 > DiffMaxLineLength: return "Can't make the difference as the lines are too long." htmlD = difflib.HtmlDiff() lines1 = p1.get_p_content().decode('utf8', 'ignore').splitlines()