Fix #223

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
SpongePowered · Feb 15, 2017 · a9ddb9f · a9ddb9f
1 parent 7c3b1c1
commit a9ddb9f
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 11 deletions.
diff --git a/app/db/impl/access/ProjectBase.scala b/app/db/impl/access/ProjectBase.scala
@@ -1,6 +1,6 @@
 package db.impl.access
 
-import java.nio.file.Files
+import java.nio.file.{Files, NoSuchFileException}
 import java.nio.file.Files._
 
 import com.google.common.base.Preconditions._
@@ -11,6 +11,7 @@ import models.project.{Channel, Project, Version}
 import ore.project.io.ProjectFiles
 import ore.{OreConfig, OreEnv}
 import org.apache.commons.io.FileUtils
+import play.api.Logger
 import util.StringUtils._
 
 class ProjectBase(override val service: ModelService,
@@ -150,8 +151,13 @@ class ProjectBase(override val service: ModelService,
       this.deleteChannel(channel)
 
     val projectDir = this.fileManager.getProjectDir(proj.ownerName, project.name)
-    Files.delete(projectDir.resolve(version.fileName))
-    Files.delete(projectDir.resolve(version.signatureFileName))
+    try {
+      Files.delete(projectDir.resolve(version.fileName))
+      Files.delete(projectDir.resolve(version.signatureFileName))
+    } catch {
+      case _: NoSuchFileException =>
+        Logger.warn("a version was deleted but it's files were missing, did deletion fail before?")
+    }
   }
 
   /**

diff --git a/app/db/impl/schema.scala b/app/db/impl/schema.scala
@@ -201,7 +201,7 @@ class SessionTable(tag: Tag) extends ModelTable[DbSession](tag, "user_sessions")
 
 }
 
-class SignOnTable(tag: Tag) extends ModelTable[SignOn](tag, "sign_ons") {
+class SignOnTable(tag: Tag) extends ModelTable[SignOn](tag, "user_sign_ons") {
 
   def nonce = column[String]("nonce")
   def isCompleted = column[Boolean]("is_completed")

diff --git a/app/views/bootstrap/layout.scala.html b/app/views/bootstrap/layout.scala.html
@@ -57,10 +57,13 @@
             <script type="text/javascript" src="@routes.Assets.at("bootstrap/js/bootstrap.min.js")"></script>
             <script type="text/javascript" src="@routes.Assets.at("javascripts/filesize.min.js")"></script>
             <script type="text/javascript" src="@routes.Assets.at("highlight/highlight.pack.js")"></script>
+            <script>var caching = @config.ore.getBoolean("caching").get;</script>
             <script type="text/javascript" src="@routes.Assets.at("javascripts/main.js")"></script>
             <script type="text/javascript" src="@routes.Assets.at("javascripts/svg.js")"></script>
             <script type="text/javascript" src="@routes.Assets.at("javascripts/spongie.js")"></script>
-            <script type="text/javascript" src="@routes.Assets.at("javascripts/offline.js")"></script>
+            @if(config.ore.getBoolean("caching").get) {
+                <script type="text/javascript" src="@routes.Assets.at("javascripts/offline.js")"></script>
+            }
             @if(request != null) {
                 <script>csrf = '@play.filters.csrf.CSRF.getToken.get.value'</script>
             }

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name := "ore"
 
-version := "1.2.2"
+version := "1.2.3"
 
 lazy val `ore` = (project in file(".")).enablePlugins(PlayScala)
 
@@ -22,8 +22,8 @@ resolvers ++= Seq(
 libraryDependencies ++= Seq(
   "org.spongepowered"     %   "play-discourse"          %   "1.0.0-SNAPSHOT",
   "org.spongepowered"     %   "plugin-meta"             %   "0.2",
-  "com.typesafe.play"     %%  "play-slick"              %   "2.0.0",
-  "com.typesafe.play"     %%  "play-slick-evolutions"   %   "2.0.0",
+  "com.typesafe.play"     %%  "play-slick"              %   "2.0.2",
+  "com.typesafe.play"     %%  "play-slick-evolutions"   %   "2.0.2",
   "org.postgresql"        %   "postgresql"              %   "9.4.1212.jre7",
   "com.github.tminglei"   %%  "slick-pg"                %   "0.12.0",
   "org.apache.commons"    %   "commons-io"              %   "1.3.2",
@@ -32,5 +32,5 @@ libraryDependencies ++= Seq(
   "org.bouncycastle"      %   "bcprov-jdk15on"          %   "1.56",
   "org.bouncycastle"      %   "bcpkix-jdk15on"          %   "1.56",
   "org.bouncycastle"      %   "bcpg-jdk15on"            %   "1.56",
-  "javax.mail"            % "mail"                      %   "1.4.7"
+  "javax.mail"            %   "mail"                    %   "1.4.7"
 )
diff --git a/conf/application.conf.template b/conf/application.conf.template
@@ -36,6 +36,7 @@ security {
     requirePgp         =   true
     keyChangeCooldown  =   259200000
     unsafeDownload.maxAge = 600000 # 10 minutes
+    caching = true
 
     api {
         url = "http://localhost:8000"

diff --git a/conf/evolutions/default/69.sql b/conf/evolutions/default/69.sql
@@ -0,0 +1,7 @@
+# --- !Ups
+
+alter table project_version_download_warnings drop constraint project_version_download_warnings_version_id_fkey;
+alter table project_version_download_warnings
+  add foreign key (version_id) references project_versions on delete cascade;
+
+# --- !Downs
diff --git a/conf/logback.xml b/conf/logback.xml
@@ -42,5 +42,6 @@
     <logger name="UserSync" level="INFO" />
     <logger name="Organizations" level="INFO" />
     <logger name="SSO" level="INFO" />
+    <!--<logger name="slick" level="DEBUG" />-->
 
 </configuration>
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,6 +2,6 @@ logLevel := Level.Warn
 
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.9")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.12")
 
 addSbtPlugin("org.irundaia.sbt" % "sbt-sassify" % "1.4.2")
diff --git a/public/javascripts/main.js b/public/javascripts/main.js
@@ -170,7 +170,7 @@ $(function() {
  * ==================================================
  */
 
-if ('serviceWorker' in navigator) {
+if ('serviceWorker' in navigator && caching) {
     window.addEventListener('load', function() {
         navigator.serviceWorker.register('/sw.js', {scope: '/'});
     });