From 738d06cde666a248eff06f3e5f1e8df2c0028fa9 Mon Sep 17 00:00:00 2001
From: abakkk <abakkk@netcourrier.com>
Date: Mon, 6 Jan 2020 15:32:38 +0100
Subject: [PATCH] replace DATA_SUB_DIR const with 'data-dir' metadata property

---
 draw.js       | 7 +++----
 metadata.json | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/draw.js b/draw.js
index d03e8e9..6bea034 100644
--- a/draw.js
+++ b/draw.js
@@ -48,7 +48,6 @@ const _ = imports.gettext.domain(Me.metadata['gettext-domain']).gettext;
 
 const GS_VERSION = Config.PACKAGE_VERSION;
 const DEFAULT_FILE_NAME = 'DrawOnYourScreen';
-const DATA_SUB_DIR = 'drawOnYourScreen'
 
 const FILL_ICON_PATH = Me.dir.get_child('icons').get_child('fill-symbolic.svg').get_path();
 const STROKE_ICON_PATH = Me.dir.get_child('icons').get_child('stroke-symbolic.svg').get_path();
@@ -72,7 +71,7 @@ function getDateString() {
 }
 
 function getJsonFiles() {
-    let directory = Gio.File.new_for_path(GLib.build_filenamev([GLib.get_user_data_dir(), DATA_SUB_DIR]));
+    let directory = Gio.File.new_for_path(GLib.build_filenamev([GLib.get_user_data_dir(), Me.metadata['data-dir']]));
     if (!directory.query_exists(null))
         return [];
     
@@ -673,7 +672,7 @@ var DrawingArea = new Lang.Class({
             this._stopDrawing();
         }
         
-        let dir = GLib.build_filenamev([GLib.get_user_data_dir(), DATA_SUB_DIR]);
+        let dir = GLib.build_filenamev([GLib.get_user_data_dir(), Me.metadata['data-dir']]);
         if (!GLib.file_test(dir, GLib.FileTest.EXISTS))
             GLib.mkdir_with_parents(dir, 0o700);
         let path = GLib.build_filenamev([dir, `${name}.json`]);
@@ -718,7 +717,7 @@ var DrawingArea = new Lang.Class({
     
     _loadJson: function(name, notify) {
         let dir = GLib.get_user_data_dir();
-        let path = GLib.build_filenamev([dir, DATA_SUB_DIR, `${name}.json`]);
+        let path = GLib.build_filenamev([dir, Me.metadata['data-dir'], `${name}.json`]);
         
         if (!GLib.file_test(path, GLib.FileTest.EXISTS))
             return;
diff --git a/metadata.json b/metadata.json
index b612103..08e5a2a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -5,6 +5,7 @@
     "url": "https://framagit.org/abakkk/DrawOnYourScreen",
     "settings-schema": "org.gnome.shell.extensions.draw-on-your-screen",
     "gettext-domain": "draw-on-your-screen",
+    "data-dir": "drawOnYourScreen",
     "shell-version": [
         "3.24",
         "3.26",