Merge pull request #136 from kmwallio/beta

Fix image uploading

Author: kmwallio

com.github.kmwallio.thiefmd.spec

@@ -1,5 +1,5 @@
 Name: com.github.kmwallio.thiefmd
-Version: 0.2.0
+Version: 0.2.1
 Release: 1%{?dist}
 Summary: The markdown editor worth stealing.
 License: GPL-3.0+
@@ -327,6 +327,8 @@ rm -vf %{buildroot}%{_libdir}/libultheme.a
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Mar 28 2021 kmwallio <[email protected]> - 0.2.1
+- Fix image upload support when blogging
 * Sat Mar 27 2021 kmwallio <[email protected]> - 0.2.0
 - Open Bibtex files and Right-Click Insert Citation in Markdown
 - Open, Preview, and Export Fountain Screen Plays

data/com.github.kmwallio.thiefmd.appdata.xml

@@ -9,7 +9,7 @@
   <summary>The markdown editor worth stealing.</summary>
   <description>
     <p>Keep your Markdown managed. Write epic tales, a novel, that screen play, keep a journal, or finally write that book report.</p>
-    <p>ThiefMD is a Markdown providing an easy way to organize, format, and compile your markdown documents. When you're ready to Publish, go to ePub, PDF, Office, Ghost, WordPress, Write-Freely, or more.</p>
+    <p>ThiefMD is a Markdown Editor providing an easy way to organize, format, and compile your markdown documents. When you're ready to Publish, go to ePub, PDF, Office, Ghost, WordPress, Write-Freely, or more.</p>
     <p>Import from and Export to Office, ePUB, HTML, and more. ThiefMD is your one stop shop for making and managing markdown mischief.</p>
     <p>Working on a screenplay? ThiefMD can handle and combine Fountain files as well. Write your novel and prepare for that movie deal all from the same app.</p>
   </description>
@@ -60,7 +60,21 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release version="0.2.0" date="2021-03-27" urgency="low">
+    <release version="0.2.1" date="2021-03-27" urgency="low">
+      <description>
+        <p>This one's for the creators, the note takers, and the plain-text savers. Notes support, screen play support, citation insertion, and more.</p>
+        <ul>
+          <li>This is a bug fix release of the last release...</li>
+          <li>Open Bibtex files and Right-Click Insert Citation in Markdown</li>
+          <li>Open, Preview, and Export Fountain Screen Plays</li>
+          <li>A new Notes Pane can help take notes for the file you're working on, or at the project level</li>
+          <li>Know what you're doing? Disable tips and start the app with a black canvas to write in</li>
+          <li>Links to other Markdown Documents in the Preview will now open in the Preview and Editor</li>
+        </ul>
+      </description>
+      <url>https://github.com/kmwallio/ThiefMD/releases/tag/v0.2.0-creators-edition</url>
+    </release>
+    <release version="0.2.0" date="2021-03-26" urgency="low">
       <description>
         <p>This one's for the creators, the note takers, and the plain-text savers. Notes support, screen play support, citation insertion, and more.</p>
         <ul>

debian/changelog

@@ -1,3 +1,9 @@
+com.github.kmwallio.thiefmd (0.2.1) groovy; urgency=low
+
+  * Fix image uploading for blogs
+
+ -- kmwallio <[email protected]>  Sat, 27 Mar 2021 23:52:27 -0700
+
 com.github.kmwallio.thiefmd (0.2.0) groovy; urgency=load
 
   * Open Bibtex files and Right-Click Insert Citation in Markdown

meson.build

@@ -1,6 +1,6 @@
 # Name our project
 project('com.github.kmwallio.thiefmd', ['vala', 'c'],
-    version: '0.2.0'
+    version: '0.2.1'
 )
 
 # Application ID

src/Connections/GhostConnection.vala

@@ -251,7 +251,7 @@ namespace ThiefMD.Connections {
                 if (featured_image == replacement.key) {
                     featured_image = replacement.value;
                 }
-                warning ("Replaced %s with %s", replacement.key, replacement.value);
+                debug ("Replaced %s with %s", replacement.key, replacement.value);
             }
 
             int published_state = publish_state.get_active ();

src/Constants/AppSettings.vala

@@ -90,6 +90,9 @@ namespace ThiefMD {
         public const double SIZE_1_REM_IN_PT = 12;
         public const double SINGLE_SPACING = 1.0;
 
+        // Citation length limit
+        public const int CITATION_TITLE_MAX_LEN = 30;
+
         // Visual Settings
         public const double MINIMUM_CONTRAST_RATIO = 1.2;
 

src/Controllers/Pandoc.vala

@@ -258,7 +258,7 @@ namespace ThiefMD.Controllers.Pandoc {
 
         RegexEvalCallback add_upload_paths = (match_info, result) =>
         {
-            if (match_info.get_match_count () >= 2) {
+            if (match_info.get_match_count () > 2) {
                 var url = match_info.fetch (2);
                 string abs_path = "";
                 if (!url.contains (":") && find_file_to_upload (url, "", out abs_path) && abs_path != "") {
@@ -325,7 +325,7 @@ namespace ThiefMD.Controllers.Pandoc {
             Regex url_search = new Regex ("\\((.+?)\\)", RegexCompileFlags.MULTILINE | RegexCompileFlags.CASELESS, 0);
             Regex src_search = new Regex ("src=['\"](.+?)['\"]", RegexCompileFlags.MULTILINE | RegexCompileFlags.CASELESS, 0);
             Regex css_url_search = new Regex ("url\\(['\"]?(.+?)['\"]?\\)", RegexCompileFlags.MULTILINE | RegexCompileFlags.CASELESS, 0);
-            Regex cover_image_search = new Regex ("(cover-image|coverimage|feature_image|featureimage|featured_image|featuredimage|bibliography):\\s*['\"]?(.+?)['\"]?\\s*$", RegexCompileFlags.MULTILINE | RegexCompileFlags.CASELESS, 0);
+            Regex cover_image_search = new Regex ("(cover-image|coverimage|feature_image|featureimage|featured_image|csl|featuredimage|bibliography):\\s*['\"]?(.+?)['\"]?\\s*$", RegexCompileFlags.MULTILINE | RegexCompileFlags.CASELESS, 0);
 
             processed_mk = url_search.replace_eval (
                 processed_mk,

src/Enrichments/Fountain.vala

@@ -21,8 +21,64 @@ using ThiefMD;
 using ThiefMD.Widgets;
 
 namespace ThiefMD.Enrichments {
+    public class FountainCharacterSuggestor : Gtk.SourceCompletionProvider, GLib.Object {
+        public Gee.HashSet<string> characters;
+
+        public class FountainCharacterSuggestor () {
+            characters = new Gee.HashSet<string> ();
+        }
+
+        public override string get_name () {
+            return _("Characters");
+        }
+
+        public override bool match (Gtk.SourceCompletionContext context) {
+            Gtk.TextIter? start = null, iter = null;
+            if (context.get_iter (out iter)) {
+                if (iter.ends_line () && context.get_iter (out start)) {
+                    start.backward_word_start ();
+                    if ((iter.get_offset () - start.get_offset ()) >= 2) {
+                        string check = start.get_text (iter);
+                        return check == check.up ();
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        public override void populate (Gtk.SourceCompletionContext context) {
+            List<Gtk.SourceCompletionItem> completions = new List<Gtk.SourceCompletionItem> ();
+            Gtk.TextIter? start = null, iter = null;
+            if (context.get_iter (out iter)) {
+                if (iter.ends_line () && context.get_iter (out start)) {
+                    start.backward_word_start ();
+                    if ((iter.get_offset () - start.get_offset ()) >= 2) {
+                        string check = start.get_text (iter);
+                        foreach (var character in characters) {
+                            if (character.has_prefix (check) && character != check) {
+                                var com_item = new Gtk.SourceCompletionItem ();
+                                com_item.text = character;
+                                com_item.label = character;
+                                com_item.markup = character;
+                                completions.append (com_item);
+                            }
+                        }
+                    }
+                }
+            }
+            context.add_proposals (this, completions, true);
+        }
+
+        public override bool activate_proposal (Gtk.SourceCompletionProposal proposal, Gtk.TextIter iter) {
+            return false;
+        }
+    }
+
     public class FountainEnrichment {
-        private Gtk.TextView view;
+        private FountainCharacterSuggestor character_suggester;
+        private Gtk.SourceCompletionWords source_completion;
+        private Gtk.SourceView view;
         private Gtk.TextBuffer buffer;
         private Mutex checking;
 
@@ -49,9 +105,11 @@ namespace ThiefMD.Enrichments {
             } catch (Error e) {
                 warning ("Could not build regexes: %s", e.message);
             }
+            character_suggester = new FountainCharacterSuggestor ();
             checking = Mutex ();
             limit_updates = new TimedMutex (250);
             last_cursor = -1;
+            source_completion = null;
         }
 
         public void reset () {
@@ -139,6 +197,9 @@ namespace ThiefMD.Enrichments {
         }
 
         private void tag_char_diag_helper (Regex regex) {
+            Gtk.TextIter cursor_iter;
+            var cursor = buffer.get_insert ();
+            buffer.get_iter_at_mark (out cursor_iter, cursor);
             try {
                 MatchInfo match_info;
                 if (regex.match_full (checking_copy, checking_copy.length, 0, 0, out match_info)) {
@@ -175,6 +236,22 @@ namespace ThiefMD.Enrichments {
                                 buffer.apply_tag (tag_parenthetical, start, end);
                             } else {
                                 buffer.apply_tag (tag_character, start, end);
+                                start.backward_word_start ();
+                                end.forward_word_end ();
+                                if (!character_suggester.characters.contains (character) && !cursor_iter.in_range (start, end)) {
+                                    bool partial_character_name = false;
+                                    if (character.has_suffix ("^")) {
+                                        character = character.substring (0, character.length - 1);
+                                    }
+                                    foreach (var person in character_suggester.characters) {
+                                        if (person.contains (character)) {
+                                            partial_character_name = true;
+                                        }
+                                    }
+                                    if (!partial_character_name) {
+                                        character_suggester.characters.add (character);
+                                    }
+                                }
                             }
                         }
 
@@ -226,7 +303,7 @@ namespace ThiefMD.Enrichments {
             } while (match_info.next ());
         }
 
-        public bool attach (Gtk.TextView textview) {
+        public bool attach (Gtk.SourceView textview) {
             if (textview == null) {
                 return false;
             }
@@ -265,10 +342,26 @@ namespace ThiefMD.Enrichments {
             last_cursor = -1;
 
             calculate_margins ();
+            settings_changed ();
+            settings.changed.connect (settings_changed);
 
             return true;
         }
 
+        private void settings_changed () {
+            var settings = AppSettings.get_default ();
+            if (settings.experimental && source_completion == null) {
+                var completion = view.get_completion ();
+                completion.add_provider (character_suggester);
+                source_completion = new Gtk.SourceCompletionWords ("Character Suggestor", null);
+                source_completion.register (buffer);
+            } else if (!settings.experimental && source_completion != null) {
+                var completion = view.get_completion ();
+                source_completion.unregister (buffer);
+                completion.remove_provider (character_suggester);
+            }
+        }
+
         private void calculate_margins () {
             var settings = AppSettings.get_default ();
             int f_w = (int)(settings.get_css_font_size () * ((settings.fullscreen ? 1.4 : 1)));
@@ -321,6 +414,7 @@ namespace ThiefMD.Enrichments {
         }
 
         public void detach () {
+            var settings = AppSettings.get_default ();
             Gtk.TextIter start, end;
             buffer.get_bounds (out start, out end);
 
@@ -332,7 +426,17 @@ namespace ThiefMD.Enrichments {
             buffer.tag_table.remove (tag_character);
             buffer.tag_table.remove (tag_parenthetical);
             buffer.tag_table.remove (tag_dialogue);
+
+            if (source_completion != null) {
+                source_completion.unregister (buffer);
+            }
+
+            settings.changed.disconnect (settings_changed);
+
             tag_scene_heading = null;
+            tag_character = null;
+            tag_parenthetical = null;
+            tag_dialogue = null;
 
             view = null;
             buffer = null;