add author to metadata

hauntED
yova 3 months ago
parent 3a7409ee6a
commit 1583c0009b

@ -417,7 +417,9 @@ class MainActivity : AppCompatActivity() {
R.id.push_ghost -> {
with(AlertDialog.Builder(this)){
setTitle("Push to ghostCMS?")
if (metaData.get("url") != null) setTitle("Update ghost posting to ${metaData.get("url")}?")
else setTitle("Push to ghost instance ${api.baseUrl}?")
setPositiveButton("Yes", { dialog, id ->
webView.evaluateJavascript("getHtml();", {
val msg = URLDecoder.decode(it.removeSurrounding("\""))
@ -600,12 +602,21 @@ class MainActivity : AppCompatActivity() {
val post = sendPost(title, updated_at = metaData.updatedAt!!, authors = listOf(author), html, feature_image = metaData.get("feature_image"))
val postings = sendPostList(listOf(post))
val mUrl = parse(metaData.get("url"))
val mApiHost = mUrl.scheme + "://" + mUrl.host
if (api.baseUrl != mApiHost) api = ghostAPI(applicationContext, mApiHost)
Log.d(javaClass.simpleName,"Updating post to ${mUrl}")
try {
val response = api.postApi.updatePost(id, postings).execute()
if (response.isSuccessful) {
val resp = JSONObject(response.body()!!.string())
Log.d(javaClass.simpleName, "Updated: ${resp.getJSONArray("posts").getJSONObject(0).getString("url")}")
metaData.updatedAt= resp.getJSONArray("posts").getJSONObject(0).getString("updated_at")
val intent = Intent(Intent.ACTION_VIEW).setData(parse(metaData.metaData.get("url")))
try {
startActivity(intent)
@ -615,16 +626,15 @@ class MainActivity : AppCompatActivity() {
Log.i(javaClass.simpleName, e.toString())
})
}
Log.d(javaClass.simpleName, "Updated: ${resp.getJSONArray("posts").getJSONObject(0).getString("url")}")
} else {
this.runOnUiThread({
Toast.makeText(
this,
"error while updating post.\n${response.errorBody()}",
"error while updating post.\n${response.errorBody()!!.string()}",
Toast.LENGTH_LONG
).show()
})
Log.i(javaClass.simpleName, response.code().toString())
Log.i(javaClass.simpleName, response.errorBody()!!.string())
}
return response as retrofit2.Response<Any>
} catch (ex: Exception) {

@ -1,5 +1,6 @@
package org.wntr.mdeditor
import android.net.Uri
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.util.Log
@ -17,12 +18,22 @@ class MetadataActivity : AppCompatActivity() {
binding.title.setText(MainActivity.metaData.get("title"))
binding.url.setText(MainActivity.metaData.get("url"))
binding.featureImage.setText(MainActivity.metaData.get("feature_image"))
binding.author.setText(MainActivity.metaData.get("author") ?: MainActivity.credManager.username)
}
fun onButtonSaveClick(view: View) {
Log.d(javaClass.simpleName, "Getting Metadata:\ntitle:\t${binding.title.text}\nfeature_image:\t${binding.featureImage.text}")
MainActivity.metaData.put("title", binding.title.text.toString())
MainActivity.metaData.put("feature_image", binding.featureImage.text.toString())
if (binding.author.text.toString() != MainActivity.credManager.username) {
var apiHost: String? = null
if (MainActivity.metaData.get("url") !== null) {
val url = Uri.parse(MainActivity.metaData.get("url"))
apiHost = url.scheme + "://" + url.host
} else apiHost = MainActivity.credManager.instance
MainActivity.credManager.saveCredentialsToSharedPrefs(Credentials(apiHost, binding.author.text.toString()))
}
MainActivity.metaData.put("author", binding.author.text.toString())
MainActivity.readOnResume = false
finish()
}

@ -52,13 +52,13 @@ object RetrofitClient {
.baseUrl(baseUrl + "/ghost/api/admin/")
.addConverterFactory(JacksonConverterFactory.create())
.build()
}
}
class ghostAPI(applicationContext: Context, instance: String) {
val retrofit = RetrofitClient.getClient(applicationContext, instance)
val postApi = retrofit.create(PostApi::class.java)
val baseUrl = instance
fun register(credentials: Credentials): String {
@ -122,7 +122,7 @@ class ghostAPI(applicationContext: Context, instance: String) {
}
interface PostApi {
@GET("posts")
@GET("posts/")
fun getPosts(): Call<ResponseBody>
/* fun getPosts(): Call<ResponseBody> <- for json string*/

@ -29,7 +29,7 @@ class mdMeta {
if (metaData.size == 0) return ""
var metaString = "---\n"
for (key in metaData.keys) {
metaString += "$key: ${metaData.get(key as String)}\n"
if (metaData.get(key) != null) metaString += "$key: ${metaData.get(key)}\n"
}
metaString += "---\n"
return metaString
@ -39,11 +39,11 @@ class mdMeta {
fun extractMetadataFromMarkdown(markdown: String) : String {
val charactersBetweenGroupedHyphens = Regex("^---([\\s\\S]*?)---\n")
val metadataMatched = charactersBetweenGroupedHyphens.find(markdown)
ID = null
if (metadataMatched == null || metadataMatched.value == "---\n---\n") {
Log.d(javaClass.simpleName,"No metadata included")
metaData = mutableMapOf()
ID = null
return markdown
}
val metadata = metadataMatched.value

@ -4,13 +4,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="5dp"
tools:context="MetadataActivity">
<TextView
android:id="@+id/textView2"
android:id="@+id/textView0"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="Title:"
app:layout_constraintEnd_toEndOf="@+id/barrier2"
app:layout_constraintStart_toStartOf="parent"
@ -26,14 +26,35 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/barrier2"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/author"/>
<TextView
android:id="@+id/textView1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Author email:"
app:layout_constraintBottom_toBottomOf="@+id/author"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/barrier2"
app:layout_constraintTop_toTopOf="@+id/author" />
<EditText
android:id="@+id/author"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:autofillHints="author email"
android:inputType="text"
android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/barrier2"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintBottom_toTopOf="@id/feature_image"/>
<TextView
android:id="@+id/textView3"
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="Feature Image:"
app:layout_constraintBottom_toBottomOf="@+id/feature_image"
app:layout_constraintStart_toStartOf="parent"
@ -49,19 +70,18 @@
android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/barrier2"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintTop_toBottomOf="@id/author"
app:layout_constraintBottom_toTopOf="@id/url"/>
<TextView
android:id="@+id/textView"
android:id="@+id/textView3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="URL:"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/barrier2"
app:layout_constraintTop_toTopOf="@id/url"
app:layout_constraintBottom_toBottomOf="@id/url"
android:layout_marginLeft="5dp"/>
app:layout_constraintBottom_toBottomOf="@id/url" />
<TextView
android:id="@+id/url"
@ -89,7 +109,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="right"
app:constraint_referenced_ids="textView,textView2,textView3" />
app:constraint_referenced_ids="textView0,textView1,textView2,textView3" />
</androidx.constraintlayout.widget.ConstraintLayout>
Loading…
Cancel
Save