diff --git a/pom.xml b/pom.xml index e391166..444ddc7 100644 --- a/pom.xml +++ b/pom.xml @@ -15,46 +15,51 @@ UTF-8 1.8 - 4.2.5.RELEASE + 4.3.7.RELEASE + 9.4.0.v20161208 ru.dmitriymx kinosearch - 2.0.9 - war + 2.0.10-SNAPSHOT + + org.springframework + spring-core + ${spring.version} + org.springframework spring-context ${spring.version} + + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + + + + + org.springframework + spring-webmvc + ${spring.version} + org.springframework spring-context-support ${spring.version} - - org.springframework - spring-webmvc - ${spring.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - - - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.1 - - - javax.servlet - jstl - 1.2 - + org.jsoup @@ -76,6 +81,7 @@ httpclient 4.5.2 + junit @@ -114,16 +120,30 @@ org.apache.maven.plugins - maven-war-plugin - 3.0.0 + maven-jar-plugin + 2.4 - false + + + true + dependency/ + + - org.eclipse.jetty - jetty-maven-plugin - 9.4.0.v20161208 + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + copy-dependencies + package + + copy-dependencies + + + diff --git a/src/main/java/kinosearch/webapp/Main.java b/src/main/java/kinosearch/webapp/Main.java new file mode 100644 index 0000000..51956cf --- /dev/null +++ b/src/main/java/kinosearch/webapp/Main.java @@ -0,0 +1,16 @@ +/* + * DmitriyMX + * 2017-12-11 + */ +package kinosearch.webapp; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +public class Main { + public static void main(String[] args) { + ApplicationContext ctx = new AnnotationConfigApplicationContext(SpringConfig.class); + WebApp webApp = ctx.getBean("webapp", WebApp.class); + webApp.start(); + } +} diff --git a/src/main/java/kinosearch/webapp/SpringConfig.java b/src/main/java/kinosearch/webapp/SpringConfig.java new file mode 100644 index 0000000..348a303 --- /dev/null +++ b/src/main/java/kinosearch/webapp/SpringConfig.java @@ -0,0 +1,40 @@ +/* + * DmitriyMX + * 2017-12-11 + */ +package kinosearch.webapp; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.PropertySource; +import org.springframework.web.servlet.ViewResolver; +import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer; +import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver; + +@Configuration +@Import(kinosearch.core.SpringConfig.class) +@PropertySource("classpath:/application.properties") +public class SpringConfig { + @Bean + public WebApp webapp(@Value("${webapp.host}") String host, @Value("${webapp.port}") int port) { + return new WebApp(host, port); + } + + @Bean + public ViewResolver viewResolver() { + FreeMarkerViewResolver viewResolver = new FreeMarkerViewResolver(); + viewResolver.setContentType("text/html;charset=UTF-8"); + viewResolver.setCache(true); + viewResolver.setSuffix(".ftl"); + return viewResolver; + } + + @Bean + public FreeMarkerConfigurer freemarkerConfig() { + FreeMarkerConfigurer freeMarkerConfigurer = new FreeMarkerConfigurer(); + freeMarkerConfigurer.setTemplateLoaderPath("classpath:/kinosearch/webapp/"); + return freeMarkerConfigurer; + } +} diff --git a/src/main/java/kinosearch/webapp/SpringMvcConfig.java b/src/main/java/kinosearch/webapp/SpringMvcConfig.java new file mode 100644 index 0000000..7d3bcb9 --- /dev/null +++ b/src/main/java/kinosearch/webapp/SpringMvcConfig.java @@ -0,0 +1,31 @@ +/* + * DmitriyMX + * 2017-12-11 + */ +package kinosearch.webapp; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; + +@Configuration +@EnableWebMvc +public class SpringMvcConfig extends WebMvcConfigurerAdapter { + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + final String staticPath = "classpath:/kinosearch/webapp/static/"; + /* Styles */ + registry.addResourceHandler("/css/**") + .addResourceLocations(staticPath+"css/"); + /* Fonts */ + registry.addResourceHandler("/fonts/**") + .addResourceLocations(staticPath+"fonts/"); + /* JavaScript */ + registry.addResourceHandler("/js/**") + .addResourceLocations(staticPath+"js/"); + /* Other */ + registry.addResourceHandler("/*.svg").addResourceLocations(staticPath); + registry.addResourceHandler("/*.png").addResourceLocations(staticPath); + } +} diff --git a/src/main/java/kinosearch/webapp/WebApp.java b/src/main/java/kinosearch/webapp/WebApp.java new file mode 100644 index 0000000..d85c7a3 --- /dev/null +++ b/src/main/java/kinosearch/webapp/WebApp.java @@ -0,0 +1,62 @@ +/* + * DmitriyMX + * 2017-12-11 + */ +package kinosearch.webapp; + +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import org.springframework.web.context.ContextLoaderListener; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import org.springframework.web.servlet.DispatcherServlet; + +import java.net.InetSocketAddress; +import java.util.logging.Level; +import java.util.logging.Logger; + +public class WebApp { + private final Logger logger = Logger.getLogger(WebApp.class.getName()); + private final String host; + private final int port; + + public WebApp(String host, int port) { + this.host = host; + this.port = port; + } + + void start() { + Server server = new Server(new InetSocketAddress(host, port)); + server.setHandler(getServletContextHandler(getContext())); + try { + server.start(); + server.join(); + } catch (Exception e) { + logger.log(Level.SEVERE, "Start server", e); + } + } + + private ServletContextHandler getServletContextHandler(WebApplicationContext context) { + ServletContextHandler contextHandler = new ServletContextHandler(); + contextHandler.setErrorHandler(null); + contextHandler.setContextPath("/"); + contextHandler.addServlet(new ServletHolder(new DispatcherServlet(context)), "/*"); + contextHandler.addEventListener(new ContextLoaderListener(context)); + return contextHandler; + } + + private WebApplicationContext getContext() { + AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext(); + context.setConfigLocation("kinosearch.webapp"); + return context; + } + + public String getHost() { + return host; + } + + public int getPort() { + return port; + } +} diff --git a/src/main/java/kinosearch/webapp/WebAppConfiguration.java b/src/main/java/kinosearch/webapp/WebAppConfiguration.java deleted file mode 100644 index 81b3049..0000000 --- a/src/main/java/kinosearch/webapp/WebAppConfiguration.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * DmitriyMX - * 2017-01-04 - */ -package kinosearch.webapp; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import kinosearch.core.KinoPlay; -import kinosearch.core.SpringConfig; -import org.springframework.context.annotation.*; -import org.springframework.web.servlet.ViewResolver; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; -import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer; -import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver; - -@Configuration -@EnableWebMvc -@ComponentScan -@Import(SpringConfig.class) -public class WebAppConfiguration extends WebMvcConfigurerAdapter { - @Bean - public ViewResolver viewResolver() { - FreeMarkerViewResolver viewResolver = new FreeMarkerViewResolver(); - viewResolver.setCache(true); - viewResolver.setSuffix(".html"); - return viewResolver; - } - - @Bean - public FreeMarkerConfigurer freemarkerConfig() { - FreeMarkerConfigurer freeMarkerConfigurer = new FreeMarkerConfigurer(); - freeMarkerConfigurer.setTemplateLoaderPath("/WEB-INF/"); - return freeMarkerConfigurer; - } - - @Bean - @Scope("singleton") - public Gson gson() { - return new GsonBuilder().registerTypeAdapter(KinoPlay.class, new KinoPlaySerializer()).create(); - } - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("/css/**") - .addResourceLocations("/css/"); - registry.addResourceHandler("/fonts/**") - .addResourceLocations("/fonts/"); - registry.addResourceHandler("/js/**") - .addResourceLocations("/js/"); - registry.addResourceHandler("/*.png") - .addResourceLocations("/"); - } -} diff --git a/src/main/java/kinosearch/webapp/WebAppController.java b/src/main/java/kinosearch/webapp/WebAppController.java index 9a5af9d..d5c2395 100644 --- a/src/main/java/kinosearch/webapp/WebAppController.java +++ b/src/main/java/kinosearch/webapp/WebAppController.java @@ -16,57 +16,50 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.IOException; import java.net.HttpURLConnection; +import java.net.MalformedURLException; import java.net.URL; import java.util.*; +import java.util.logging.Level; +import java.util.logging.Logger; @Controller -@RequestMapping("/") public class WebAppController { - @Autowired - private ServletContext webAppContext; + private final Logger logger = Logger.getLogger(WebAppController.class.getName()); @Autowired private ApplicationContext coreContext; private void setDefaultModel(ModelMap model) { - model.addAttribute("basedir", webAppContext.getContextPath()); - model.addAttribute("version", "2.0.9"); + model.addAttribute("version", "2.0.10-SNAPSHOT"); model.addAttribute("rutext", "Поиск кино по пиратским кинотеатрам"); } - private void setDefaultResponse(HttpServletResponse response) { - response.setContentType("text/html"); - response.setCharacterEncoding("utf-8"); - } - - @RequestMapping(value = { "/", "/index.html" }, method = RequestMethod.GET) - public String index(ModelMap model, HttpServletRequest request, HttpServletResponse response) { + @RequestMapping(value = {"/", "/index.html"}, method = RequestMethod.GET) + public String index(ModelMap model) { setDefaultModel(model); - setDefaultResponse(response); - - if (request.getParameter("search") != null && !request.getParameter("search").trim().isEmpty()) { - boolean strong = (request.getParameter("strong") != null && request.getParameter("strong").equals("1")); - search(request.getParameter("search"), model, strong); - } - return "index"; } - private void search(String search, ModelMap model, boolean strong) { + @RequestMapping(value = {"/", "/index.html"}, method = RequestMethod.GET, params = {"search"}) + public String search(@RequestParam("search") String searchText, ModelMap model) { + if (searchText.trim().isEmpty()) { + return "redirect:/"; + } + List list = Collections.synchronizedList(new LinkedList<>()); Map kinoWarezMap = coreContext.getBeansOfType(KinoWarez.class); ThreadGroup threadGroup = new ThreadGroup(""); - for (KinoWarez kinoWarez : kinoWarezMap.values()) { //TODO на будущее надо ограничить количество одновременных потоков + for (KinoWarez kinoWarez : kinoWarezMap.values()) { //TODO надо ограничить количество одновременных потоков new Thread(threadGroup, () -> { - List outList = kinoWarez.search(search, strong); + List outList = kinoWarez.search(searchText, false); //FIXME "strong" нужно учитывать for (Kino kino : outList) { kino.setName("[" + kinoWarez.getName() + "] " + kino.getName()); @@ -81,9 +74,12 @@ public class WebAppController { Tools.SafeSleep(1000); } - model.put("searchtext", search); + model.put("searchtext", searchText); model.put("resultsearch", groupKino(list)); - model.put("strong", strong); + model.put("strong", false); //FIXME "strong" нужно учитывать + + setDefaultModel(model); + return "index"; } private List groupKino(List list) { @@ -138,32 +134,28 @@ public class WebAppController { return grouppedList; } - @RequestMapping(value = "/about.html", method = RequestMethod.GET) - public String about(ModelMap model, HttpServletResponse response) { - setDefaultModel(model); - setDefaultResponse(response); - return "simple_template/about"; - } - @RequestMapping(value = "/player/{warez}/**", method = RequestMethod.GET) - public String player(@PathVariable() String warez, ModelMap model, HttpServletRequest request, HttpServletResponse response) { - setDefaultModel(model); - setDefaultResponse(response); - + public String player(@PathVariable() String warez, ModelMap model, HttpServletRequest request) throws MalformedURLException { KinoWarez kinoWarez = coreContext.getBean(warez, KinoWarez.class); if (kinoWarez == null) { return "redirect:/"; } - KinoPlay kinoPlay = kinoWarez.player(request.getServletPath().substring(("/player/"+warez).length())); + + //TODO а необходимость в URL точно оправдана? + URL requestUrl = new URL(request.getRequestURL().toString()); + KinoPlay kinoPlay = kinoWarez.player(requestUrl.getPath().substring(("/player/"+warez).length())); Gson gson = coreContext.getBean(Gson.class); model.put("json", gson.toJson(kinoPlay)); + setDefaultModel(model); return "player"; } @RequestMapping(value = "/proxy/{warez}/**", method = RequestMethod.GET) public void proxy(@PathVariable String warez, HttpServletRequest request, HttpServletResponse response) throws IOException { - String path = request.getServletPath().substring(("/proxy/"+warez+"/").length()); + //TODO а необходимость в URL точно оправдана? + URL requestUrl = new URL(request.getRequestURL().toString()); + String path = requestUrl.getPath().substring(("/proxy/"+warez+"/").length()); URL url = new URL("http://" + path); HttpURLConnection con =(HttpURLConnection) url.openConnection(); @@ -211,4 +203,19 @@ public class WebAppController { webToProxyBuf.close(); con.disconnect(); } + + @RequestMapping(value = {"/about", "/about.html"}, method = RequestMethod.GET) + public String about(ModelMap model) { + setDefaultModel(model); + return "about"; + } + + @RequestMapping(value = "/favicon.ico") + public void favicon(HttpServletResponse response) { + try { + response.sendError(404); + } catch (IOException e) { + logger.log(Level.WARNING, "favicon 404", e); + } + } } diff --git a/src/main/java/kinosearch/webapp/WebAppInitializer.java b/src/main/java/kinosearch/webapp/WebAppInitializer.java deleted file mode 100644 index d0ed584..0000000 --- a/src/main/java/kinosearch/webapp/WebAppInitializer.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * DmitriyMX - * 2017-01-04 - */ -package kinosearch.webapp; - -import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; - -public class WebAppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer { - @Override - protected Class[] getRootConfigClasses() { - return new Class[]{WebAppConfiguration.class}; - } - - @Override - protected Class[] getServletConfigClasses() { - return new Class[0]; - } - - @Override - protected String[] getServletMappings() { - return new String[]{"/"}; - } -} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..8ddd94a --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,2 @@ +webapp.host=127.0.0.1 +webapp.port=8080 \ No newline at end of file diff --git a/src/main/resources/kinosearch/webapp/about.ftl b/src/main/resources/kinosearch/webapp/about.ftl new file mode 100644 index 0000000..f58e8b6 --- /dev/null +++ b/src/main/resources/kinosearch/webapp/about.ftl @@ -0,0 +1,28 @@ +[#ftl] +[#include "/header.inc.ftl"] +
+

+ Частенько бывает, что желанный фильм, мультфильм или сериал располагается только на одном каком-то кино-ресурсе. + И хорошо, если этот ресурс был первым в вашем списке ручного поиска кино.
+ А если нет?
+ А если у вас таких сайтов 5-10?
+ А если на всех ваших любимых сайтах не оказалась искомого?
+ Тогда вы лезете в Google/Яндекс и... + И обязательно напарываетесь на какую-то напичканную рекламой хрень, где еще и вылезет ошибка "фильм не найден". + Поиск "кинца" начинает затягиваться, а желание его посмотреть и вовсе улетучится. +

+

+ Нет, так быть не должно! Если уж решился смотреть кино в онлайне, то пусть это будет комфортно!
+ Мой проект возьмет всю рутину поиска на себя, а вам остается только выбрать место просмотра и наслаждаться + фильмом/сериалом/еще чем-то. +

+

+ Кинотеатры подбираются так, чтобы в них было поменьше рекламы и побольше нужных фильмов. А в скором времени я и + это ... упрощу =) +

+

+ Приятного просмотра! +

+
+

Автор: DmitriyMX/2015

+[#include "/fother.inc.ftl"] \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/fother.inc.html b/src/main/resources/kinosearch/webapp/fother.inc.ftl similarity index 100% rename from src/main/webapp/WEB-INF/fother.inc.html rename to src/main/resources/kinosearch/webapp/fother.inc.ftl diff --git a/src/main/resources/kinosearch/webapp/header.inc.ftl b/src/main/resources/kinosearch/webapp/header.inc.ftl new file mode 100644 index 0000000..9232b96 --- /dev/null +++ b/src/main/resources/kinosearch/webapp/header.inc.ftl @@ -0,0 +1,35 @@ +[#ftl] + + + + + + + + KinoSearch :: ${rutext} + + + + + + + + +
+

KinoSearch

+

${rutext}

+
+
+ + + + +
+
+ + +
+
+
+ О проекте | Написать отзыв +
\ No newline at end of file diff --git a/src/main/resources/kinosearch/webapp/index.ftl b/src/main/resources/kinosearch/webapp/index.ftl new file mode 100644 index 0000000..a9fa28b --- /dev/null +++ b/src/main/resources/kinosearch/webapp/index.ftl @@ -0,0 +1,62 @@ +[#ftl] +[#include "/header.inc.ftl"] +[#if resultsearch??] + +
+ [#if resultsearch?has_content] + [#list resultsearch as kino] + [#if kino.getClass().getSimpleName() == "KinoGroup"] +
+ +  ${kino.name} + +
+
+ [#list kino.kinolist as kino_groupped] +
+
${kino_groupped.name}
+
+
+
+ на сайте +
+
+ в плеере +
+
+
+
+ [/#list] +
+
+
+ [#else] +
+
${kino.name}
+
+
+
+ на сайте +
+
+ в плеере +
+
+
+
+ [/#if] + [/#list] + [#else] +

Ничего не найдено =(

+ [/#if] +[#else] + [#include "/news.inc.ftl"] +[/#if] +[#include "/fother.inc.ftl"] \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/news.inc.html b/src/main/resources/kinosearch/webapp/news.inc.ftl similarity index 77% rename from src/main/webapp/WEB-INF/news.inc.html rename to src/main/resources/kinosearch/webapp/news.inc.ftl index 015b1e1..bc38528 100644 --- a/src/main/webapp/WEB-INF/news.inc.html +++ b/src/main/resources/kinosearch/webapp/news.inc.ftl @@ -46,9 +46,9 @@

Version 2.0.7

-

Долгожданное обновление: наконец то появился плеер! О да! Долой центнеры рекламы, что предлагает нам... да что только не! Начиная от "купи слона", до "мега-умбер-онлайн игра, клонов которой уже нисчесть! играй сейчас! живо!!!".

-

Кхм. Простите.

-

Вообщем, тестовая вариация плеера запущена для кинотеатра OnlineLife. Если нареканий не будет, то запущу и для остальных.

+

Долгожданное обновление: наконец то появился плеер! О да! Долой центнеры рекламы, что предлагает нам... да что только не! Начиная от "купи слона", до "мега-умбер-онлайн игра, клонов которой уже нисчесть! играй сейчас! живо!!!".

+

Кхм. Простите.

+

Вообщем, тестовая вариация плеера запущена для кинотеатра OnlineLife. Если нареканий не будет, то запущу и для остальных.

diff --git a/src/main/resources/kinosearch/webapp/player.ftl b/src/main/resources/kinosearch/webapp/player.ftl new file mode 100644 index 0000000..d3b13b3 --- /dev/null +++ b/src/main/resources/kinosearch/webapp/player.ftl @@ -0,0 +1,117 @@ +[#ftl] +[#include "/header.inc.ftl"] + + + + + + +
+ + + + + +
+ +

+ +
+ + +
+[#include "/fother.inc.ftl"] \ No newline at end of file diff --git a/src/main/webapp/css/awesome-bootstrap-checkbox.css b/src/main/resources/kinosearch/webapp/static/css/awesome-bootstrap-checkbox.css similarity index 100% rename from src/main/webapp/css/awesome-bootstrap-checkbox.css rename to src/main/resources/kinosearch/webapp/static/css/awesome-bootstrap-checkbox.css diff --git a/src/main/webapp/css/bootstrap.min.css b/src/main/resources/kinosearch/webapp/static/css/bootstrap.min.css similarity index 100% rename from src/main/webapp/css/bootstrap.min.css rename to src/main/resources/kinosearch/webapp/static/css/bootstrap.min.css diff --git a/src/main/webapp/css/style.css b/src/main/resources/kinosearch/webapp/static/css/style.css similarity index 80% rename from src/main/webapp/css/style.css rename to src/main/resources/kinosearch/webapp/static/css/style.css index 7ebbf37..a40b57c 100644 --- a/src/main/webapp/css/style.css +++ b/src/main/resources/kinosearch/webapp/static/css/style.css @@ -12,12 +12,10 @@ body { font-weight: bold; } -.title .logo { - background-image: url("../favicon.png"); - width: 2em; +.title img { + vertical-align: bottom; + height: 1.119em; display: inline-block; - background-size: 2em auto; - background-position: 0px center; } .title a { diff --git a/src/main/webapp/fonts/glyphicons-halflings-regular.eot b/src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from src/main/webapp/fonts/glyphicons-halflings-regular.eot rename to src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.eot diff --git a/src/main/webapp/fonts/glyphicons-halflings-regular.svg b/src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from src/main/webapp/fonts/glyphicons-halflings-regular.svg rename to src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.svg diff --git a/src/main/webapp/fonts/glyphicons-halflings-regular.ttf b/src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from src/main/webapp/fonts/glyphicons-halflings-regular.ttf rename to src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.ttf diff --git a/src/main/webapp/fonts/glyphicons-halflings-regular.woff b/src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from src/main/webapp/fonts/glyphicons-halflings-regular.woff rename to src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.woff diff --git a/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 b/src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from src/main/webapp/fonts/glyphicons-halflings-regular.woff2 rename to src/main/resources/kinosearch/webapp/static/fonts/glyphicons-halflings-regular.woff2 diff --git a/src/main/webapp/js/bootstrap.min.js b/src/main/resources/kinosearch/webapp/static/js/bootstrap.min.js similarity index 100% rename from src/main/webapp/js/bootstrap.min.js rename to src/main/resources/kinosearch/webapp/static/js/bootstrap.min.js diff --git a/src/main/webapp/js/jquery-2.1.4.min.js b/src/main/resources/kinosearch/webapp/static/js/jquery-2.1.4.min.js similarity index 100% rename from src/main/webapp/js/jquery-2.1.4.min.js rename to src/main/resources/kinosearch/webapp/static/js/jquery-2.1.4.min.js diff --git a/src/main/webapp/js/js.cookie-2.1.0.min.js b/src/main/resources/kinosearch/webapp/static/js/js.cookie-2.1.0.min.js similarity index 100% rename from src/main/webapp/js/js.cookie-2.1.0.min.js rename to src/main/resources/kinosearch/webapp/static/js/js.cookie-2.1.0.min.js diff --git a/src/main/webapp/js/player.js b/src/main/resources/kinosearch/webapp/static/js/player.js similarity index 89% rename from src/main/webapp/js/player.js rename to src/main/resources/kinosearch/webapp/static/js/player.js index 97a3abf..fe1df2b 100644 --- a/src/main/webapp/js/player.js +++ b/src/main/resources/kinosearch/webapp/static/js/player.js @@ -1,11 +1,9 @@ -function PlayerCore(baseDir, playerObj, titleObj, videoData) { - this.baseDir = baseDir; +function PlayerCore(playerObj, titleObj, videoData) { this.playerObj = playerObj; this.titleObj = titleObj; this.videoData = videoData; this.origDocTitle = document.title; - this.path = window.location.pathname.substr(baseDir.length); this.timeLast = 0; this.msToTime = function(ms) { @@ -23,22 +21,22 @@ function PlayerCore(baseDir, playerObj, titleObj, videoData) { 'm': addZ(_min), 'h': addZ(_hr) }; - } + }; this.setTitle = function(title = videoData.title) { document.title = title + " :: " + this.origDocTitle; titleObj.text(title); titleObj.show(); - } + }; this.getType = function() { return this.videoData.type; - } + }; this.setupPlayerForOneFilm = function() { - playerObj.attr('src', this.baseDir + videoData.file); + playerObj.attr('src', videoData.file); playerObj.load(); - } + }; this.setupPlayerForSimpleSerial = function(serialBlock) { var menu = serialBlock.find('.dropdown-menu'); @@ -53,7 +51,7 @@ function PlayerCore(baseDir, playerObj, titleObj, videoData) { }); serialBlock.removeClass('hide'); - } + }; this.setupPlayerForSeasonSerial = function(seasonBlock, serialBlock) { var menu = seasonBlock.find('.dropdown-menu'); @@ -62,13 +60,13 @@ function PlayerCore(baseDir, playerObj, titleObj, videoData) { this.videoData.seasons.forEach(function(item, i) { var aTag = $('', {'href':'#', 'text':item.title}); aTag.click(function(){_self.setSeason(i, seasonBlock, serialBlock)}); - var liTag = $('
  • ') + var liTag = $('
  • '); liTag.append(aTag); menu.append(liTag); }); seasonBlock.removeClass('hide'); - } + }; this.setupPlayer = function() { var _self = this; @@ -90,17 +88,17 @@ function PlayerCore(baseDir, playerObj, titleObj, videoData) { console.debug({'path': _self.path, 'saveTime': save_data}); } }); - } + }; this.setSerial = function(idx, serialBlock, sidx = 0) { var title; var playerSrc; if (this.getType() == 'seasons_serial') { title = videoData.seasons[sidx].serials[idx].title; - playerSrc = this.baseDir + videoData.seasons[sidx].serials[idx].file; + playerSrc = videoData.seasons[sidx].serials[idx].file; } else { title = videoData.serials[idx].title; - playerSrc = this.baseDir + videoData.serials[idx].file; + playerSrc = videoData.serials[idx].file; } this.setTitle(title); @@ -110,7 +108,7 @@ function PlayerCore(baseDir, playerObj, titleObj, videoData) { playerObj.attr('src', playerSrc); playerObj.attr('data-serial', idx); playerObj.load(); - } + }; this.setSeason = function(idx, seasonBlock, serialBlock) { var title = videoData.seasons[idx].title; @@ -124,7 +122,7 @@ function PlayerCore(baseDir, playerObj, titleObj, videoData) { this.videoData.seasons[idx].serials.forEach(function(item, i) { var aTag = $('', {'href':'#', 'text':item.title}); aTag.click(function(){_self.setSerial(i, serialBlock, idx)}); - var liTag = $('
  • ') + var liTag = $('
  • '); liTag.append(aTag); menu.append(liTag); }); diff --git a/src/main/resources/kinosearch/webapp/static/ks3logo.svg b/src/main/resources/kinosearch/webapp/static/ks3logo.svg new file mode 100644 index 0000000..555ee0c --- /dev/null +++ b/src/main/resources/kinosearch/webapp/static/ks3logo.svg @@ -0,0 +1,34 @@ + + diff --git a/src/main/webapp/noise-background.png b/src/main/resources/kinosearch/webapp/static/noise-background.png similarity index 100% rename from src/main/webapp/noise-background.png rename to src/main/resources/kinosearch/webapp/static/noise-background.png diff --git a/src/main/webapp/WEB-INF/header.inc.html b/src/main/webapp/WEB-INF/header.inc.html deleted file mode 100644 index 0f8d6ea..0000000 --- a/src/main/webapp/WEB-INF/header.inc.html +++ /dev/null @@ -1,35 +0,0 @@ -[#ftl] - - - - - - - - KinoSearch :: ${rutext} - - - - - - - - -
    -

    KinoSearch

    -

    ${rutext}

    -
    -
    - - - - -
    -
    - - -
    -
    -
    - О проекте | Написать отзыв -
    \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/index.html b/src/main/webapp/WEB-INF/index.html deleted file mode 100644 index 800b48d..0000000 --- a/src/main/webapp/WEB-INF/index.html +++ /dev/null @@ -1,62 +0,0 @@ -[#ftl] -[#include "/header.inc.html"] - [#if resultsearch??] - -
    - [#if resultsearch?has_content] - [#list resultsearch as kino] - [#if kino.getClass().getSimpleName() == "KinoGroup"] -
    - -  ${kino.name} - -
    -
    - [#list kino.kinolist as kino_groupped] -
    -
    ${kino_groupped.name}
    -
    -
    -
    - на сайте -
    -
    - в плеере -
    -
    -
    -
    - [/#list] -
    -
    -
    - [#else] -
    -
    ${kino.name}
    -
    -
    -
    - на сайте -
    -
    - в плеере -
    -
    -
    -
    - [/#if] - [/#list] - [#else] -

    Ничего не найдено =(

    - [/#if] - [#else] - [#include "/news.inc.html"] - [/#if] -[#include "/fother.inc.html"] \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/player.html b/src/main/webapp/WEB-INF/player.html deleted file mode 100644 index b25d1b4..0000000 --- a/src/main/webapp/WEB-INF/player.html +++ /dev/null @@ -1,117 +0,0 @@ -[#ftl] -[#include "/header.inc.html"] - - - - - - -
    - - - - - -
    - -

    - -
    - - -
    -[#include "/fother.inc.html"] \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/simple_template/about.html b/src/main/webapp/WEB-INF/simple_template/about.html deleted file mode 100644 index bf84f4e..0000000 --- a/src/main/webapp/WEB-INF/simple_template/about.html +++ /dev/null @@ -1,28 +0,0 @@ -[#ftl] -[#include "/header.inc.html"] -
    -

    - Частенько бывает, что желанный фильм, мультфильм или сериал располагается только на одном каком-то кино-ресурсе. - И хорошо, если этот ресурс был первым в вашем списке ручного поиска кино.
    - А если нет?
    - А если у вас таких сайтов 5-10?
    - А если на всех ваших любимых сайтах не оказалась искомого?
    - Тогда вы лезете в Google/Яндекс и... - И обязательно напарываетесь на какую-то напичканную рекламой хрень, где еще и вылезет ошибка "фильм не найден". - Поиск "кинца" начинает затягиваться, а желание его посмотреть и вовсе улетучится. -

    -

    - Нет, так быть не должно! Если уж решился смотреть кино в онлайне, то пусть это будет комфортно!
    - Мой проект возьмет всю рутину поиска на себя, а вам остается только выбрать место просмотра и наслаждаться - фильмом/сериалом/еще чем-то. -

    -

    - Кинотеатры подбираются так, чтобы в них было поменьше рекламы и побольше нужных фильмов. А в скором времени я и - это ... упрощу =) -

    -

    - Приятного просмотра! -

    -
    -

    Автор: DmitriyMX / 2015

    -[#include "/fother.inc.html"] \ No newline at end of file diff --git a/src/main/webapp/favicon.png b/src/main/webapp/favicon.png deleted file mode 100644 index 987a50b..0000000 Binary files a/src/main/webapp/favicon.png and /dev/null differ